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

diff --git a/apps/catalogue/management/commands/importbooks.py b/apps/catalogue/management/commands/importbooks.py
index 699f2c945..5b4d499a4 100644
--- a/apps/catalogue/management/commands/importbooks.py
+++ b/apps/catalogue/management/commands/importbooks.py
@@ -29,11 +29,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 +43,19 @@ 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'))
+        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):