X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f258a9896bbeff2a900d8bafb2aecfce03f19bd8..e47b75737d714a11e22cf3f5bceadddbf340e3b3:/apps/catalogue/management/commands/importbooks.py

diff --git a/apps/catalogue/management/commands/importbooks.py b/apps/catalogue/management/commands/importbooks.py
index 467dc14f5..72878fe25 100644
--- a/apps/catalogue/management/commands/importbooks.py
+++ b/apps/catalogue/management/commands/importbooks.py
@@ -22,6 +22,8 @@ class Command(BaseCommand):
             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('-T', '--no-build-txt', action='store_false', dest='build_txt', default=True,
+            help='Don\'t build TXT file'),
         make_option('-w', '--wait-until', dest='wait_until', metavar='TIME',
             help='Wait until specified time (Y-M-D h:m:s)'),
     )
@@ -37,6 +39,7 @@ class Command(BaseCommand):
         force = options.get('force')
         show_traceback = options.get('traceback', False)
 
+        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:
@@ -56,7 +59,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 sorted(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)
 
@@ -72,7 +79,9 @@ class Command(BaseCommand):
 
                     # Import book files
                     try:
-                        book = Book.from_xml_file(file_path, overwrite=force, build_epub=options.get('build_epub'))
+                        book = Book.from_xml_file(file_path, overwrite=force, 
+                                                  build_epub=options.get('build_epub'),
+                                                  build_txt=options.get('build_txt'))
                         files_imported += 1
 
                         if os.path.isfile(file_base + '.pdf'):
@@ -83,26 +92,10 @@ class Command(BaseCommand):
                             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()
 
@@ -111,6 +104,17 @@ 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." % (