X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f258a9896bbeff2a900d8bafb2aecfce03f19bd8..4c0a2cdc4ea9531a47943ececfa3dc656a0462f1:/apps/catalogue/management/commands/importbooks.py diff --git a/apps/catalogue/management/commands/importbooks.py b/apps/catalogue/management/commands/importbooks.py index 467dc14f5..323755e58 100644 --- a/apps/catalogue/management/commands/importbooks.py +++ b/apps/catalogue/management/commands/importbooks.py @@ -6,12 +6,18 @@ import os import sys import time 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 catalogue.utils import trim_query_log + +from wolnelektury_core.management.profile import profile from catalogue.models import Book +from picture.models import Picture + +from search import Index class Command(BaseCommand): @@ -19,31 +25,74 @@ class Command(BaseCommand): 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='Print status messages to stdout'), - make_option('-E', '--no-build-epub', action='store_false', dest='build_epub', default=True, - help='Don\'t build EPUB file'), + 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('-w', '--wait-until', dest='wait_until', metavar='TIME', help='Wait until specified time (Y-M-D h:m:s)'), + 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 import_book(self, file_path, options): + verbose = options.get('verbose') + if options.get('dont_build'): + dont_build = options.get('dont_build').lower().split(',') + else: + dont_build = None + 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) + for ebook_format in Book.ebook_formats: + if os.path.isfile(file_base + '.' + ebook_format): + getattr(book, '%s_file' % ebook_format).save( + '%s.%s' % (book.slug, ebook_format), + File(file(file_base + '.' + ebook_format)), + save=False + ) + if verbose: + print "Importing %s.%s" % (file_base, ebook_format) + book.save() + + def import_picture(self, file_path, options): + picture = Picture.from_xml_file(file_path, overwrite=options.get('force')) + return picture + + # @profile def handle(self, *directories, **options): from django.db import transaction self.style = color_style() - + verbose = options.get('verbose') force = options.get('force') show_traceback = options.get('traceback', False) + import_picture = options.get('import_picture') + wait_until = None if options.get('wait_until'): wait_until = time.mktime(time.strptime(options.get('wait_until'), '%Y-%m-%d %H:%M:%S')) if verbose > 0: print "Will wait until %s; it's %f seconds from now" % ( - time.strftime('%Y-%m-%d %H:%M:%S', + time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(wait_until)), wait_until - time.time()) + 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: + index.index.rollback() + raise e + # Start transaction management. transaction.commit_unless_managed() transaction.enter_transaction_management() @@ -56,7 +105,12 @@ class Command(BaseCommand): if not os.path.isdir(dir_name): print self.style.ERROR("%s: Not a directory. Skipping." % dir_name) else: - for file_name in sorted(os.listdir(dir_name)): + # files queue + files = sorted(os.listdir(dir_name)) + postponed = {} + while files: + trim_query_log(0) + file_name = files.pop(0) file_path = os.path.join(dir_name, file_name) file_base, ext = os.path.splitext(file_path) @@ -72,45 +126,30 @@ class Command(BaseCommand): # Import book files try: - book = Book.from_xml_file(file_path, overwrite=force, build_epub=options.get('build_epub')) - files_imported += 1 + if import_picture: + self.import_picture(file_path, options) + else: + self.import_book(file_path, options) - if os.path.isfile(file_base + '.pdf'): - book.pdf_file.save('%s.pdf' % book.slug, File(file(file_base + '.pdf'))) - if verbose: - print "Importing %s.pdf" % file_base - if os.path.isfile(file_base + '.epub'): - book.epub_file.save('%s.epub' % book.slug, File(file(file_base + '.epub'))) - if verbose: - print "Importing %s.epub" % file_base - if os.path.isfile(file_base + '.odt'): - book.odt_file.save('%s.odt' % book.slug, File(file(file_base + '.odt'))) - if verbose: - print "Importing %s.odt" % file_base - if os.path.isfile(file_base + '.txt'): - book.txt_file.save('%s.txt' % book.slug, File(file(file_base + '.txt'))) - if verbose: - print "Importing %s.txt" % file_base - if os.path.isfile(os.path.join(dir_name, book.slug + '.mp3')): - book.mp3_file.save('%s.mp3' % book.slug, File(file(os.path.join(dir_name, book.slug + '.mp3')))) - if verbose: - print "Importing %s.mp3" % book.slug - if os.path.isfile(os.path.join(dir_name, book.slug + '.ogg')): - book.ogg_file.save('%s.ogg' % book.slug, File(file(os.path.join(dir_name, book.slug + '.ogg')))) - if verbose: - print "Importing %s.ogg" % book.slug - if os.path.isfile(os.path.join(dir_name, book.slug + '.daisy.zip')): - book.ogg_file.save('%s.daisy.zip' % book.slug, File(file(os.path.join(dir_name, book.slug + '.daisy.zip')))) - if verbose: - print "Importing %s.daisy.zip" % book.slug - - book.save() - - except Book.AlreadyExists, msg: - print self.style.ERROR('%s: Book already imported. Skipping. To overwrite use --force.' % + files_imported += 1 + transaction.commit() + + 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 + # Print results print print "Results: %d files imported, %d skipped, %d total." % ( @@ -126,4 +165,3 @@ class Command(BaseCommand): transaction.commit() transaction.leave_transaction_management() -