0.2.15

.travis.yml

@@ -5,9 +5,7 @@ language: python
 python:
     - 2.7
     - 2.6
-    - 3.3
-    - 3.4
-    - 3.5.2
+    - 3.6
 
 install:
     - python setup.py install
@@ -15,3 +13,5 @@ install:
 script:
     - 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 --output=/tmp/
+    - NHENTAI=https://nhentai.net nhentai --tag lolicon

MANIFEST.in

@@ -1,5 +1,5 @@
-include README.md
-include requirements.txt
-include nhentai/viewer/index.html
-include nhentai/viewer/styles.css
-include nhentai/viewer/scripts.js
+include README.md
+include requirements.txt
+include nhentai/viewer/index.html
+include nhentai/viewer/styles.css
+include nhentai/viewer/scripts.js

README.md

@@ -1,70 +1,78 @@
-nhentai
-=======
-           _   _            _        _
-     _ __ | | | | ___ _ __ | |_ __ _(_)
-    | '_ \| |_| |/ _ \ '_ \| __/ _` | |
-    | | | |  _  |  __/ | | | || (_| | |
-    |_| |_|_| |_|\___|_| |_|\__\__,_|_|
-
-あなたも変態。 いいね?  
-[![Build Status](https://travis-ci.org/RicterZ/nhentai.svg?branch=master)](https://travis-ci.org/RicterZ/nhentai)  
-
-🎉🎉 nhentai 现在支持 Windows 啦！
-
-由于 [http://nhentai.net](http://nhentai.net) 下载下来的种子速度很慢，而且官方也提供在线观看本子的功能，所以可以利用本脚本下载本子。
-
-### Installation
-
-    git clone https://github.com/RicterZ/nhentai
-    cd nhentai
-    python setup.py install
-    
-### Gentoo
-
-    layman -fa glicOne
-    sudo emerge net-misc/nhentai
-
-### Usage
-下载指定 id 列表的本子：
-```bash
-nhentai --id=123855,123866
-```
-
-下载某关键词第一页的本子：
-```bash
-nhentai --search="tomori" --page=1 --download
-```
-
-下载用户 favorites 内容：
-```bash
-nhentai --login "username:password" --download
-```
-
-### Options
-
-`-t, --thread`：指定下载的线程数，最多为 10 线程。  
-`--path`：指定下载文件的输出路径，默认为当前目录。  
-`--timeout`：指定下载图片的超时时间，默认为 30 秒。  
-`--proxy`：指定下载的代理，例如: http://127.0.0.1:8080/
-`--login`：nhentai 账号的“用户名:密码”组合
-`--nohtml`：nhentai Don't generate HTML
-`--cbz`：nhentai Generate Comic Book CBZ file
-
-### nHentai Mirror
-如果想用自建镜像下载 nhentai 的本子，需要搭建 nhentai.net 和 i.nhentai.net 的反向代理。  
-例如用 h.loli.club 来做反向代理的话，需要 h.loli.club 反代 nhentai.net，i.h.loli.club 反带 i.nhentai.net。  
-然后利用环境变量来下载：  
-
-```bash
-NHENTAI=http://h.loli.club nhentai --id 123456
-```
-
-![](./images/search.png)  
-![](./images/download.png)  
-![](./images/viewer.png)  
-
-### License  
-MIT
-
-### あなたも変態
-![](./images/image.jpg)
+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)  
+
+
+nHentai is a CLI tool for downloading doujinshi from [nhentai.net](http://nhentai.net).
+
+### Installation
+
+    git clone https://github.com/RicterZ/nhentai
+    cd nhentai
+    python setup.py install
+    
+### Gentoo
+
+    layman -fa glicOne
+    sudo emerge net-misc/nhentai
+
+### Usage
+Download specified doujinshi:
+```bash
+nhentai --id=123855,123866
+```
+
+Search a keyword and download the first page:
+```bash
+nhentai --search="tomori" --page=1 --download
+```
+
+Download your favourite doujinshi (login required):
+```bash
+nhentai --login "username:password" --download
+```
+
+Download by tag name:
+```bash
+nhentai --tag lolicon --download
+```
+
+### Options
+
++ `-t, --thread`: Download threads, max: 10  
++ `--output`:Output dir of saving doujinshi  
++ `--tag`:Download by tag name  
++ `--timeout`: Timeout of downloading each image   
++ `--proxy`: Use proxy, example: http://127.0.0.1:8080/  
++ `--login`: username:password pair of your nhentai account  
++ `--nohtml`: Do not generate HTML  
++ `--cbz`: Generate Comic Book CBZ File  
+
+### nHentai Mirror
+If you want to use a mirror, you should set up a reverse proxy of `nhentai.net` and `i.nhentai.net`.
+For example:
+
+    i.h.loli.club -> i.nhentai.net
+    h.loli.club -> nhentai.net
+
+Set `NHENTAI` env var to your nhentai mirror.
+```bash
+NHENTAI=http://h.loli.club nhentai --id 123456
+```
+
+![](./images/search.png)  
+![](./images/download.png)  
+![](./images/viewer.png)  
+
+### License  
+MIT
+
+### あなたも変態
+![](./images/image.jpg)

nhentai/__init__.py

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

nhentai/cmdline.py

@@ -42,7 +42,7 @@ def cmd_parser():
     parser.add_option('--search', type='string', dest='keyword', action='store', help='search doujinshi by keyword')
     parser.add_option('--page', type='int', dest='page', action='store', default=1,
                       help='page number of search result')
-    parser.add_option('--tags', type='string', dest='tags', action='store', help='download doujinshi by tags')
+    parser.add_option('--tag', type='string', dest='tag', action='store', help='download doujinshi by tag')
     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,
@@ -86,20 +86,17 @@ def cmd_parser():
         if not args.is_download:
             logger.warning('YOU DO NOT SPECIFY `--download` OPTION !!!')
 
-    if args.tags:
-        logger.warning('`--tags` is under construction')
-        exit(1)
-
     if args.id:
         _ = map(lambda id: id.strip(), args.id.split(','))
         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:
+    if (args.is_download or args.is_show) and not args.id and not args.keyword and \
+            not args.login and not args.tag:
         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:
+    if not args.keyword and not args.id and not args.login and not args.tag:
         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
+from nhentai.parser import doujinshi_parser, search_parser, print_doujinshi, login_parser, tag_guessing, tag_parser
 from nhentai.doujinshi import Doujinshi
 from nhentai.downloader import Downloader
 from nhentai.logger import logger
@@ -27,13 +27,19 @@ def main():
         for doujinshi_info in login_parser(username=username, password=password):
             doujinshi_list.append(Doujinshi(**doujinshi_info))
 
+    if options.tag:
+        tag_id = tag_guessing(options.tag)
+        if tag_id:
+            doujinshis = tag_parser(tag_id)
+            print_doujinshi(doujinshis)
+            if options.is_download:
+                doujinshi_ids = map(lambda d: d['id'], doujinshis)
+
     if options.keyword:
         doujinshis = search_parser(options.keyword, options.page)
         print_doujinshi(doujinshis)
         if options.is_download:
             doujinshi_ids = map(lambda d: d['id'], doujinshis)
-    else:
-        doujinshi_ids = options.id
 
     if doujinshi_ids:
         for id_ in doujinshi_ids:

nhentai/constant.py

@@ -7,6 +7,8 @@ BASE_URL = os.getenv('NHENTAI', 'https://nhentai.net')
 
 DETAIL_URL = '%s/api/gallery' % BASE_URL
 SEARCH_URL = '%s/api/galleries/search' % BASE_URL
+TAG_URL = '%s/tag' % BASE_URL
+TAG_API_URL = '%s/api/galleries/tagged' % BASE_URL
 LOGIN_URL = '%s/login/' % BASE_URL
 FAV_URL = '%s/favorites/' % BASE_URL
 

nhentai/parser.py

@@ -27,7 +27,7 @@ def login_parser(username, password):
 
     s.get(constant.LOGIN_URL)
     content = s.get(constant.LOGIN_URL).content
-    html = BeautifulSoup(content, 'html.parser').encode("ascii")
+    html = BeautifulSoup(content, 'html.parser')
     csrf_token_elem = html.find('input', attrs={'name': 'csrfmiddlewaretoken'})
 
     if not csrf_token_elem:
@@ -44,14 +44,22 @@ def login_parser(username, password):
         logger.error('Login failed, please check your username and password')
         exit(1)
 
-    html = BeautifulSoup(s.get(constant.FAV_URL).content, 'html.parser').encode("ascii")
+    html = BeautifulSoup(s.get(constant.FAV_URL).content, 'html.parser')
     count = html.find('span', attrs={'class': 'count'})
     if not count:
         logger.error('Cannot get count of your favorites, maybe login failed.')
 
     count = int(count.text.strip('(').strip(')'))
-    pages = count / 25
-    pages += 1 if count % (25 * pages) else 0
+    if count == 0:
+        logger.warning('No favorites found')
+        return []
+    pages = int(count / 25)
+
+    if pages:
+        pages += 1 if count % (25 * pages) else 0
+    else:
+        pages = 1
+
     logger.info('Your have %d favorites in %d pages.' % (count, pages))
 
     if os.getenv('DEBUG'):
@@ -68,7 +76,7 @@ def login_parser(username, password):
     for page in range(1, pages+1):
         try:
             logger.info('Getting doujinshi id of page %d' % page)
-            resp = s.get(constant.FAV_URL + '?page=%d' % page).content
+            resp = s.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_]
@@ -102,11 +110,18 @@ def doujinshi_parser(id_):
     doujinshi['pages'] = len(response['images']['pages'])
 
     # gain information of the doujinshi
-    needed_fields = ['character', 'artist', 'language']
+    needed_fields = ['character', 'artist', 'language', 'tag']
     for tag in response['tags']:
         tag_type = tag['type']
         if tag_type in needed_fields:
-            if tag_type not in doujinshi:
+            if tag_type == 'tag':
+                if tag_type not in doujinshi:
+                    doujinshi[tag_type] = {}
+
+                tag['name'] = tag['name'].replace(' ', '-')
+                tag['name'] = tag['name'].lower()
+                doujinshi[tag_type][tag['name']] = tag['id']
+            elif tag_type not in doujinshi:
                 doujinshi[tag_type] = tag['name']
             else:
                 doujinshi[tag_type] += tag['name']
@@ -146,5 +161,48 @@ def print_doujinshi(doujinshi_list):
                 tabulate(tabular_data=doujinshi_list, headers=headers, tablefmt='rst'))
 
 
+def tag_parser(tag_id):
+    logger.info('Get doujinshi of tag id: {0}'.format(tag_id))
+    result = []
+    response = request('get', url=constant.TAG_API_URL, params={'sort': 'popular', 'tag_id': tag_id}).json()
+
+    for row in response['result']:
+        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('Not found anything of tag id {}'.format(tag_id))
+
+    return result
+
+
+def tag_guessing(tag_name):
+    tag_name = tag_name.lower()
+    tag_name = tag_name.replace(' ', '-')
+    logger.info('Trying to get tag_id of tag \'{0}\''.format(tag_name))
+    response = request('get', url='%s/%s' % (constant.TAG_URL, tag_name)).content
+    html = BeautifulSoup(response, 'html.parser')
+    first_item = html.find('div', attrs={'class': 'gallery'})
+    if not first_item:
+        logger.error('Cannot find doujinshi id of tag \'{0}\''.format(tag_name))
+        return
+
+    doujinshi_id = re.findall('(\d+)', first_item.a.attrs['href'])
+    if not doujinshi_id:
+        logger.error('Cannot find doujinshi id of tag \'{0}\''.format(tag_name))
+        return
+
+    ret = doujinshi_parser(doujinshi_id[0])
+    if 'tag' in ret and tag_name in ret['tag']:
+        tag_id = ret['tag'][tag_name]
+        logger.info('Tag id of tag \'{0}\' is {1}'.format(tag_name, tag_id))
+    else:
+        logger.error('Cannot find doujinshi id of tag \'{0}\''.format(tag_name))
+        return
+
+    return tag_id
+
+
 if __name__ == '__main__':
     print(doujinshi_parser("32271"))

nhentai/utils.py

@@ -1,6 +1,7 @@
 # coding: utf-8
 from __future__ import unicode_literals, print_function
 
+import sys
 import os
 import string
 import zipfile
@@ -30,12 +31,14 @@ def urlparse(url):
 
     return urlparse(url)
 
+
 def readfile(path):
     loc = os.path.dirname(__file__)
 
     with open(os.path.join(loc, path), 'r') as file:
         return file.read()
 
+
 def generate_html(output_dir='.', doujinshi_obj=None):
     image_html = ''
 
@@ -65,10 +68,17 @@ def generate_html(output_dir='.', doujinshi_obj=None):
         title = 'nHentai HTML Viewer'
 
     data = html.format(TITLE=title, IMAGES=image_html, SCRIPTS=js, STYLES=css)
-    with open(os.path.join(doujinshi_dir, 'index.html'), 'w') as f:
-        f.write(data)
+    try:
+        if sys.version_info < (3, 0):
+            with open(os.path.join(doujinshi_dir, 'index.html'), 'w') as f:
+                f.write(data)
+        else:
+            with open(os.path.join(doujinshi_dir, 'index.html'), 'wb') as f:
+                f.write(data.encode('utf-8'))
 
-    logger.log(15, 'HTML Viewer has been write to \'{0}\''.format(os.path.join(doujinshi_dir, 'index.html')))
+        logger.log(15, 'HTML Viewer has been write to \'{0}\''.format(os.path.join(doujinshi_dir, 'index.html')))
+    except Exception as e:
+        logger.warning('Writen HTML Viewer failed ({})'.format(str(e)))
 
 
 def generate_cbz(output_dir='.', doujinshi_obj=None):

nhentai/viewer/index.html

@@ -1,24 +1,24 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>{TITLE}</title>
-    <style>
-{STYLES}
-    </style>
-</head>
-<body>
-
-<nav id="list">
-{IMAGES}</nav>
-
-<div id="image-container">
-    <span id="page-num"></span>
-    <div id="dest"></div>
-</div>
-
-<script>
-{SCRIPTS}
-</script>
-</body>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>{TITLE}</title>
+    <style>
+{STYLES}
+    </style>
+</head>
+<body>
+
+<nav id="list">
+{IMAGES}</nav>
+
+<div id="image-container">
+    <span id="page-num"></span>
+    <div id="dest"></div>
+</div>
+
+<script>
+{SCRIPTS}
+</script>
+</body>
 </html>

nhentai/viewer/scripts.js

@@ -1,62 +1,62 @@
-const pages = Array.from(document.querySelectorAll('img.image-item'));
-let currentPage = 0;
-
-function changePage(pageNum) {
-    const previous = pages[currentPage];
-    const current = pages[pageNum];
-
-    if (current == null) {
-        return;
-    }
-    
-    previous.classList.remove('current');
-    current.classList.add('current');
-
-    currentPage = pageNum;
-
-    const display = document.getElementById('dest');
-    display.style.backgroundImage = `url("${current.src}")`;
-
-    document.getElementById('page-num')
-        .innerText = [
-                (pageNum + 1).toLocaleString(),
-                pages.length.toLocaleString()
-            ].join('\u200a/\u200a');
-}
-
-changePage(0);
-
-document.getElementById('list').onclick = event => {
-    if (pages.includes(event.target)) {
-        changePage(pages.indexOf(event.target));
-    }
-};
-
-document.getElementById('image-container').onclick = event => {
-    const width = document.getElementById('image-container').clientWidth;
-    const clickPos = event.clientX / width;
-
-    if (clickPos < 0.5) {
-        changePage(currentPage - 1);
-    } else {
-        changePage(currentPage + 1);
-    }
-};
-
-document.onkeypress = event => {
-    switch (event.key.toLowerCase()) {
-        // Previous Image
-        case 'arrowleft':
-        case 'a':
-            changePage(currentPage - 1);
-            break;
-
-        // Next Image
-        case ' ':
-        case 'enter':
-        case 'arrowright':
-        case 'd':
-            changePage(currentPage + 1);
-            break;
-    }
+const pages = Array.from(document.querySelectorAll('img.image-item'));
+let currentPage = 0;
+
+function changePage(pageNum) {
+    const previous = pages[currentPage];
+    const current = pages[pageNum];
+
+    if (current == null) {
+        return;
+    }
+    
+    previous.classList.remove('current');
+    current.classList.add('current');
+
+    currentPage = pageNum;
+
+    const display = document.getElementById('dest');
+    display.style.backgroundImage = `url("${current.src}")`;
+
+    document.getElementById('page-num')
+        .innerText = [
+                (pageNum + 1).toLocaleString(),
+                pages.length.toLocaleString()
+            ].join('\u200a/\u200a');
+}
+
+changePage(0);
+
+document.getElementById('list').onclick = event => {
+    if (pages.includes(event.target)) {
+        changePage(pages.indexOf(event.target));
+    }
+};
+
+document.getElementById('image-container').onclick = event => {
+    const width = document.getElementById('image-container').clientWidth;
+    const clickPos = event.clientX / width;
+
+    if (clickPos < 0.5) {
+        changePage(currentPage - 1);
+    } else {
+        changePage(currentPage + 1);
+    }
+};
+
+document.onkeypress = event => {
+    switch (event.key.toLowerCase()) {
+        // Previous Image
+        case 'arrowleft':
+        case 'a':
+            changePage(currentPage - 1);
+            break;
+
+        // Next Image
+        case ' ':
+        case 'enter':
+        case 'arrowright':
+        case 'd':
+            changePage(currentPage + 1);
+            break;
+    }
 };

nhentai/viewer/styles.css

@@ -1,69 +1,69 @@
-*, *::after, *::before {
-    box-sizing: border-box;
-}
-
-img {
-    vertical-align: middle;
-}
-
-html, body {
-    display: flex;
-    background-color: #e8e6e6;
-    height: 100%;
-    width: 100%;
-    padding: 0;
-    margin: 0;
-    font-family: sans-serif;
-}
-
-#list {
-    height: 100%;
-    overflow: auto;
-    width: 260px;
-    text-align: center;
-}
-
-#list img {
-    width: 200px;
-    padding: 10px;
-    border-radius: 10px;
-    margin: 15px 0;
-    cursor: pointer;
-}
-
-#list img.current {
-    background: #0003;
-}
-
-#image-container {
-    flex: auto;
-    height: 100vh;
-    background: #222;
-    color: #fff;
-    text-align: center;
-    cursor: pointer;
-    -webkit-user-select: none;
-    user-select: none;
-    position: relative;
-}
-
-#image-container #dest {
-    height: 100%;
-    width: 100%;
-    background-size: contain;
-    background-repeat: no-repeat;
-    background-position: center;
-}
-
-#image-container #page-num {
-    position: absolute;
-    font-size: 18pt;
-    left: 10px;
-    bottom: 5px;
-    font-weight: bold;
-    opacity: 0.75;
-    text-shadow: /* Duplicate the same shadow to make it very strong */
-        0 0 2px #222,
-        0 0 2px #222,
-        0 0 2px #222;
+*, *::after, *::before {
+    box-sizing: border-box;
+}
+
+img {
+    vertical-align: middle;
+}
+
+html, body {
+    display: flex;
+    background-color: #e8e6e6;
+    height: 100%;
+    width: 100%;
+    padding: 0;
+    margin: 0;
+    font-family: sans-serif;
+}
+
+#list {
+    height: 100%;
+    overflow: auto;
+    width: 260px;
+    text-align: center;
+}
+
+#list img {
+    width: 200px;
+    padding: 10px;
+    border-radius: 10px;
+    margin: 15px 0;
+    cursor: pointer;
+}
+
+#list img.current {
+    background: #0003;
+}
+
+#image-container {
+    flex: auto;
+    height: 100vh;
+    background: #222;
+    color: #fff;
+    text-align: center;
+    cursor: pointer;
+    -webkit-user-select: none;
+    user-select: none;
+    position: relative;
+}
+
+#image-container #dest {
+    height: 100%;
+    width: 100%;
+    background-size: contain;
+    background-repeat: no-repeat;
+    background-position: center;
+}
+
+#image-container #page-num {
+    position: absolute;
+    font-size: 18pt;
+    left: 10px;
+    bottom: 5px;
+    font-weight: bold;
+    opacity: 0.75;
+    text-shadow: /* Duplicate the same shadow to make it very strong */
+        0 0 2px #222,
+        0 0 2px #222,
+        0 0 2px #222;
 }

requirements.txt

@@ -2,4 +2,4 @@ requests>=2.5.0
 BeautifulSoup4>=4.0.0
 threadpool>=1.2.7
 tabulate>=0.7.5
-future>=0.15.2
+future>=0.15.2threadpool==1.3.2