X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=nhentai%2Fcommand.py;h=f6c48559a30d29baa4285491d6039a089b674e29;hb=ad86c49de945c25e1f87b1600cc48cccb12a6750;hp=a0cac082797ededdade39ace8dece6d430b300c9;hpb=16d3b555c9ce7e8c6e1c31d5c5a4e2987a0c1fdb;p=nhentai.git

diff --git a/nhentai/command.py b/nhentai/command.py
index a0cac08..f6c4855 100644
--- a/nhentai/command.py
+++ b/nhentai/command.py
@@ -1,55 +1,104 @@
 #!/usr/bin/env python2.7
 # coding: utf-8
+from __future__ import unicode_literals, print_function
 import signal
+import platform
+import time
 
 from nhentai.cmdline import cmd_parser, banner
-from nhentai.parser import doujinshi_parser, search_parser, print_doujinshi
+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, generate_pdf, check_cookie, signal_handler, DB
 
 
 def main():
     banner()
-    logger.info('Using mirror: {0}'.format(BASE_URL))
     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))
 
+    # check your cookie
+    check_cookie()
+
+    doujinshis = []
     doujinshi_ids = []
     doujinshi_list = []
 
-    if options.keyword:
-        doujinshis = search_parser(options.keyword, options.page)
-        print_doujinshi(doujinshis)
-        if options.is_download:
-            doujinshi_ids = map(lambda d: d['id'], doujinshis)
-    else:
+    if options.favorites:
+        if not options.is_download:
+            logger.warning('You do not specify --download option')
+
+        doujinshis = favorites_parser(options.page_range)
+
+    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:
+        doujinshi_ids = [i['id'] for i in doujinshis]
+
+        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 id in doujinshi_ids:
-            doujinshi_info = doujinshi_parser(id)
-            doujinshi_list.append(Doujinshi(**doujinshi_info))
-    else:
-        exit(0)
+        for i, id_ in enumerate(doujinshi_ids):
+            if options.delay:
+                time.sleep(options.delay)
+
+            doujinshi_info = doujinshi_parser(id_)
+
+            if doujinshi_info:
+                doujinshi_list.append(Doujinshi(name_format=options.name_format, **doujinshi_info))
+
+            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,
-                                thread=options.threads, timeout=options.timeout)
+        downloader = Downloader(path=options.output_dir, size=options.threads,
+                                timeout=options.timeout, delay=options.delay)
 
         for doujinshi in doujinshi_list:
+
             doujinshi.downloader = downloader
             doujinshi.download()
+            if options.is_save_download_history:
+                with DB() as db:
+                    db.add_one(doujinshi.id)
 
-        logger.log(15, u'🍺 All done.')
+            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)
 
-    else:
-        [doujinshi.show() for doujinshi in doujinshi_list]
+        if options.main_viewer:
+            generate_main_html(options.output_dir)
 
+        if not platform.system() == 'Windows':
+            logger.log(15, '🍻 All done.')
+        else:
+            logger.log(15, 'All done.')
 
-def signal_handler(signal, frame):
-    logger.error('Ctrl-C signal received. Quit.')
-    exit(1)
+    else:
+        [doujinshi.show() for doujinshi in doujinshi_list]
 
 
 signal.signal(signal.SIGINT, signal_handler)