Merge branch 'pull/221' into master

[nhentai.git] / nhentai / command.py

diff --git a/nhentai/command.py b/nhentai/command.py
index 92b6793e8a950d2b9b780bf46d168266baac024c..fe746cb014f80f1fba8e72ebadb85ab02ee32d90 100644 (file)
--- a/nhentai/command.py
+++ b/nhentai/command.py
@@ -13,7 +13,7 @@ from nhentai.doujinshi import Doujinshi
 from nhentai.downloader import Downloader
 from nhentai.logger import logger
 from nhentai.constant import BASE_URL
-from nhentai.utils import generate_html, generate_cbz, generate_main_html, generate_pdf, \
+from nhentai.utils import generate_html, generate_cbz, generate_main_html, generate_pdf, generate_metadatafile, \
     paging, check_cookie, signal_handler, DB
 
 
@@ -84,6 +84,8 @@ def main():
             if (i + 1) % 10 == 0:
                 logger.info('Progress: %d / %d' % (i + 1, len(doujinshi_ids)))
 
+       
+               
     if not options.is_show:
         downloader = Downloader(path=options.output_dir, size=options.threads,
                                 timeout=options.timeout, delay=options.delay)
@@ -92,6 +94,14 @@ def main():
             if not options.dryrun:
                 doujinshi.downloader = downloader
                 doujinshi.download()
+                                               
+            doujinshi.downloader = downloader
+            doujinshi.download()
+                       
+            if options.generate_metadata:
+              table=doujinshi.table            
+              generate_metadatafile(options.output_dir,table,doujinshi)
+                       
 
             if options.is_save_download_history:
                 with DB() as db:
@@ -114,6 +124,7 @@ def main():
 
     else:
         [doujinshi.show() for doujinshi in doujinshi_list]
+        
 
 
 signal.signal(signal.SIGINT, signal_handler)