X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/87e084d47c335cd6f0b3e91d614999f55d148044..e852900e42eb0bde98daf7070d84816e44c3308e:/src/catalogue/management/commands/importbooks.py diff --git a/src/catalogue/management/commands/importbooks.py b/src/catalogue/management/commands/importbooks.py index 559124bdf..e5e7c89fa 100644 --- a/src/catalogue/management/commands/importbooks.py +++ b/src/catalogue/management/commands/importbooks.py @@ -1,39 +1,45 @@ -# -*- coding: utf-8 -*- # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # import os import sys -from optparse import make_option from django.conf import settings from django.core.management.base import BaseCommand from django.core.management.color import color_style from django.core.files import File +from django.db import transaction from librarian.picture import ImageStore -from wolnelektury.management.profile import profile from catalogue.models import Book from picture.models import Picture - from search.index import Index class Command(BaseCommand): - option_list = BaseCommand.option_list + ( - make_option('-q', '--quiet', action='store_false', dest='verbose', default=True, - help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'), - make_option('-f', '--force', action='store_true', dest='force', default=False, - help='Overwrite works already in the catalogue'), - make_option('-D', '--dont-build', dest='dont_build', - metavar="FORMAT,...", - help="Skip building specified formats"), - make_option('-S', '--no-search-index', action='store_false', dest='search_index', default=True, - help='Skip indexing imported works for search'), - make_option('-p', '--picture', action='store_true', dest='import_picture', default=False, - help='Import pictures'), - ) help = 'Imports books from the specified directories.' - args = 'directory [directory ...]' + + def add_arguments(self, parser): + parser.add_argument( + '-q', '--quiet', action='store_false', dest='verbose', default=True, + help='Verbosity level; 0=minimal output, 1=normal output, 2=all output') + parser.add_argument( + '-f', '--force', action='store_true', dest='force', + default=False, help='Overwrite works already in the catalogue') + parser.add_argument( + '-D', '--dont-build', dest='dont_build', metavar="FORMAT,...", + help="Skip building specified formats") + parser.add_argument( + '-S', '--no-search-index', action='store_false', + dest='search_index', default=True, + help='Skip indexing imported works for search') + parser.add_argument( + '-F', '--not-findable', action='store_false', + dest='findable', default=True, + help='Set book as not findable.') + parser.add_argument( + '-p', '--picture', action='store_true', dest='import_picture', + default=False, help='Import pictures') + parser.add_argument('directory', nargs='+') def import_book(self, file_path, options): verbose = options.get('verbose') @@ -44,7 +50,9 @@ class Command(BaseCommand): file_base, ext = os.path.splitext(file_path) book = Book.from_xml_file(file_path, overwrite=options.get('force'), dont_build=dont_build, - search_index_tags=False) + search_index_tags=False, + findable=options.get('findable'), + ) for ebook_format in Book.ebook_formats: if os.path.isfile(file_base + '.' + ebook_format): getattr(book, '%s_file' % ebook_format).save( @@ -53,94 +61,90 @@ class Command(BaseCommand): save=False ) if verbose: - print "Importing %s.%s" % (file_base, ebook_format) + print("Importing %s.%s" % (file_base, ebook_format)) book.save() def import_picture(self, file_path, options, continue_on_error=True): try: image_store = ImageStore(os.path.dirname(file_path)) picture = Picture.from_xml_file(file_path, image_store=image_store, overwrite=options.get('force')) - except Exception, ex: + except Exception as ex: if continue_on_error: - print "%s: %s" % (file_path, ex) + print("%s: %s" % (file_path, ex)) return else: raise ex return picture - # @profile - def handle(self, *directories, **options): - from django.db import transaction - + @transaction.atomic + def handle(self, **options): self.style = color_style() verbose = options.get('verbose') import_picture = options.get('import_picture') - index = None if options.get('search_index') and not settings.NO_SEARCH_INDEX: index = Index() try: index.index_tags() index.index.commit() - except Exception, e: + except Exception as e: index.index.rollback() raise e - # Start transaction management. - with transaction.atomic(): - files_imported = 0 - files_skipped = 0 - - for dir_name in directories: - if not os.path.isdir(dir_name): - print self.style.ERROR("%s: Not a directory. Skipping." % dir_name) - else: - # files queue - files = sorted(os.listdir(dir_name)) - postponed = {} - while files: - file_name = files.pop(0) - file_path = os.path.join(dir_name, file_name) - file_base, ext = os.path.splitext(file_path) - - # Skip files that are not XML files - if not ext == '.xml': - continue - - if verbose > 0: - print "Parsing '%s'" % file_path + files_imported = 0 + files_skipped = 0 + + for dir_name in options['directory']: + if not os.path.isdir(dir_name): + print(self.style.ERROR("%s: Not a directory. Skipping." % dir_name)) + else: + # files queue + files = sorted(os.listdir(dir_name)) + postponed = {} + while files: + file_name = files.pop(0) + file_path = os.path.join(dir_name, file_name) + file_base, ext = os.path.splitext(file_path) + + # Skip files that are not XML files + if not ext == '.xml': + continue + + if verbose > 0: + print("Parsing '%s'" % file_path) + else: + sys.stdout.write('.') + sys.stdout.flush() + + # Import book files + try: + if import_picture: + self.import_picture(file_path, options) + else: + self.import_book(file_path, options) + + files_imported += 1 + + except (Book.AlreadyExists, Picture.AlreadyExists): + print(self.style.ERROR( + '%s: Book or Picture already imported. Skipping. To overwrite use --force.' % + file_path)) + files_skipped += 1 + + except Book.DoesNotExist as e: + if file_name not in postponed or postponed[file_name] < files_imported: + # push it back into the queue, maybe the missing child will show up + if verbose: + print(self.style.NOTICE('Waiting for missing children')) + files.append(file_name) + postponed[file_name] = files_imported else: - sys.stdout.write('.') - sys.stdout.flush() - - # Import book files - try: - if import_picture: - self.import_picture(file_path, options) - else: - self.import_book(file_path, options) - - files_imported += 1 - - except (Book.AlreadyExists, Picture.AlreadyExists): - print self.style.ERROR('%s: Book or Picture already imported. Skipping. To overwrite use --force.' % - file_path) - files_skipped += 1 - - except Book.DoesNotExist, e: - if file_name not in postponed or postponed[file_name] < files_imported: - # push it back into the queue, maybe the missing child will show up - if verbose: - print self.style.NOTICE('Waiting for missing children') - files.append(file_name) - postponed[file_name] = files_imported - else: - # we're in a loop, nothing's being imported - some child is really missing - raise e + # we're in a loop, nothing's being imported - some child is really missing + raise e # Print results - print - print "Results: %d files imported, %d skipped, %d total." % ( - files_imported, files_skipped, files_imported + files_skipped) - print + print() + print("Results: %d files imported, %d skipped, %d total." % ( + files_imported, files_skipped, files_imported + files_skipped)) + print()