Merge branch 'master' into dev

[nhentai.git] / nhentai / command.py

diff --git a/nhentai/command.py b/nhentai/command.py
index 6f821d347e16dbf6cf2d9463280018e22868f9ef..f6c48559a30d29baa4285491d6039a089b674e29 100644 (file)
--- a/nhentai/command.py
+++ b/nhentai/command.py
@@ -6,12 +6,12 @@ import platform
 import time
 
 from nhentai.cmdline import cmd_parser, banner
-from nhentai.parser import doujinshi_parser, search_parser, print_doujinshi, favorites_parser, tag_parser
+from nhentai.parser import doujinshi_parser, search_parser, print_doujinshi, favorites_parser
 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, check_cookie, signal_handler, DB
+from nhentai.utils import generate_html, generate_cbz, generate_main_html, generate_pdf, check_cookie, signal_handler, DB
 
 
 def main():
@@ -21,14 +21,12 @@ 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
     check_cookie()
 
-    index = 0
-    index_value = None
     doujinshis = []
     doujinshi_ids = []
     doujinshi_list = []
@@ -39,38 +37,16 @@ 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:
-        index = 1
-        index_value = options.artist
-
-    elif options.character:
-        index = 2
-        index_value = options.character
-
-    elif options.parody:
-        index = 3
-        index_value = options.parody
-
-    elif options.group:
-        index = 4
-        index_value = options.group
-
-    elif options.language:
-        index = 5
-        index_value = options.language
-
     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
 
-    if index:
-        doujinshis = tag_parser(index_value, max_page=options.max_page, index=index)
-
     print_doujinshi(doujinshis)
     if options.is_download and doujinshis:
         doujinshi_ids = [i['id'] for i in doujinshis]
@@ -106,10 +82,12 @@ def main():
                 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, options.write_comic_info)
+                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)
@@ -125,6 +103,5 @@ def main():
 
 signal.signal(signal.SIGINT, signal_handler)
 
-
 if __name__ == '__main__':
     main()