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

diff --git a/apps/catalogue/management/commands/importbooks.py b/apps/catalogue/management/commands/importbooks.py
index 699f2c945..ff9184e47 100644
--- a/apps/catalogue/management/commands/importbooks.py
+++ b/apps/catalogue/management/commands/importbooks.py
@@ -6,7 +6,7 @@ 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
@@ -14,6 +14,7 @@ from django.core.files import File
 from catalogue.models import Book
 from picture.models import Picture
 
+from search import Index
 
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
@@ -29,11 +30,12 @@ class Command(BaseCommand):
             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'),
+        make_option('-S', '--no-search-index', action='store_false', dest='search_index', default=True,
+            help='Don\'t build PDF file'),
         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,
             help='Import pictures'),
-        
     )
     help = 'Imports books from the specified directories.'
     args = 'directory [directory ...]'
@@ -42,27 +44,20 @@ class Command(BaseCommand):
         verbose = options.get('verbose')
         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'))
-
-        if os.path.isfile(file_base + '.pdf'):
-            book.pdf_file.save('%s.pdf' % book.slug, File(file(file_base + '.pdf')))
-            if verbose:
-                print "Importing %s.pdf" % file_base
-        if os.path.isfile(file_base + '.mobi'):
-            book.mobi_file.save('%s.mobi' % book.slug, File(file(file_base + '.mobi')))
-            if verbose:
-                print "Importing %s.mobi" % file_base
-        if os.path.isfile(file_base + '.epub'):
-            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 + '.txt'):
-            book.txt_file.save('%s.txt' % book.slug, File(file(file_base + '.txt')))
-            if verbose:
-                print "Importing %s.txt" % file_base
+                                                    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'),
+                                                    search_index_reuse=True, 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)))
+                if verbose:
+                    print "Importing %s.%s" % (file_base, ebook_format)
+
         book.save()
 
     def import_picture(self, file_path, options):
@@ -87,6 +82,14 @@ class Command(BaseCommand):
                     time.strftime('%Y-%m-%d %H:%M:%S',
                     time.localtime(wait_until)), wait_until - time.time())
 
+        if options.get('search_index') and not settings.NO_SEARCH_INDEX:
+            index = Index()
+            index.open()
+            try:
+                index.index_tags()
+            finally:
+                index.close()
+
         # Start transaction management.
         transaction.commit_unless_managed()
         transaction.enter_transaction_management()
@@ -94,7 +97,7 @@ class Command(BaseCommand):
 
         files_imported = 0
         files_skipped = 0
-
+        
         for dir_name in directories:
             if not os.path.isdir(dir_name):
                 print self.style.ERROR("%s: Not a directory. Skipping." % dir_name)
@@ -124,7 +127,8 @@ class Command(BaseCommand):
                         else:
                             self.import_book(file_path, options)
                         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)