0.4.6

add default value of output dir

.travis.yml

@@ -4,13 +4,14 @@ os:
 language: python
 python:
     - 3.7
+    - 3.8
 
 install:
     - python setup.py install
 
 script:
     - echo 268642 > /tmp/test.txt
-    - nhentai --cookie "_ga=GA1.2.2000087053.1558179358; __cfduid=d8930f7b43d04e1b2117719e28386b2e31593148489; csrftoken=3914GQGSmmqQyfQTBswNgfXuhFiefu8sAgOnsfZWiiqS4PJpKivuTp34p2USV6xu; sessionid=be0w2lwlprlmld3ahg9i592ipsuaw840"
+    - nhentai --cookie "_ga=GA1.2.1651446371.1545407218; __cfduid=d0ed34dfb81167d2a51a1d6392c1768a81601380350; csrftoken=KRN0GR1ft86m3HTefpQA99pp6R1Bo7hUs5QxNGOAIuwB5g4EcJj04fwMB8QKgLaB; sessionid=7hzoowox78c90wi5ud5ibphm4axcck7c"
     - nhentai --search umaru
     - nhentai --id=152503,146134 -t 10 --output=/tmp/ --cbz
     - nhentai -F

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.0'
+__version__ = '0.4.6'
 __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,16 +78,16 @@ def cmd_parser():
                       help='list or download your favorites.')
 
     # page options
-    parser.add_option('--page', type='int', dest='page', action='store', default=1,
+    parser.add_option('--page-all', dest='page_all', action='store_true', default=False,
-                      help='page number of search results')
+                      help='all search results')
-    parser.add_option('--page-range', type='string', dest='page_range', action='store',
+    parser.add_option('--page', '--page-range', type='string', dest='page', action='store', default='',
-                      help='page range of favorites.  e.g. 1,2-5,14')
+                      help='page number of search results. e.g. 1,2-5,14')
     parser.add_option('--sorting', dest='sorting', action='store', default='recent',
                       help='sorting of doujinshi (recent / popular / popular-[today|week])',
                       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')
@@ -71,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',
@@ -96,6 +120,8 @@ def cmd_parser():
                       help='set cookie of nhentai to bypass Google recaptcha')
     parser.add_option('--language', type='str', dest='language', action='store',
                       help='set default language to parse doujinshis')
+    parser.add_option('--clean-language', dest='clean_language', action='store_true', default=False,
+                      help='set DEFAULT as language to parse doujinshis')
     parser.add_option('--save-download-history', dest='is_save_download_history', action='store_true',
                       default=False, help='save downloaded doujinshis, whose will be skipped if you re-download them')
     parser.add_option('--clean-download-history', action='store_true', default=False, dest='clean_download_history',
@@ -126,69 +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 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:
+        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)
-            proxy_url = urlparse(args.proxy)
+        else:
-            if proxy_url.scheme not in ('http', 'https'):
+            constant.CONFIG['proxy'] = {
-                logger.error('Invalid protocol \'{0}\' of proxy, ignored'.format(proxy_url.scheme))
+                'http': args.proxy,
-            else:
+                'https': args.proxy,
-                with open(constant.NHENTAI_PROXY, 'w') as f:
+            }
-                    f.write(args.proxy)
+            logger.info('Proxy now set to \'{0}\'.'.format(args.proxy))
-
+            write_config()
-        except Exception as e:
+            exit(0)
-            logger.error('Cannot create NHENTAI_HOME: {}'.format(str(e)))
+    # --- end set config ---
-            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,17 +1,21 @@
 #!/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, check_cookie, signal_handler, DB
+from nhentai.utils import generate_html, generate_cbz, generate_main_html, generate_pdf, \
+    paging, check_cookie, signal_handler, DB
 
 
 def main():
@@ -19,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()
@@ -31,18 +34,20 @@ def main():
     doujinshi_ids = []
     doujinshi_list = []
 
+    page_list = paging(options.page)
+
     if options.favorites:
         if not options.is_download:
             logger.warning('You do not specify --download option')
 
-        doujinshis = favorites_parser(options.page_range)
+        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 deafult 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=options.page)
+                                   is_page_all=options.page_all)
 
     elif not doujinshi_ids:
         doujinshi_ids = options.id
@@ -53,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):

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/doujinshi.py

@@ -48,6 +48,7 @@ class Doujinshi(object):
 
     def show(self):
         table = [
+            ["Parodies", self.info.parodies],
             ["Doujinshi", self.name],
             ["Subtitle", self.info.subtitle],
             ["Characters", self.info.characters],

nhentai/downloader.py

@@ -5,11 +5,10 @@ import multiprocessing
 import signal
 
 from future.builtins import str as text
+import sys
 import os
 import requests
-import threadpool
 import time
-import multiprocessing as mp
 
 try:
     from urllib.parse import urlparse
@@ -18,10 +17,10 @@ except ImportError:
 
 from nhentai.logger import logger
 from nhentai.parser import request
-from nhentai.utils import Singleton, signal_handler
+from nhentai.utils import Singleton
 
 requests.packages.urllib3.disable_warnings()
-semaphore = mp.Semaphore()
+semaphore = multiprocessing.Semaphore(1)
 
 
 class NHentaiImageNotExistException(Exception):
@@ -133,16 +132,14 @@ class Downloader(Singleton):
         queue = [(self, url, folder) for url in queue]
 
         pool = multiprocessing.Pool(self.size, init_worker)
-
+        [pool.apply_async(download_wrapper, args=item) for item in queue]
-        for item in queue:
-            pool.apply_async(download_wrapper, args=item, callback=self._download_callback)
 
         pool.close()
         pool.join()
 
 
 def download_wrapper(obj, url, folder=''):
-    if semaphore.get_value():
+    if sys.platform == 'darwin' or semaphore.get_value():
         return Downloader.download_(obj, url=url, folder=folder)
     else:
         return -3, None

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
@@ -64,7 +63,7 @@ def _get_title_and_id(response):
     return result
 
 
-def favorites_parser(page_range=''):
+def favorites_parser(page=None):
     result = []
     html = BeautifulSoup(request('get', constant.FAV_URL).content, 'html.parser')
     count = html.find('span', attrs={'class': 'count'})
@@ -78,20 +77,20 @@ def favorites_parser(page_range=''):
         return []
     pages = int(count / 25)
 
-    if pages:
+    if page:
-        pages += 1 if count % (25 * pages) else 0
+        page_range_list = page
     else:
-        pages = 1
+        if pages:
+            pages += 1 if count % (25 * pages) else 0
+        else:
+            pages = 1
 
-    logger.info('You have %d favorites in %d pages.' % (count, pages))
+        logger.info('You have %d favorites in %d pages.' % (count, pages))
 
-    if os.getenv('DEBUG'):
+        if os.getenv('DEBUG'):
-        pages = 1
+            pages = 1
 
-    page_range_list = range(1, pages + 1)
+        page_range_list = range(1, pages + 1)
-    if page_range:
-        logger.info('page range is {0}'.format(page_range))
-        page_range_list = page_range_parser(page_range, pages)
 
     for page in page_range_list:
         try:
@@ -105,32 +104,6 @@ def favorites_parser(page_range=''):
     return result
 
 
-def page_range_parser(page_range, max_page_num):
-    pages = set()
-    ranges = str.split(page_range, ',')
-    for range_str in ranges:
-        idx = range_str.find('-')
-        if idx == -1:
-            try:
-                page = int(range_str)
-                if page <= max_page_num:
-                    pages.add(page)
-            except ValueError:
-                logger.error('page range({0}) is not valid'.format(page_range))
-        else:
-            try:
-                left = int(range_str[:idx])
-                right = int(range_str[idx + 1:])
-                if right > max_page_num:
-                    right = max_page_num
-                for page in range(left, right + 1):
-                    pages.add(page)
-            except ValueError:
-                logger.error('page range({0}) is not valid'.format(page_range))
-
-    return list(pages)
-
-
 def doujinshi_parser(id_):
     if not isinstance(id_, (int,)) and (isinstance(id_, (str,)) and not id_.isdigit()):
         raise Exception('Doujinshi id({0}) is not valid'.format(id_))
@@ -178,7 +151,6 @@ def doujinshi_parser(id_):
     doujinshi['img_id'] = img_id.group(1)
     doujinshi['ext'] = ext
 
-    pages = 0
     for _ in doujinshi_info.find_all('div', class_='tag-container field-name'):
         if re.search('Pages:', _.text):
             pages = _.find('span', class_='name').string
@@ -216,38 +188,47 @@ 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):
-    logger.debug('Searching doujinshis using keywords {0}'.format(keyword))
+    # keyword = '+'.join([i.strip().replace(' ', '-').lower() for i in keyword.split(',')])
-    keyword = '+'.join([i.strip().replace(' ', '-').lower() for i in keyword.split(',')])
     result = []
-    i = 0
+    if not page:
-    while i < 5:
+        page = [1]
-        try:
+
-            url = request('get', url=constant.SEARCH_URL, params={'query': keyword, 'page': page, 'sort': sorting}).url
+    if is_page_all:
-            response = request('get', url.replace('%2B', '+')).json()
+        url = request('get', url=constant.SEARCH_URL, params={'query': keyword}).url
-        except Exception as e:
+        init_response = request('get', url.replace('%2B', '+')).json()
-            i += 1
+        page = range(1, init_response['num_pages']+1)
-            if not i < 5:
+
+    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}{2}'.format(keyword, p, total))
+        while i < 3:
+            try:
+                url = request('get', url=constant.SEARCH_URL, params={'query': keyword,
+                                                                      'page': p, 'sort': sorting}).url
+                response = request('get', url.replace('%2B', '+')).json()
+            except Exception as e:
                 logger.critical(str(e))
-                logger.warn('If you are in China, please configure the proxy to fu*k GFW.')
-                exit(1)
-            continue
-        break
 
-    if 'result' not in response:
+            break
-        raise Exception('No result in response')
 
-    for row in response['result']:
+        if 'result' not in response:
-        title = row['title']['english']
+            logger.warn('No result in response in page {}'.format(p))
-        title = title[:85] + '..' if len(title) > 85 else title
+            break
-        result.append({'id': row['id'], 'title': title})
 
-    if not result:
+        for row in response['result']:
-        logger.warn('No results for keywords {}'.format(keyword))
+            title = row['title']['english']
+            title = title[:85] + '..' if len(title) > 85 else title
+            result.append({'id': row['id'], 'title': title})
+
+        if not result:
+            logger.warn('No results for keywords {}'.format(keyword))
 
     return result
 

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():
@@ -253,6 +253,26 @@ def signal_handler(signal, frame):
     exit(1)
 
 
+def paging(page_string):
+    # 1,3-5,14 -> [1, 3, 4, 5, 14]
+    if not page_string:
+        return []
+
+    page_list = []
+    for i in page_string.split(','):
+        if '-' in i:
+            start, end = i.split('-')
+            if not (start.isdigit() and end.isdigit()):
+                raise Exception('Invalid page number')
+            page_list.extend(list(range(int(start), int(end)+1)))
+        else:
+            if not i.isdigit():
+                raise Exception('Invalid page number')
+            page_list.append(int(i))
+
+    return page_list
+
+
 class DB(object):
     conn = None
     cur = None

setup.py

@@ -23,7 +23,7 @@ setup(
 
     author=__author__,
     author_email=__email__,
-    keywords='nhentai, doujinshi',
+    keywords=['nhentai', 'doujinshi', 'downloader'],
     description='nhentai.net doujinshis downloader',
     long_description=long_description(),
     url='https://github.com/RicterZ/nhentai',