celery supervisord conf

[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 4c64bc3..62ead53 100644 (file)
--- a/apps/catalogue/management/commands/importbooks.py
+++ b/apps/catalogue/management/commands/importbooks.py
@@ -24,6 +24,8 @@ class Command(BaseCommand):
             help='Don\'t build EPUB 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'),
         make_option('-w', '--wait-until', dest='wait_until', metavar='TIME',
             help='Wait until specified time (Y-M-D h:m:s)'),
     )
@@ -81,7 +83,8 @@ class Command(BaseCommand):
                     try:
                         book = Book.from_xml_file(file_path, overwrite=force, 
                                                   build_epub=options.get('build_epub'),
-                                                  build_txt=options.get('build_txt'))
+                                                  build_txt=options.get('build_txt'),
+                                                  build_pdf=options.get('build_pdf'))
                         files_imported += 1
 
                         if os.path.isfile(file_base + '.pdf'):
@@ -92,28 +95,15 @@ class Command(BaseCommand):
                             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 + '.odt'):
-                            book.odt_file.save('%s.odt' % book.slug, File(file(file_base + '.odt')))
-                            if verbose:
-                                print "Importing %s.odt" % 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
-                        if os.path.isfile(os.path.join(dir_name, book.slug + '.mp3')):
-                            book.mp3_file.save('%s.mp3' % book.slug, File(file(os.path.join(dir_name, book.slug + '.mp3'))))
-                            if verbose:
-                                print "Importing %s.mp3" % book.slug
-                        if os.path.isfile(os.path.join(dir_name, book.slug + '.ogg')):
-                            book.ogg_file.save('%s.ogg' % book.slug, File(file(os.path.join(dir_name, book.slug + '.ogg'))))
-                            if verbose:
-                                print "Importing %s.ogg" % book.slug
-                        if os.path.isfile(os.path.join(dir_name, book.slug + '.daisy.zip')):
-                            book.ogg_file.save('%s.daisy.zip' % book.slug, File(file(os.path.join(dir_name, book.slug + '.daisy.zip'))))
-                            if verbose:
-                                print "Importing %s.daisy.zip" % book.slug
 
                         book.save()
+                        
+                        # clean the generated zip packages. Is this the right place for this?
+                        book.clean_zip_files()
 
                     except Book.AlreadyExists, msg:
                         print self.style.ERROR('%s: Book already imported. Skipping. To overwrite use --force.' %