0.4.12

fix bugs

nhentai/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '0.4.10'
+__version__ = '0.4.12'
 __author__ = 'RicterZ'
 __email__ = 'ricterzheng@gmail.com'

nhentai/cmdline.py

@@ -1,5 +1,5 @@
 # coding: utf-8
-from __future__ import print_function
+
 import os
 import sys
 import json
@@ -120,7 +120,6 @@ def cmd_parser():
 
     try:
         sys.argv = [unicode(i.decode(sys.stdin.encoding)) for i in sys.argv]
-        print()
     except (NameError, TypeError):
         pass
     except UnicodeDecodeError:
@@ -157,7 +156,7 @@ def cmd_parser():
         exit(0)
         # TODO: search without language
 
-    if args.proxy:
+    if args.proxy is not None:
         proxy_url = urlparse(args.proxy)
         if not args.proxy == '' and proxy_url.scheme not in ('http', 'https'):
             logger.error('Invalid protocol \'{0}\' of proxy, ignored'.format(proxy_url.scheme))
@@ -171,7 +170,7 @@ def cmd_parser():
             write_config()
             exit(0)
 
-    if args.viewer_template:
+    if args.viewer_template is not None:
         if not args.viewer_template:
             args.viewer_template = 'default'
 

nhentai/command.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python2.7
 # coding: utf-8
-from __future__ import unicode_literals, print_function
+
 import sys
 import signal
 import platform
@@ -19,6 +19,11 @@ from nhentai.utils import generate_html, generate_cbz, generate_main_html, gener
 
 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))
 
@@ -114,8 +119,4 @@ signal.signal(signal.SIGINT, signal_handler)
 
 
 if __name__ == '__main__':
-    if sys.version_info < (3, 0, 0):
-        logger.error('nhentai now only support Python 3.x')
-        exit(1)
-
     main()

nhentai/constant.py

@@ -1,7 +1,6 @@
 # coding: utf-8
-from __future__ import unicode_literals, print_function
+
 import os
-import copy
 import tempfile
 
 try:

nhentai/doujinshi.py

@@ -1,7 +1,6 @@
 # coding: utf-8
-from __future__ import print_function, unicode_literals
+
 from tabulate import tabulate
-from future.builtins import range
 
 from nhentai.constant import DETAIL_URL, IMAGE_URL
 from nhentai.logger import logger

nhentai/downloader.py

@@ -1,5 +1,4 @@
 # coding: utf-
-from __future__ import unicode_literals, print_function
 
 import multiprocessing
 import signal

nhentai/logger.py

@@ -1,7 +1,6 @@
 #
 # Copyright (C) 2010-2012 Vinay Sajip. All rights reserved. Licensed under the new BSD license.
 #
-from __future__ import print_function, unicode_literals
 import logging
 import re
 import platform

nhentai/parser.py

@@ -1,5 +1,4 @@
 # coding: utf-8
-from __future__ import unicode_literals, print_function
 
 import os
 import re
@@ -118,6 +117,9 @@ def doujinshi_parser(id_):
         response = request('get', url)
         if response.status_code in (200, ):
             response = response.content
+        elif response.status_code in (404,):
+            logger.error("Doujinshi with id {0} cannot be found".format(id_))
+            return []
         else:
             logger.debug('Slow down and retry ({}) ...'.format(id_))
             time.sleep(1)

nhentai/utils.py

@@ -1,5 +1,4 @@
 # coding: utf-8
-from __future__ import unicode_literals, print_function
 
 import sys
 import re
@@ -240,8 +239,11 @@ def format_filename(s):
     if filename include forbidden characters (\'/:,;*?"<>|) ,it replace space character(' '). 
     """
     # maybe you can use `--format` to select a suitable filename
-    ban_chars = '\\\'/:,;*?"<>|'
+    ban_chars = '\\\'/:,;*?"<>|\t'
     filename = s.translate(str.maketrans(ban_chars, ' '*len(ban_chars))).strip()
+    filename = ' '.join(filename.split())
+    print(repr(filename))
+
     while filename.endswith('.'):
         filename = filename[:-1]