Merge pull request #4 from RicterZ/master

Update master branch

nhentai/__init__.py

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

nhentai/cmdline.py

@@ -2,7 +2,9 @@
 from __future__ import print_function
 import os
 import sys
+import json
 from optparse import OptionParser
+
 try:
     from itertools import ifilter as filter
 except ImportError:
@@ -35,7 +37,29 @@ def banner():
 ''' % __version__)
 
 
+def load_config():
+    if not os.path.exists(constant.NHENTAI_CONFIG_FILE):
+        return
+
+    try:
+        with open(constant.NHENTAI_CONFIG_FILE, 'r') as f:
+            constant.CONFIG = json.load(f)
+    except json.JSONDecodeError:
+        logger.error('Failed to load config file.')
+        write_config()
+
+
+def write_config():
+    if not os.path.exists(constant.NHENTAI_HOME):
+        os.mkdir(constant.NHENTAI_HOME)
+
+    with open(constant.NHENTAI_CONFIG_FILE, 'w') as f:
+        f.write(json.dumps(constant.CONFIG))
+
+
 def cmd_parser():
+    load_config()
+
     parser = OptionParser('\n  nhentai --search [keyword] --download'
                           '\n  NHENTAI=http://h.loli.club nhentai --id [ID ...]'
                           '\n  nhentai --file [filename]'
@@ -54,6 +78,8 @@ def cmd_parser():
                       help='list or download your favorites.')
 
     # page options
+    parser.add_option('--page-all', dest='page_all', action='store_true', default=False,
+                      help='all search results')
     parser.add_option('--page', '--page-range', type='string', dest='page', action='store', default='',
                       help='page number of search results. e.g. 1,2-5,14')
     parser.add_option('--sorting', dest='sorting', action='store', default='recent',
@@ -69,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',
@@ -126,83 +152,37 @@ def cmd_parser():
         logger.info('Download history cleaned.')
         exit(0)
 
-    if os.path.exists(constant.NHENTAI_COOKIE):
+    # --- set config ---
-        with open(constant.NHENTAI_COOKIE, 'r') as f:
+    if args.cookie is not None:
-            constant.COOKIE = f.read()
+        constant.CONFIG['cookie'] = args.cookie
-
-    if args.cookie:
-        try:
-            if not os.path.exists(constant.NHENTAI_HOME):
-                os.mkdir(constant.NHENTAI_HOME)
-
-            with open(constant.NHENTAI_COOKIE, 'w') as f:
-                f.write(args.cookie)
-        except Exception as e:
-            logger.error('Cannot create NHENTAI_HOME: {}'.format(str(e)))
-            exit(1)
-
         logger.info('Cookie saved.')
+        write_config()
         exit(0)
 
-    if os.path.exists(constant.NHENTAI_LANGUAGE) and not args.language:
+    if args.language is not None:
-        with open(constant.NHENTAI_LANGUAGE, 'r') as f:
+        constant.CONFIG['language'] = args.language
-            constant.LANGUAGE = f.read()
+        logger.info('Default language now set to \'{0}\''.format(args.language))
-            args.language = f.read()
+        write_config()
-
-    if args.language:
-        try:
-            if not os.path.exists(constant.NHENTAI_HOME):
-                os.mkdir(constant.NHENTAI_HOME)
-
-            with open(constant.NHENTAI_LANGUAGE, 'w') as f:
-                f.write(args.language)
-        except Exception as e:
-            logger.error('Cannot create NHENTAI_HOME: {}'.format(str(e)))
-            exit(1)
-
-        logger.info('Default language now is {}.'.format(args.language))
         exit(0)
+        # TODO: search without language
 
-    if args.clean_language:
+    if args.proxy is not None:
-        try:
+        proxy_url = urlparse(args.proxy)
-            if not os.path.exists(constant.NHENTAI_HOME):
+        if not args.proxy == '' and proxy_url.scheme not in ('http', 'https'):
-                os.mkdir(constant.NHENTAI_HOME)
+            logger.error('Invalid protocol \'{0}\' of proxy, ignored'.format(proxy_url.scheme))
-
+            exit(0)
-            with open(constant.NHENTAI_LANGUAGE, 'w') as f:
+        else:
-                f.close()
+            constant.CONFIG['proxy'] = {
-        except Exception as e:
+                'http': args.proxy,
-            logger.error('Cannot create NHENTAI_HOME: {}'.format(str(e)))
+                'https': args.proxy,
-            exit(1)
+            }
-
+            logger.info('Proxy now set to \'{0}\'.'.format(args.proxy))
-        logger.info('Language now is DEFAULT')
+            write_config()
-        exit(0)
+            exit(0)
-
+    # --- end set config ---
-    if os.path.exists(constant.NHENTAI_PROXY):
-        with open(constant.NHENTAI_PROXY, 'r') as f:
-            link = f.read()
-            constant.PROXY = {'http': link, 'https': link}
-
-    if args.proxy:
-        try:
-            if not os.path.exists(constant.NHENTAI_HOME):
-                os.mkdir(constant.NHENTAI_HOME)
-
-            proxy_url = urlparse(args.proxy)
-            if proxy_url.scheme not in ('http', 'https'):
-                logger.error('Invalid protocol \'{0}\' of proxy, ignored'.format(proxy_url.scheme))
-            else:
-                with open(constant.NHENTAI_PROXY, 'w') as f:
-                    f.write(args.proxy)
-
-        except Exception as e:
-            logger.error('Cannot create NHENTAI_HOME: {}'.format(str(e)))
-            exit(1)
-
-        logger.info('Proxy \'{0}\' saved.'.format(args.proxy))
-        exit(0)
 
     if args.favorites:
-        if not constant.COOKIE:
+        if not constant.CONFIG['cookie']:
             logger.warning('Cookie has not been set, please use `nhentai --cookie \'COOKIE\'` to set it.')
             exit(1)
 

nhentai/command.py

@@ -1,16 +1,19 @@
 #!/usr/bin/env python2.7
 # coding: utf-8
 from __future__ import unicode_literals, print_function
+import json
+import os
 import signal
 import platform
 import time
 
+from nhentai import constant
 from nhentai.cmdline import cmd_parser, banner
 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.constant import NHENTAI_CONFIG_FILE, BASE_URL
 from nhentai.utils import generate_html, generate_cbz, generate_main_html, generate_pdf, \
     paging, check_cookie, signal_handler, DB
 
@@ -20,10 +23,9 @@ def main():
     options = cmd_parser()
     logger.info('Using mirror: {0}'.format(BASE_URL))
 
-    from nhentai.constant import PROXY
+    # CONFIG['proxy'] will be changed after cmd_parser()
-    # constant.PROXY will be changed after cmd_parser()
+    if constant.CONFIG['proxy']:
-    if PROXY:
+        logger.info('Using proxy: {0}'.format(constant.CONFIG['proxy']))
-        logger.info('Using proxy: {0}'.format(PROXY))
 
     # check your cookie
     check_cookie()
@@ -41,11 +43,11 @@ def main():
         doujinshis = favorites_parser(page=page_list)
 
     elif options.keyword:
-        from nhentai.constant import LANGUAGE
+        if constant.CONFIG['language']:
-        if LANGUAGE:
+            logger.info('Using default language: {0}'.format(constant.CONFIG['language']))
-            logger.info('Using default language: {0}'.format(LANGUAGE))
+            options.keyword += ' language:{}'.format(constant.CONFIG['language'])
-            options.keyword += ', language:{}'.format(LANGUAGE)
+        doujinshis = search_parser(options.keyword, sorting=options.sorting, page=page_list,
-        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

nhentai/constant.py

@@ -26,12 +26,12 @@ u = urlparse(BASE_URL)
 IMAGE_URL = '%s://i.%s/galleries' % (u.scheme, u.hostname)
 
 NHENTAI_HOME = os.path.join(os.getenv('HOME', tempfile.gettempdir()), '.nhentai')
-NHENTAI_PROXY = os.path.join(NHENTAI_HOME, 'proxy')
-NHENTAI_COOKIE = os.path.join(NHENTAI_HOME, 'cookie')
-NHENTAI_LANGUAGE = os.path.join(NHENTAI_HOME, 'language')
 NHENTAI_HISTORY = os.path.join(NHENTAI_HOME, 'history.sqlite3')
+NHENTAI_CONFIG_FILE = os.path.join(NHENTAI_HOME, 'config.json')
 
-PROXY = {}
+CONFIG = {
+    'proxy': {},
+    'cookie': '',
+    'language': '',
+}
 
-COOKIE = ''
-LANGUAGE = ''

nhentai/parser.py

@@ -1,7 +1,6 @@
 # coding: utf-8
 from __future__ import unicode_literals, print_function
 
-import sys
 import os
 import re
 import time
@@ -189,19 +188,26 @@ def print_doujinshi(doujinshi_list):
         return
     doujinshi_list = [(i['id'], i['title']) for i in doujinshi_list]
     headers = ['id', 'doujinshi']
-    logger.info('Search Result\n' +
+    logger.info('Search Result || Found %i doujinshis \n' % doujinshi_list.__len__() +
                 tabulate(tabular_data=doujinshi_list, headers=headers, tablefmt='rst'))
 
 
-def search_parser(keyword, sorting, page):
+def search_parser(keyword, sorting, page, is_page_all=False):
     # keyword = '+'.join([i.strip().replace(' ', '-').lower() for i in keyword.split(',')])
     result = []
     if not page:
         page = [1]
 
+    if is_page_all:
+        url = request('get', url=constant.SEARCH_URL, params={'query': keyword}).url
+        init_response = request('get', url.replace('%2B', '+')).json()
+        page = range(1, init_response['num_pages']+1)
+
+    total = '/{0}'.format(page[-1]) if is_page_all else ''
     for p in page:
         i = 0
-        logger.info('Searching doujinshis using keywords "{0}" on page {1}'.format(keyword, p))
+
+        logger.info('Searching doujinshis using keywords "{0}" on page {1}{2}'.format(keyword, p, total))
         while i < 3:
             try:
                 url = request('get', url=constant.SEARCH_URL, params={'query': keyword,

nhentai/utils.py

@@ -20,9 +20,9 @@ def request(method, url, **kwargs):
     session.headers.update({
         'Referer': constant.LOGIN_URL,
         'User-Agent': 'nhentai command line client (https://github.com/RicterZ/nhentai)',
-        'Cookie': constant.COOKIE
+        'Cookie': constant.CONFIG['cookie']
     })
-    return getattr(session, method)(url, proxies=constant.PROXY, verify=False, **kwargs)
+    return getattr(session, method)(url, proxies=constant.CONFIG['proxy'], verify=False, **kwargs)
 
 
 def check_cookie():