fix format

[nhentai.git] / nhentai / command.py

diff --git a/nhentai/command.py b/nhentai/command.py
index 47fbc3c3fe9350e72169b057e75ddff048d77404..a6c91d050bb598620ceb9b5dc60fba28f54535e6 100644 (file)
--- a/nhentai/command.py
+++ b/nhentai/command.py
@@ -1,8 +1,7 @@
 #!/usr/bin/env python2.7
 # coding: utf-8
-from __future__ import unicode_literals, print_function
-import json
-import os
+
+import sys
 import signal
 import platform
 import time
@@ -13,19 +12,29 @@ from nhentai.parser import doujinshi_parser, search_parser, print_doujinshi, fav
 from nhentai.doujinshi import Doujinshi
 from nhentai.downloader import Downloader
 from nhentai.logger import logger
-from nhentai.constant import NHENTAI_CONFIG_FILE, BASE_URL
-from nhentai.utils import generate_html, generate_cbz, generate_main_html, generate_pdf, \
+from nhentai.constant import BASE_URL
+from nhentai.utils import generate_html, generate_cbz, generate_main_html, generate_pdf, generate_metadata_file, \
     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))
 
     # CONFIG['proxy'] will be changed after cmd_parser()
-    if constant.CONFIG['proxy']:
-        logger.info('Using proxy: {0}'.format(constant.CONFIG['proxy']))
+    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()
@@ -56,11 +65,11 @@ def main():
     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())
+    if options.is_save_download_history:
+        with DB() as db:
+            data = map(int, db.get_all())
 
-            doujinshi_ids = list(set(doujinshi_ids) - set(data))
+        doujinshi_ids = list(set(map(int, doujinshi_ids)) - set(data))
 
     if doujinshi_ids:
         for i, id_ in enumerate(doujinshi_ids):
@@ -80,15 +89,23 @@ def main():
                                 timeout=options.timeout, delay=options.delay)
 
         for doujinshi in doujinshi_list:
+            if not options.dryrun:
+                doujinshi.downloader = downloader
+                doujinshi.download()
 
             doujinshi.downloader = downloader
             doujinshi.download()
+
+            if options.generate_metadata:
+                table = doujinshi.table
+                generate_metadata_file(options.output_dir, table, doujinshi)
+
             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 and not options.is_pdf:
-                generate_html(options.output_dir, doujinshi)
+                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: