Fixes #3211, fixes #3211: related books and pictures bars.

[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 323755e..a15faa0 100644 (file)
--- a/apps/catalogue/management/commands/importbooks.py
+++ b/apps/catalogue/management/commands/importbooks.py
@@ -11,13 +11,13 @@ 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
+from search.index import Index
 
 
 class Command(BaseCommand):
@@ -52,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
                     )
@@ -60,8 +60,16 @@ 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
@@ -69,10 +77,8 @@ class Command(BaseCommand):
         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
@@ -133,7 +139,7 @@ class Command(BaseCommand):
 
                         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)