modify tests #54

Add viewer arrow support, add README license badge.

.gitignore

@@ -5,3 +5,4 @@ dist/
 *.egg-info
 .python-version
 .DS_Store
+output/

.travis.yml

@@ -12,8 +12,10 @@ install:
     - python setup.py install
 
 script:
+    - echo 268642 > /tmp/test.txt
+    - NHENTAI=https://nhentai.net nhentai --cookie '__cfduid=da09f237ceb0f51c75980b0b3fda3ce571558179357; _ga=GA1.2.2000087053.1558179358; _gid=GA1.2.717818542.1558179358; csrftoken=iSxrTFOjrujJqauhAqWvTTI9dl3sfWnxdEFoMuqgmlBrbMin5Gj9wJW4r61cmH1X; sessionid=ewuaayfewbzpiukrarx9d52oxwlz2esd'
     - NHENTAI=https://nhentai.net nhentai --search umaru
-    - NHENTAI=https://nhentai.net nhentai --id=152503,146134 -t 10 --output=/tmp/
-    - NHENTAI=https://nhentai.net nhentai -l nhentai_test:nhentai --download --output=/tmp/
+    - NHENTAI=https://nhentai.net nhentai --id=152503,146134 -t 10 --output=/tmp/ --cbz
     - NHENTAI=https://nhentai.net nhentai --tag lolicon
-    - NHENTAI=https://nhentai.net nhentai --id 92066 --output=/tmp/ --cbz
+    - NHENTAI=https://nhentai.net nhentai -F
+    - NHENTAI=https://nhentai.net nhentai --file /tmp/test.txt

README.md

@@ -7,7 +7,7 @@ nhentai
     |_| |_|_| |_|\___|_| |_|\__\__,_|_|
 
 あなたも変態。 いいね?  
-[![Build Status](https://travis-ci.org/RicterZ/nhentai.svg?branch=master)](https://travis-ci.org/RicterZ/nhentai) ![nhentai PyPI Downloads](https://pypistats.com/badge/nhentai.svg)  
+[![Build Status](https://travis-ci.org/RicterZ/nhentai.svg?branch=master)](https://travis-ci.org/RicterZ/nhentai) ![nhentai PyPI Downloads](https://img.shields.io/pypi/dm/nhentai.svg) [![license](https://img.shields.io/cocoapods/l/AFNetworking.svg)](https://github.com/RicterZ/nhentai/blob/master/LICENSE)
 
 
 nHentai is a CLI tool for downloading doujinshi from [nhentai.net](http://nhentai.net).
@@ -18,17 +18,26 @@ nHentai is a CLI tool for downloading doujinshi from [nhentai.net](http://nhenta
     cd nhentai
     python setup.py install
     
-### Gentoo
+### Installation (Gentoo)
 
     layman -fa glicOne
     sudo emerge net-misc/nhentai
 
 ### Usage
+**IMPORTANT**: To bypass the nhentai frequency limit, you should use `--login` option to log into nhentai.net.
+
+*The default download folder will be the path where you run the command (CLI path).*
+
 Download specified doujinshi:
 ```bash
 nhentai --id=123855,123866
 ```
 
+Download doujinshi with ids specified in a file:
+```bash
+nhentai --file=doujinshi.txt
+```
+
 Search a keyword and download the first page:
 ```bash
 nhentai --search="tomori" --page=1 --download
@@ -71,8 +80,5 @@ NHENTAI=http://h.loli.club nhentai --id 123456
 ![](./images/download.png)  
 ![](./images/viewer.png)  
 
-### License  
-MIT
-
 ### あなたも変態
 ![](./images/image.jpg)

doujinshi.txt

@@ -0,0 +1,5 @@
+184212
+204944
+222460
+244502
+261909

nhentai/__init__.py

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

nhentai/cmdline.py

@@ -1,14 +1,15 @@
 # coding: utf-8
 from __future__ import print_function
+import os
 import sys
 from optparse import OptionParser
-from nhentai import __version__
 try:
     from itertools import ifilter as filter
 except ImportError:
     pass
 
 import nhentai.constant as constant
+from nhentai import __version__
 from nhentai.utils import urlparse, generate_html
 from nhentai.logger import logger
 
@@ -37,18 +38,28 @@ def banner():
 def cmd_parser():
     parser = OptionParser('\n  nhentai --search [keyword] --download'
                           '\n  NHENTAI=http://h.loli.club nhentai --id [ID ...]'
+                          '\n  nhentai --file [filename]'    
                           '\n\nEnvironment Variable:\n'
                           '  NHENTAI                 nhentai mirror url')
+    # operation options
     parser.add_option('--download', dest='is_download', action='store_true',
                       help='download doujinshi (for search results)')
-    parser.add_option('--show-info', dest='is_show', action='store_true', help='just show the doujinshi information')
+    parser.add_option('--show', dest='is_show', action='store_true', help='just show the doujinshi information')
+
+    # doujinshi options
     parser.add_option('--id', type='string', dest='id', action='store', help='doujinshi ids set, e.g. 1,2,3')
     parser.add_option('--search', type='string', dest='keyword', action='store', help='search doujinshi by keyword')
+    parser.add_option('--tag', type='string', dest='tag', action='store', help='download doujinshi by tag')
+    parser.add_option('--favorites', '-F', action='store_true', dest='favorites',
+                      help='list or download your favorites.')
+
+    # page options
     parser.add_option('--page', type='int', dest='page', action='store', default=1,
                       help='page number of search results')
-    parser.add_option('--tag', type='string', dest='tag', action='store', help='download doujinshi by tag')
     parser.add_option('--max-page', type='int', dest='max_page', action='store', default=1,
                       help='The max page when recursive download tagged doujinshi')
+
+    # download options
     parser.add_option('--output', type='string', dest='output_dir', action='store', default='',
                       help='output dir')
     parser.add_option('--threads', '-t', type='int', dest='threads', action='store', default=5,
@@ -57,20 +68,22 @@ def cmd_parser():
                       help='timeout for downloading doujinshi')
     parser.add_option('--proxy', type='string', dest='proxy', action='store', default='',
                       help='uses a proxy, for example: http://127.0.0.1:1080')
+    parser.add_option('--file',  '-f', type='string', dest='file', action='store', help='read gallery IDs from file.')
+
+    # generate options
     parser.add_option('--html', dest='html_viewer', action='store_true',
                       help='generate a html viewer at current directory')
-
-    parser.add_option('--login', '-l', type='str', dest='login', action='store',
-                      help='username:password pair of nhentai account')
-
     parser.add_option('--nohtml', dest='is_nohtml', action='store_true',
-                      help='Don\'t generate HTML')
-
+                      help='don\'t generate HTML')
     parser.add_option('--cbz', dest='is_cbz', action='store_true',
-                      help='Generate Comic Book CBZ File')
+                      help='generate Comic Book CBZ File')
     parser.add_option('--rm-origin-dir', dest='rm_origin_dir', action='store_true', default=False,
-                      help='Remove downloaded doujinshi dir when generated CBZ file.')
-                      
+                      help='remove downloaded doujinshi dir when generated CBZ file.')
+
+    # nhentai options
+    parser.add_option('--cookie', type='str', dest='cookie', action='store',
+                      help='set cookie of nhentai to bypass Google recaptcha')
+
     try:
         sys.argv = list(map(lambda x: unicode(x.decode(sys.stdin.encoding)), sys.argv))
     except (NameError, TypeError):
@@ -84,6 +97,25 @@ def cmd_parser():
         generate_html()
         exit(0)
 
+    if os.path.exists(os.path.join(constant.NHENTAI_HOME, 'cookie')):
+        with open(os.path.join(constant.NHENTAI_HOME, 'cookie'), 'r') as f:
+            constant.COOKIE = f.read()
+
+    if args.cookie:
+        try:
+            if not os.path.exists(constant.NHENTAI_HOME):
+                os.mkdir(constant.NHENTAI_HOME)
+
+            with open(os.path.join(constant.NHENTAI_HOME, '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.')
+        exit(0)
+
+    '''
     if args.login:
         try:
             _, _ = args.login.split(':', 1)
@@ -93,18 +125,29 @@ def cmd_parser():
 
         if not args.is_download:
             logger.warning('YOU DO NOT SPECIFY `--download` OPTION !!!')
+    '''
+
+    if args.favorites:
+        if not constant.COOKIE:
+            logger.warning('Cookie has not been set, please use `nhentai --cookie \'COOKIE\'` to set it.')
+            exit(1)
 
     if args.id:
-        _ = map(lambda id: id.strip(), args.id.split(','))
+        _ = map(lambda id_: id_.strip(), args.id.split(','))
         args.id = set(map(int, filter(lambda id_: id_.isdigit(), _)))
 
+    if args.file:
+        with open(args.file, 'r') as f:
+            _ = map(lambda id: id.strip(), f.readlines())
+            args.id = set(map(int, filter(lambda id_: id_.isdigit(), _)))
+
     if (args.is_download or args.is_show) and not args.id and not args.keyword and \
-            not args.login and not args.tag:
+            not args.tag and not args.favorites:
         logger.critical('Doujinshi id(s) are required for downloading')
         parser.print_help()
         exit(1)
 
-    if not args.keyword and not args.id and not args.login and not args.tag:
+    if not args.keyword and not args.id and not args.tag and not args.favorites:
         parser.print_help()
         exit(1)
 

nhentai/command.py

@@ -5,7 +5,7 @@ import signal
 import platform
 
 from nhentai.cmdline import cmd_parser, banner
-from nhentai.parser import doujinshi_parser, search_parser, print_doujinshi, login_parser, tag_parser
+from nhentai.parser import doujinshi_parser, search_parser, print_doujinshi, favorites_parser, tag_parser, login
 from nhentai.doujinshi import Doujinshi
 from nhentai.downloader import Downloader
 from nhentai.logger import logger
@@ -21,16 +21,21 @@ def main():
     doujinshi_ids = []
     doujinshi_list = []
 
-    if options.login:
-        username, password = options.login.split(':', 1)
-        logger.info('Logging in to nhentai using credential pair \'%s:%s\'' % (username, '*' * len(password)))
-        for doujinshi_info in login_parser(username=username, password=password):
+    if options.favorites:
+        if not options.is_download:
+            logger.warning('You do not specify --download option')
+
+        for doujinshi_info in favorites_parser():
             doujinshi_list.append(Doujinshi(**doujinshi_info))
 
+        if not options.is_download:
+            print_doujinshi([{'id': i.id, 'title': i.name} for i in doujinshi_list])
+            exit(0)
+
     if options.tag:
         doujinshis = tag_parser(options.tag, max_page=options.max_page)
         print_doujinshi(doujinshis)
-        if options.is_download:
+        if options.is_download and doujinshis:
             doujinshi_ids = map(lambda d: d['id'], doujinshis)
 
     if options.keyword:

nhentai/constant.py

@@ -1,6 +1,7 @@
 # coding: utf-8
 from __future__ import unicode_literals, print_function
 import os
+import tempfile
 from nhentai.utils import urlparse
 
 BASE_URL = os.getenv('NHENTAI', 'https://nhentai.net')
@@ -14,9 +15,14 @@ SEARCH_URL = '%s/search/' % BASE_URL
 TAG_URL = '%s/tag' % BASE_URL
 TAG_API_URL = '%s/api/galleries/tagged' % BASE_URL
 LOGIN_URL = '%s/login/' % BASE_URL
+CHALLENGE_URL = '%s/challenge' % BASE_URL
 FAV_URL = '%s/favorites/' % BASE_URL
 
 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')
+
 PROXY = {}
+
+COOKIE = ''

nhentai/doujinshi.py

@@ -48,7 +48,7 @@ class Doujinshi(object):
             ["Characters", self.info.character],
             ["Authors", self.info.artist],
             ["Language", self.info.language],
-            ["Tags", ', '.join(self.info.tag.keys())],
+            ["Tags", self.info.tags],
             ["URL", self.url],
             ["Pages", self.pages],
         ]
@@ -59,8 +59,11 @@ class Doujinshi(object):
         if self.downloader:
             download_queue = []
 
-            for i in range(1, self.pages + 1):
-                download_queue.append('%s/%d/%d.%s' % (IMAGE_URL, int(self.img_id), i, self.ext))
+            if len(self.ext) != self.pages:
+                logger.warning('Page count and ext count do not equal')
+
+            for i in range(1, min(self.pages, len(self.ext)) + 1):
+                download_queue.append('%s/%d/%d.%s' % (IMAGE_URL, int(self.img_id), i, self.ext[i-1]))
 
             self.downloader.download(download_queue, self.filename)
 

nhentai/parser.py

@@ -13,42 +13,65 @@ import nhentai.constant as constant
 from nhentai.logger import logger
 
 
+session = requests.Session()
+session.headers.update({
+    'Referer': constant.LOGIN_URL,
+    'User-Agent': 'nhentai command line client (https://github.com/RicterZ/nhentai)',
+})
+
+
 def request(method, url, **kwargs):
-    if not hasattr(requests, method):
-        raise AttributeError('\'requests\' object has no attribute \'{0}\''.format(method))
+    global session
+    if not hasattr(session, method):
+        raise AttributeError('\'requests.Session\' object has no attribute \'{0}\''.format(method))
 
-    return requests.__dict__[method](url, proxies=constant.PROXY, verify=False, **kwargs)
+    session.headers.update({'Cookie': constant.COOKIE})
+    return getattr(session, method)(url, proxies=constant.PROXY, verify=False, **kwargs)
 
 
-def login_parser(username, password):
-    s = requests.Session()
-    s.proxies = constant.PROXY
-    s.verify = False
-    s.headers.update({'Referer': constant.LOGIN_URL})
-
-    s.get(constant.LOGIN_URL)
-    content = s.get(constant.LOGIN_URL).content
+def _get_csrf_token(content):
     html = BeautifulSoup(content, 'html.parser')
     csrf_token_elem = html.find('input', attrs={'name': 'csrfmiddlewaretoken'})
-
     if not csrf_token_elem:
         raise Exception('Cannot find csrf token to login')
-    csrf_token = csrf_token_elem.attrs['value']
+    return csrf_token_elem.attrs['value']
+
+
+def login(username, password):
+    logger.warning('This feature is deprecated, please use --cookie to set your cookie.')
+    csrf_token = _get_csrf_token(request('get', url=constant.LOGIN_URL).text)
+    if os.getenv('DEBUG'):
+        logger.info('Getting CSRF token ...')
+
+    if os.getenv('DEBUG'):
+        logger.info('CSRF token is {}'.format(csrf_token))
 
     login_dict = {
         'csrfmiddlewaretoken': csrf_token,
         'username_or_email': username,
         'password': password,
     }
-    resp = s.post(constant.LOGIN_URL, data=login_dict)
+    resp = request('post', url=constant.LOGIN_URL, data=login_dict)
+
+    if 'You\'re loading pages way too quickly.' in resp.text or 'Really, slow down' in resp.text:
+        csrf_token = _get_csrf_token(resp.text)
+        resp = request('post', url=resp.url, data={'csrfmiddlewaretoken': csrf_token, 'next': '/'})
+
     if 'Invalid username/email or password' in resp.text:
         logger.error('Login failed, please check your username and password')
         exit(1)
 
-    html = BeautifulSoup(s.get(constant.FAV_URL).content, 'html.parser')
+    if 'You\'re loading pages way too quickly.' in resp.text or 'Really, slow down' in resp.text:
+        logger.error('Using nhentai --cookie \'YOUR_COOKIE_HERE\' to save your Cookie.')
+        exit(2)
+
+
+def favorites_parser():
+    html = BeautifulSoup(request('get', constant.FAV_URL).content, 'html.parser')
     count = html.find('span', attrs={'class': 'count'})
     if not count:
         logger.error("Can't get your number of favorited doujins. Did the login failed?")
+        return []
 
     count = int(count.text.strip('(').strip(')').replace(',', ''))
     if count == 0:
@@ -69,19 +92,15 @@ def login_parser(username, password):
     ret = []
     doujinshi_id = re.compile('data-id="([\d]+)"')
 
-    def _callback(request, result):
-        ret.append(result)
-
-    thread_pool = threadpool.ThreadPool(5)
-
     for page in range(1, pages + 1):
         try:
             logger.info('Getting doujinshi ids of page %d' % page)
-            resp = s.get(constant.FAV_URL + '?page=%d' % page).text
+            resp = request('get', constant.FAV_URL + '?page=%d' % page).text
             ids = doujinshi_id.findall(resp)
-            requests_ = threadpool.makeRequests(doujinshi_parser, ids, _callback)
-            [thread_pool.putRequest(req) for req in requests_]
-            thread_pool.wait()
+
+            for i in ids:
+                ret.append(doujinshi_parser(i))
+
         except Exception as e:
             logger.error('Error: %s, continue', str(e))
 
@@ -99,7 +118,14 @@ def doujinshi_parser(id_):
     url = '{0}/{1}/'.format(constant.DETAIL_URL, id_)
 
     try:
-        response = request('get', url).content
+        response = request('get', url)
+        if response.status_code in (200, ):
+            response = response.content
+        else:
+            logger.debug('Slow down and retry ({}) ...'.format(id_))
+            time.sleep(1)
+            return doujinshi_parser(str(id_))
+
     except Exception as e:
         logger.critical(str(e))
         raise SystemExit
@@ -115,12 +141,18 @@ def doujinshi_parser(id_):
 
     doujinshi_cover = html.find('div', attrs={'id': 'cover'})
     img_id = re.search('/galleries/([\d]+)/cover\.(jpg|png)$', doujinshi_cover.a.img.attrs['data-src'])
+
+    ext = []
+    for i in html.find_all('div', attrs={'class': 'thumb-container'}):
+        _, ext_name = os.path.basename(i.img.attrs['data-src']).rsplit('.', 1)
+        ext.append(ext_name)
+
     if not img_id:
         logger.critical('Tried yo get image id failed')
         exit(1)
 
     doujinshi['img_id'] = img_id.group(1)
-    doujinshi['ext'] = img_id.group(2)
+    doujinshi['ext'] = ext
 
     pages = 0
     for _ in doujinshi_info.find_all('div', class_=''):

nhentai/viewer/scripts.js

@@ -46,17 +46,33 @@ document.getElementById('image-container').onclick = event => {
 document.onkeypress = event => {
     switch (event.key.toLowerCase()) {
         // Previous Image
-        case 'arrowleft':
         case 'a':
             changePage(currentPage - 1);
             break;
 
         // Next Image
         case ' ':
+        case 'esc': // future close page function
         case 'enter':
-        case 'arrowright':
         case 'd':
             changePage(currentPage + 1);
             break;
+    }// remove arrow cause it won't work
+};
+
+document.onkeydown = event =>{
+    switch (event.keyCode) {
+        case 37: //left
+            changePage(currentPage - 1);
+            break;
+        case 38: //up
+            changePage(currentPage - 1);
+            break;
+        case 39: //right
+            changePage(currentPage + 1);
+            break;
+        case 40: //down
+            changePage(currentPage + 1);
+            break;
     }
 };