0.4.6

add default value of output dir

MANIFEST.in

@@ -6,3 +6,4 @@ include nhentai/viewer/scripts.js
 include nhentai/viewer/main.html
 include nhentai/viewer/main.css
 include nhentai/viewer/main.js
+include nhentai/viewer/logo.png

nhentai/__init__.py

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

nhentai/cmdline.py

@@ -87,7 +87,7 @@ def cmd_parser():
                       choices=['recent', 'popular', 'popular-today', 'popular-week'])
 
     # download options
-    parser.add_option('--output', '-o', type='string', dest='output_dir', action='store', default='',
+    parser.add_option('--output', '-o', type='string', dest='output_dir', action='store', default='./',
                       help='output dir')
     parser.add_option('--threads', '-t', type='int', dest='threads', action='store', default=5,
                       help='thread count for downloading doujinshi')
@@ -95,7 +95,7 @@ def cmd_parser():
                       help='timeout for downloading doujinshi')
     parser.add_option('--delay', '-d', type='int', dest='delay', action='store', default=0,
                       help='slow down between downloading every doujinshi')
-    parser.add_option('--proxy', '-p', type='string', dest='proxy', action='store', default='',
+    parser.add_option('--proxy', type='string', dest='proxy', action='store', default='',
                       help='store a proxy, for example: -p \'http://127.0.0.1:1080\'')
     parser.add_option('--file',  '-f', type='string', dest='file', action='store', help='read gallery IDs from file.')
     parser.add_option('--format', type='string', dest='name_format', action='store',
@@ -153,28 +153,30 @@ def cmd_parser():
         exit(0)
 
     # --- set config ---
-    if args.cookie:
+    if args.cookie is not None:
         constant.CONFIG['cookie'] = args.cookie
         logger.info('Cookie saved.')
         write_config()
         exit(0)
 
-    if args.language:
+    if args.language is not None:
         constant.CONFIG['language'] = args.language
-        logger.info('LANGUAGE now set to \'{0}\''.format(args.language))
+        logger.info('Default language now set to \'{0}\''.format(args.language))
         write_config()
         exit(0)
         # TODO: search without language
 
     if args.proxy:
         proxy_url = urlparse(args.proxy)
-        if proxy_url.scheme not in ('http', 'https'):
+        if not args.proxy == '' and proxy_url.scheme not in ('http', 'https'):
             logger.error('Invalid protocol \'{0}\' of proxy, ignored'.format(proxy_url.scheme))
+            exit(0)
+        else:
             constant.CONFIG['proxy'] = {
                 'http': args.proxy,
                 'https': args.proxy,
             }
-        logger.info('Proxy \'{0}\' saved.'.format(args.proxy))
+            logger.info('Proxy now set to \'{0}\'.'.format(args.proxy))
             write_config()
             exit(0)
     # --- end set config ---

nhentai/command.py

@@ -58,9 +58,9 @@ def main():
 
         if options.is_save_download_history:
             with DB() as db:
-                data = set(db.get_all())
+                data = map(int, db.get_all())
 
-            doujinshi_ids = list(set(doujinshi_ids) - data)
+            doujinshi_ids = list(set(doujinshi_ids) - set(data))
 
     if doujinshi_ids:
         for i, id_ in enumerate(doujinshi_ids):