X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/9c5d9a4e77a10b4e60d89d3890e49002bd7f3993..d99d71844b7b97800dcab7cbb81c3a4185acbb48:/apps/catalogue/management/commands/importbooks.py diff --git a/apps/catalogue/management/commands/importbooks.py b/apps/catalogue/management/commands/importbooks.py index cead75fa2..3daca8ac6 100644 --- a/apps/catalogue/management/commands/importbooks.py +++ b/apps/catalogue/management/commands/importbooks.py @@ -4,6 +4,7 @@ # import os import sys +import time from optparse import make_option from django.core.management.base import BaseCommand @@ -18,7 +19,11 @@ 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') + 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'), + make_option('-w', '--wait-until', dest='wait_until', metavar='TIME', + help='Wait until specified time (Y-M-D h:m:s)'), ) help = 'Imports books from the specified directories.' args = 'directory [directory ...]' @@ -32,6 +37,13 @@ class Command(BaseCommand): force = options.get('force') show_traceback = options.get('traceback', False) + 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.localtime(wait_until)), wait_until - time.time()) + # Start transaction management. transaction.commit_unless_managed() transaction.enter_transaction_management() @@ -44,7 +56,11 @@ 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 os.listdir(dir_name): + # 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) @@ -60,7 +76,7 @@ class Command(BaseCommand): # Import book files try: - book = Book.from_xml_file(file_path, overwrite=force) + book = Book.from_xml_file(file_path, overwrite=force, build_epub=options.get('build_epub')) files_imported += 1 if os.path.isfile(file_base + '.pdf'): @@ -87,6 +103,10 @@ class Command(BaseCommand): 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() @@ -95,12 +115,30 @@ class Command(BaseCommand): 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." % ( files_imported, files_skipped, files_imported + files_skipped) print + if wait_until: + print 'Waiting...' + try: + time.sleep(wait_until - time.time()) + except IOError: + print "it's already too late" + transaction.commit() transaction.leave_transaction_management()