Merge branch 'master' into dev

[nhentai.git] / nhentai / command.py

diff --git a/nhentai/command.py b/nhentai/command.py
index e8ee74e0b82b9957e0b19d136b8c23feea99e9a1..f6c48559a30d29baa4285491d6039a089b674e29 100644 (file)
--- a/nhentai/command.py
+++ b/nhentai/command.py
@@ -4,15 +4,14 @@ from __future__ import unicode_literals, print_function
 import signal
 import platform
 import time
-import multiprocessing
 
 from nhentai.cmdline import cmd_parser, banner
-from nhentai.parser import doujinshi_parser, search_parser, print_doujinshi, favorites_parser, tag_parser, login
+from nhentai.parser import doujinshi_parser, search_parser, print_doujinshi, favorites_parser
 from nhentai.doujinshi import Doujinshi
-from nhentai.downloader import Downloader, init_worker
+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, check_cookie, signal_handler
+from nhentai.utils import generate_html, generate_cbz, generate_main_html, generate_pdf, check_cookie, signal_handler, DB
 
 
 def main():
@@ -22,7 +21,7 @@ def main():
 
     from nhentai.constant import PROXY
     # constant.PROXY will be changed after cmd_parser()
-    if PROXY != {}:
+    if PROXY:
         logger.info('Using proxy: {0}'.format(PROXY))
 
     # check your cookie
@@ -38,37 +37,25 @@ def main():
 
         doujinshis = favorites_parser(options.page_range)
 
-    elif options.tag:
-        doujinshis = tag_parser(options.tag, sorting=options.sorting, max_page=options.max_page)
-
-    elif options.artist:
-        doujinshis = tag_parser(options.artist, max_page=options.max_page, index=1)
-
-    elif options.character:
-        doujinshis = tag_parser(options.character, max_page=options.max_page, index=2)
-
-    elif options.parody:
-        doujinshis = tag_parser(options.parody, max_page=options.max_page, index=3)
-
-    elif options.group:
-        doujinshis = tag_parser(options.group, max_page=options.max_page, index=4)
-
-    elif options.language:
-        doujinshis = tag_parser(options.language, max_page=options.max_page, index=5)
-
     elif options.keyword:
+        from nhentai.constant import LANGUAGE
+        if LANGUAGE:
+            logger.info('Using deafult language: {0}'.format(LANGUAGE))
+            options.keyword += ', language:{}'.format(LANGUAGE)
         doujinshis = search_parser(options.keyword, sorting=options.sorting, page=options.page)
 
     elif not doujinshi_ids:
         doujinshi_ids = options.id
 
+    print_doujinshi(doujinshis)
     if options.is_download and doujinshis:
-        print_doujinshi(doujinshis)
         doujinshi_ids = [i['id'] for i in doujinshis]
 
-        if options.is_save_download_states:
-            # TODO:
-            pass
+        if options.is_save_download_history:
+            with DB() as db:
+                data = set(db.get_all())
+
+            doujinshi_ids = list(set(doujinshi_ids) - data)
 
     if doujinshi_ids:
         for i, id_ in enumerate(doujinshi_ids):
@@ -91,11 +78,16 @@ def main():
 
             doujinshi.downloader = downloader
             doujinshi.download()
+            if options.is_save_download_history:
+                with DB() as db:
+                    db.add_one(doujinshi.id)
 
-            if not options.is_nohtml and not options.is_cbz:
+            if not options.is_nohtml and not options.is_cbz and not options.is_pdf:
                 generate_html(options.output_dir, doujinshi)
             elif options.is_cbz:
                 generate_cbz(options.output_dir, doujinshi, options.rm_origin_dir)
+            elif options.is_pdf:
+                generate_pdf(options.output_dir, doujinshi, options.rm_origin_dir)
 
         if options.main_viewer:
             generate_main_html(options.output_dir)
@@ -111,6 +103,5 @@ def main():
 
 signal.signal(signal.SIGINT, signal_handler)
 
-
 if __name__ == '__main__':
     main()