Commit 40abe8d0 authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

Fixes in opdsdb.clear_all and sopds_utils

parent 02301bfc

opds_catalog/fixtures/mygenres.json

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

opds_catalog/management/commands/sopds_util.py

+4 −5
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ class Command(BaseCommand): 
        with transaction.atomic():

            opdsdb.clear_all(self.verbose)

        if not self.nogenres:

            call_command('loaddata', 'genre.json', app_label='opds_catalog') 

            call_command('loaddata', 'genre.json')

        Counter.objects.update_known_counters()

        opdsdb.pg_optimize(False)
@@ -61,18 +61,18 @@ class Command(BaseCommand): 
        self.stdout.write('Series count   = %s'%Counter.objects.get_counter(models.counter_allseries))  

        

    def save_mygenres(self):     

        call_command('dumpdata', 'opds_catalog.genre','--output','opds_catalog/fixtures/mygenres.json', app_label='opds_catalog')  

        call_command('dumpdata', 'opds_catalog.genre','--output','opds_catalog/fixtures/mygenres.json')

        self.stdout.write('Genre dump saved in opds_catalog/fixtures/mygenres.json')

        

    def load_mygenres(self):  

        opdsdb.clear_genres(self.verbose)   

        call_command('loaddata', 'mygenres.json', app_label='opds_catalog')  

        call_command('loaddata', 'mygenres.json')

        Counter.objects.update_known_counters()

        self.stdout.write('Genres load from opds_catalog/fixtures/mygenres.json')

        

    def setconf(self, confparam, confvalue):  

        if confparam and confvalue:

            call_command('constance', 'set',confparam, confvalue, app_label='opds_catalog')

            call_command('constance', 'set',confparam, confvalue)

            self.stdout.write('Config parameter %s set to %s'%(confparam, confvalue))
@@ -80,7 +80,6 @@ class Command(BaseCommand): 
        if confparam:

            call_command('constance', 'get', confparam)

        else:

            # call_command('constance', 'list', app_label='opds_catalog')

            call_command('constance', 'list')



    def pg_optimize(self):

opds_catalog/opdsdb.py

+1 −1
Original line number Diff line number Diff line
@@ -59,12 +59,12 @@ def clear_all(verbose=False): 
    cursor.execute('delete from opds_catalog_bseries')

    cursor.execute('delete from opds_catalog_bauthor')

    cursor.execute('delete from opds_catalog_bgenre')

    cursor.execute('delete from opds_catalog_bookshelf')

    cursor.execute('delete from opds_catalog_book')

    cursor.execute('delete from opds_catalog_catalog')

    cursor.execute('delete from opds_catalog_author')

    cursor.execute('delete from opds_catalog_genre')

    cursor.execute('delete from opds_catalog_series')

    cursor.execute('delete from opds_catalog_bookshelf')

    cursor.execute('delete from opds_catalog_counter')

    

def clear_genres(verbose=False):