0.2.12

2025-07-01 16:09:28 +02:00 · 2018-04-19 17:29:23 +08:00
11 changed files with 149 additions and 220 deletions
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -1,5 +1,3 @@
 include README.md
 include requirements.txt
-include nhentai/viewer/index.html
+include nhentai/doujinshi.html
 include nhentai/viewer/styles.css
 include nhentai/viewer/scripts.js
--- a/README.md
+++ b/README.md
@ -47,8 +47,6 @@ nhentai --login "username:password" --download
 `--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 的反向代理。  
--- a/nhentai/init.py
+++ b/nhentai/init.py
@ -1,3 +1,3 @@
 __version__ = '0.2.12'
-__author__ = 'RicterZ'
+__author__ = 'Ricter'
 __email__ = 'ricterzheng@gmail.com'
--- a/nhentai/cmdline.py
+++ b/nhentai/cmdline.py
@ -2,7 +2,6 @@
 from __future__ import print_function
 import sys
 from optparse import OptionParser
 from nhentai import __version__
 try:
    from itertools import ifilter as filter
 except ImportError:
@ -21,13 +20,13 @@ except NameError:
 def banner():
-    logger.info(u'''nHentai ver %s: あなたも変態。 いいね?
+    logger.info(u'''nHentai: あなたも変態。 いいね?
       _   _            _        _
 _ __ | | | | ___ _ __ | |_ __ _(_)
 | '_ \| |_| |/ _ \ '_ \| __/ _` | |
 | | | |  _  |  __/ | | | || (_| | |
 |_| |_|_| |_|\___|_| |_|\__\__,_|_|
-''' % __version__)
+''')
 def cmd_parser():
@ -57,12 +56,6 @@ def cmd_parser():
    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')
    parser.add_option('--cbz', dest='is_cbz', action='store_true',
                      help='Generate Comic Book CBZ File')                      
    try:
        sys.argv = list(map(lambda x: unicode(x.decode(sys.stdin.encoding)), sys.argv))
    except (NameError, TypeError):
--- a/nhentai/command.py
+++ b/nhentai/command.py
@ -10,7 +10,7 @@ from nhentai.doujinshi import Doujinshi
 from nhentai.downloader import Downloader
 from nhentai.logger import logger
 from nhentai.constant import BASE_URL
-from nhentai.utils import generate_html, generate_cbz
+from nhentai.utils import generate_html
 def main():
@ -47,13 +47,10 @@ def main():
        for doujinshi in doujinshi_list:
            doujinshi.downloader = downloader
            doujinshi.download()
-            if not options.is_nohtml and not options.is_cbz:
+            generate_html(options.output_dir, doujinshi)
                generate_html(options.output_dir, doujinshi)
            elif options.is_cbz:
                generate_cbz(options.output_dir, doujinshi)
        if not platform.system() == 'Windows':
-            logger.log(15, '🍻 All done.')
+            logger.log(15, '🍺 All done.')
        else:
            logger.log(15, 'All done.')
--- a/nhentai/doujinshi.html
+++ b/nhentai/doujinshi.html
@ -0,0 +1,126 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
    <meta charset="UTF-8">
    <title>{TITLE}</title>
    <style>
        html, body {{
            background-color: #e8e6e6;
            height: 100%;
            padding: 0;
            margin: 0;
            overflow: hidden;
        }}
        .container img {{
            display: block;
            width: 100%;
            margin: 30px 0;
            padding:  10px;
            cursor: pointer;
        }}
        .container {{
            height: 100%;
            overflow: scroll;
            background: #e8e6e6;
            width: 200px;
            padding: 30px;
            float: left;
        }}
        .image {{
            margin-left: 260px;
            height: 100%;
            background: #222;
            text-align: center;
        }}
        .image img {{
            height: 100%;
        }}
        .i a {{
            display: block;
            position: absolute;
            top: 0;
            width: 50%;
            height: 100%;
        }}
        .i {{
            position: relative;
            height: 100%;
        }}
        .current {{
            background: #BBB;
            border-radius: 10px;
        }}
    </style>
    <script>
        function cursorfocus(elem) {{
            var container = document.getElementsByClassName('container')[0];
            container.scrollTop = elem.offsetTop - 500;
        }}
        function getImage(type) {{
            var current = document.getElementsByClassName("current")[0];
            current.className = "image-item";
            var img_src = type == 1 ? current.getAttribute('attr-next') : current.getAttribute('attr-prev');
            if (img_src === "") {{
                img_src = current.src;
            }}
            var img_list = document.getElementsByClassName("image-item");
            for (i=0; i<img_list.length; i++) {{
                if (img_list[i].src.endsWith(img_src)) {{
                    img_list[i].className = "image-item current";
                    cursorfocus(img_list[i]);
                    break;
                }}
            }}
            var display = document.getElementById("dest");
            display.src = img_src;
            display.focus();
        }}
    </script>
 </head>
 <body>
 <div class="container">
 {IMAGES}</div>
 <div class="image">
    <div class="i">
        <img src="" id="dest">
        <a href="javascript:getImage(-1)" style="left: 0;"></a>
        <a href="javascript:getImage(1)" style="left: 50%;"></a>
    </div>
 </div>
 </body>
 <script>
    var img_list = document.getElementsByClassName("image-item");
    var display = document.getElementById("dest");
    display.src = img_list[0].src;
    for (var i = 0; i < img_list.length; i++) {{
        img_list[i].addEventListener('click', function() {{
            var current = document.getElementsByClassName("current")[0];
            current.className = "image-item";
            this.className = "image-item current";
            var display = document.getElementById("dest");
            display.src = this.src;
            display.focus();
        }}, false);
    }}
    document.onkeypress = function(e) {{
        if (e.keyCode == 32) {{
            getImage(1);
        }}
    }}
 </script>
 </html>
--- a/nhentai/parser.py
+++ b/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,7 +44,7 @@ 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.')
--- a/nhentai/utils.py
+++ b/nhentai/utils.py
@ -3,8 +3,6 @@ from __future__ import unicode_literals, print_function
 import os
 import string
 import zipfile
 import shutil
 from nhentai.logger import logger
@ -30,74 +28,48 @@ 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 = ''
    previous = ''
    if doujinshi_obj is not None:
        doujinshi_dir = os.path.join(output_dir, format_filename('%s-%s' % (doujinshi_obj.id,
-                                                                            str(doujinshi_obj.name[:200]))))
+                                                                            doujinshi_obj.name[:200])))
    else:
        doujinshi_dir = '.'
    file_list = os.listdir(doujinshi_dir)
    file_list.sort()
-    for image in file_list:
+    for index, image in enumerate(file_list):
        if not os.path.splitext(image)[1] in ('.jpg', '.png'):
            continue
-        image_html += '<img src="{0}" class="image-item"/>\n'\
+        try:
-            .format(image)
+            next_ = file_list[file_list.index(image) + 1]
        except IndexError:
            next_ = ''
-    html = readfile('viewer/index.html')
+        image_html += '<img src="{0}" class="image-item {1}" attr-prev="{2}" attr-next="{3}">\n'\
-    css = readfile('viewer/styles.css')
+            .format(image, 'current' if index == 0 else '', previous, next_)
-    js = readfile('viewer/scripts.js')
+        previous = image
    with open(os.path.join(os.path.dirname(__file__), 'doujinshi.html'), 'r') as template:
        html = template.read()
    if doujinshi_obj is not None:
        title = doujinshi_obj.name
    else:
        title = 'nHentai HTML Viewer'
-    data = html.format(TITLE=title, IMAGES=image_html, SCRIPTS=js, STYLES=css)
+    data = html.format(TITLE=title, IMAGES=image_html)
    with open(os.path.join(doujinshi_dir, 'index.html'), 'w') as f:
        f.write(data)
    logger.log(15, 'HTML Viewer has been write to \'{0}\''.format(os.path.join(doujinshi_dir, 'index.html')))
 def generate_cbz(output_dir='.', doujinshi_obj=None):
    if doujinshi_obj is not None:
        doujinshi_dir = os.path.join(output_dir, format_filename('%s-%s' % (doujinshi_obj.id,
                                                                            str(doujinshi_obj.name[:200]))))    
        cbz_filename = os.path.join(output_dir, format_filename('%s-%s.cbz' % (doujinshi_obj.id,
                                                                            str(doujinshi_obj.name[:200]))))
    else:
        cbz_filename = './doujinshi.cbz'
        doujinshi_dir = '.'
    file_list = os.listdir(doujinshi_dir)
    file_list.sort()
    with zipfile.ZipFile(cbz_filename, 'w') as cbz_pf:
        for image in file_list:
            image_path = os.path.join(doujinshi_dir, image)
            cbz_pf.write(image_path, image)
    shutil.rmtree(doujinshi_dir, ignore_errors=True)
    logger.log(15, 'Comic Book CBZ file has been write to \'{0}\''.format(doujinshi_dir))
 def format_filename(s):
    """Take a string and return a valid filename constructed from the string.
 Uses a whitelist approach: any characters not present in valid_chars are
--- a/nhentai/viewer/index.html
+++ b/nhentai/viewer/index.html
@ -1,24 +0,0 @@
 <!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>
--- a/nhentai/viewer/scripts.js
+++ b/nhentai/viewer/scripts.js
@ -1,62 +0,0 @@
 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;
    }
 };
--- a/nhentai/viewer/styles.css
+++ b/nhentai/viewer/styles.css
@ -1,69 +0,0 @@
 *, *::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;
 }