X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/73ce961f14509aabfa26536f847afd28111029c6..b2422020bc864b75f31c215b34692468cc03ce92:/apps/catalogue/management/commands/importbooks.py

diff --git a/apps/catalogue/management/commands/importbooks.py b/apps/catalogue/management/commands/importbooks.py
index 5b4d499a4..323755e58 100644
--- a/apps/catalogue/management/commands/importbooks.py
+++ b/apps/catalogue/management/commands/importbooks.py
@@ -6,31 +6,31 @@ 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):
     option_list = BaseCommand.option_list + (
         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'),
-        make_option('-M', '--no-build-mobi', action='store_false', dest='build_mobi', default=True,
-            help='Don\'t build MOBI file'),
-        make_option('-T', '--no-build-txt', action='store_false', dest='build_txt', default=True,
-            help='Don\'t build TXT file'),
-        make_option('-P', '--no-build-pdf', action='store_false', dest='build_pdf', default=True,
-            help='Don\'t build PDF 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='Don\'t build PDF file'),
+            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,
@@ -41,32 +41,35 @@ class Command(BaseCommand):
 
     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'),
-                                                    build_epub=options.get('build_epub'),
-                                                    build_txt=options.get('build_txt'),
-                                                    build_pdf=options.get('build_pdf'),
-                                                    build_mobi=options.get('build_mobi'),
-                                                    search_index=options.get('search_index'))
+                                  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)))
+                    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)
@@ -80,6 +83,16 @@ class Command(BaseCommand):
                     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()
@@ -96,6 +109,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)
@@ -116,8 +130,10 @@ class Command(BaseCommand):
                             self.import_picture(file_path, options)
                         else:
                             self.import_book(file_path, options)
-                        files_imported += 1
 
+                        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)
@@ -149,4 +165,3 @@ class Command(BaseCommand):
 
         transaction.commit()
         transaction.leave_transaction_management()
-