X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=nhentai%2Fcommand.py;h=bc987fb8852390a6d705e7205be26c2842d6a9f3;hb=00aad774ae0099a7ef2ed2ed481d333cf0f6f418;hp=deb90716e4d9a001fc7ea98ad79c950080176120;hpb=f234b7234e4a4b84e4ada7139666215116d7eba7;p=nhentai.git

diff --git a/nhentai/command.py b/nhentai/command.py
index deb9071..bc987fb 100644
--- a/nhentai/command.py
+++ b/nhentai/command.py
@@ -1,84 +1,76 @@
 #!/usr/bin/env python2.7
 # coding: utf-8
-from __future__ import unicode_literals, print_function
+
+import sys
 import signal
 import platform
 import time
-import multiprocessing
 
+from nhentai import constant
 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, \
+    paging, check_cookie, signal_handler, DB
 
 
 def main():
     banner()
+
+    if sys.version_info < (3, 0, 0):
+        logger.error('nhentai now only support Python 3.x')
+        exit(1)
+
     options = cmd_parser()
     logger.info('Using mirror: {0}'.format(BASE_URL))
 
-    from nhentai.constant import PROXY
-    # constant.PROXY will be changed after cmd_parser()
-    if PROXY != {}:
-        logger.info('Using proxy: {0}'.format(PROXY))
+    # CONFIG['proxy'] will be changed after cmd_parser()
+    if constant.CONFIG['proxy']['http']:
+        logger.info('Using proxy: {0}'.format(constant.CONFIG['proxy']['http']))
+
+    if not constant.CONFIG['template']:
+        constant.CONFIG['template'] = 'default'
+
+    logger.info('Using viewer template "{}"'.format(constant.CONFIG['template']))
 
     # check your cookie
     check_cookie()
 
+    doujinshis = []
     doujinshi_ids = []
     doujinshi_list = []
 
+    page_list = paging(options.page)
+
     if options.favorites:
         if not options.is_download:
             logger.warning('You do not specify --download option')
 
-        doujinshis = favorites_parser(options.page_range)
-        print_doujinshi(doujinshis)
-        if options.is_download and doujinshis:
-            doujinshi_ids = [i['id'] for i in doujinshis]
-
-    elif options.tag:
-        doujinshis = tag_parser(options.tag, sorting=options.sorting, max_page=options.max_page)
-        print_doujinshi(doujinshis)
-        if options.is_download and doujinshis:
-            doujinshi_ids = [i['id'] for i in doujinshis]
-
-    elif options.artist:
-        doujinshis = tag_parser(options.artist, max_page=options.max_page, index=1)
-        print_doujinshi(doujinshis)
-        if options.is_download and doujinshis:
-            doujinshi_ids = [i['id'] for i in doujinshis]
-
-    elif options.character:
-        doujinshis = tag_parser(options.character, max_page=options.max_page, index=2)
-        print_doujinshi(doujinshis)
-        if options.is_download and doujinshis:
-            doujinshi_ids = [i['id'] for i in doujinshis]
-
-    elif options.parody:
-        doujinshis = tag_parser(options.parody, max_page=options.max_page, index=3)
-        print_doujinshi(doujinshis)
-        if options.is_download and doujinshis:
-            doujinshi_ids = [i['id'] for i in doujinshis]
-
-    elif options.group:
-        doujinshis = tag_parser(options.group, max_page=options.max_page, index=4)
-        print_doujinshi(doujinshis)
-        if options.is_download and doujinshis:
-            doujinshi_ids = [i['id'] for i in doujinshis]
+        doujinshis = favorites_parser(page=page_list)
 
     elif options.keyword:
-        doujinshis = search_parser(options.keyword, sorting=options.sorting, page=options.page)
-        print_doujinshi(doujinshis)
-        if options.is_download:
-            doujinshi_ids = [i['id'] for i in doujinshis]
+        if constant.CONFIG['language']:
+            logger.info('Using default language: {0}'.format(constant.CONFIG['language']))
+            options.keyword += ' language:{}'.format(constant.CONFIG['language'])
+        doujinshis = search_parser(options.keyword, sorting=options.sorting, page=page_list,
+                                   is_page_all=options.page_all)
 
     elif not doujinshi_ids:
         doujinshi_ids = options.id
 
+    print_doujinshi(doujinshis)
+    if options.is_download and doujinshis:
+        doujinshi_ids = [i['id'] for i in doujinshis]
+
+    if options.is_save_download_history:
+        with DB() as db:
+            data = map(int, db.get_all())
+
+        doujinshi_ids = list(set(map(int, doujinshi_ids)) - set(data))
+
     if doujinshi_ids:
         for i, id_ in enumerate(doujinshi_ids):
             if options.delay:
@@ -100,11 +92,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:
-                generate_html(options.output_dir, doujinshi)
+            if not options.is_nohtml and not options.is_cbz and not options.is_pdf:
+                generate_html(options.output_dir, doujinshi, template=constant.CONFIG['template'])
             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)