Celery 3.1, librarian update

[wolnelektury.git] / apps / catalogue / management / commands / importbooks.py

diff --git a/apps/catalogue/management/commands/importbooks.py b/apps/catalogue/management/commands/importbooks.py
index 8f181cf..d0d2f22 100644 (file)
--- a/apps/catalogue/management/commands/importbooks.py
+++ b/apps/catalogue/management/commands/importbooks.py
@@ -10,12 +10,16 @@ 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 librarian.picture import ImageStore
+from wolnelektury_core.management.profile import profile
 
 from catalogue.models import Book
 from picture.models import Picture
 
 from search import Index
 
+
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
         make_option('-q', '--quiet', action='store_false', dest='verbose', default=True,
@@ -48,7 +52,7 @@ class Command(BaseCommand):
         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), 
+                    '%s.%s' % (book.slug, ebook_format),
                     File(file(file_base + '.' + ebook_format)),
                     save=False
                     )
@@ -56,18 +60,25 @@ class Command(BaseCommand):
                     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'))
+    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:
+            if continue_on_error:
+                print "%s: %s" % (file_path, ex)
+                return
+            else:
+                raise ex
         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
@@ -104,6 +115,7 @@ class Command(BaseCommand):
                 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)
@@ -124,6 +136,7 @@ class Command(BaseCommand):
                             self.import_picture(file_path, options)
                         else:
                             self.import_book(file_path, options)
+
                         files_imported += 1
                         transaction.commit()