mirror of
https://github.com/RicterZ/nhentai.git
synced 2025-07-01 16:09:28 +02:00
Compare commits
102 Commits
Author | SHA1 | Date | |
---|---|---|---|
df16109788 | |||
197b5e4923 | |||
9f747dad7e | |||
ca713197cc | |||
49f07de95d | |||
5c7bdae0d7 | |||
d5f41bf37c | |||
56153015b1 | |||
140249217a | |||
9e537e60f2 | |||
4df8e1bae0 | |||
c250d9c787 | |||
a5547696eb | |||
49ac1d035d | |||
f234b7234e | |||
43a9b981dd | |||
bc29869a8b | |||
53e1923e67 | |||
ba6d4047e2 | |||
dcf22b30a5 | |||
0208d9b9e6 | |||
0115285e10 | |||
ea8a576f7e | |||
05eaa9eebc | |||
ab2dff4859 | |||
9592870d85 | |||
c1a82635bd | |||
1974644513 | |||
fe4fb46e30 | |||
6156cf5914 | |||
75b00fc523 | |||
ff8af8279f | |||
e1556b09cc | |||
110a2acb7c | |||
c60f1f34d5 | |||
4f2db83a13 | |||
bd8bb42ecd | |||
0abcb048b4 | |||
411d6c2f30 | |||
88c0c1e021 | |||
86c43e5d8c | |||
39f8729d51 | |||
d6461335f8 | |||
c0c7b33909 | |||
893a8c194e | |||
e6d2eb554d | |||
25e5acf671 | |||
4f33228cec | |||
f227c9e897 | |||
9f2f57248b | |||
024f08ca97 | |||
3017fff823 | |||
070e8917f4 | |||
01caa8d4e5 | |||
35e724e206 | |||
d045adfd6a | |||
62e3552c84 | |||
6e2a25cf55 | |||
44178a8cfb | |||
4ca582c104 | |||
97857b8dc6 | |||
23774d9526 | |||
8dc7a1f40b | |||
349e21193b | |||
7e826c5255 | |||
bc70a2071b | |||
1b49911166 | |||
7eeed17ea5 | |||
f4afcd549e | |||
4fc6303db2 | |||
f2aa65b64b | |||
0a343935ab | |||
03f1aeada7 | |||
94395d9165 | |||
bacaa096e0 | |||
3e420f05fa | |||
158b15bda8 | |||
92640d9767 | |||
6b97777b7d | |||
1af195d727 | |||
58b2b644c1 | |||
0cfec34e9e | |||
1172282362 | |||
a909ad6d92 | |||
440bb0dc38 | |||
f5b7d89fb0 | |||
535b804ef6 | |||
9b65544942 | |||
0935d609c3 | |||
f10ae3cf58 | |||
86b3a092c7 | |||
710cc86eaf | |||
2d327359aa | |||
f78b8bc2cd | |||
a95396033b | |||
a5eba94064 | |||
6053e302ee | |||
c32b516575 | |||
0150e79c49 | |||
0cda30385b | |||
18bdab1962 | |||
8e8f935a9b |
17
.travis.yml
17
.travis.yml
@ -4,18 +4,17 @@ os:
|
||||
language: python
|
||||
python:
|
||||
- 2.7
|
||||
- 3.6
|
||||
- 3.5
|
||||
- 3.4
|
||||
- 3.7
|
||||
|
||||
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/ --cbz
|
||||
- NHENTAI=https://nhentai.net nhentai --tag lolicon
|
||||
- NHENTAI=https://nhentai.net nhentai -F
|
||||
- NHENTAI=https://nhentai.net nhentai --file /tmp/test.txt
|
||||
- nhentai --cookie "csrftoken=xIh7s9d4NB8qSLN7eJZG9064zsV84aHEYFoAU49Ib9anqmoT0pZRw6TIdayLzQuT; sessionid=un101zfgpglsyffdnsm72le4euuisp7t"
|
||||
- nhentai --search umaru
|
||||
- nhentai --id=152503,146134 -t 10 --output=/tmp/ --cbz
|
||||
- nhentai --tag lolicon --sorting popular
|
||||
- nhentai -F
|
||||
- nhentai --file /tmp/test.txt
|
||||
- nhentai --id=152503,146134 --gen-main --output=/tmp/
|
||||
|
13
MANIFEST.in
13
MANIFEST.in
@ -1,5 +1,8 @@
|
||||
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
|
||||
include nhentai/viewer/main.html
|
||||
include nhentai/viewer/main.css
|
||||
include nhentai/viewer/main.js
|
||||
|
410
README.rst
410
README.rst
@ -1,186 +1,224 @@
|
||||
nhentai
|
||||
=======
|
||||
|
||||
.. code-block::
|
||||
|
||||
_ _ _ _
|
||||
_ __ | | | | ___ _ __ | |_ __ _(_)
|
||||
| '_ \| |_| |/ _ \ '_ \| __/ _` | |
|
||||
| | | | _ | __/ | | | || (_| | |
|
||||
|_| |_|_| |_|\___|_| |_|\__\__,_|_|
|
||||
|
||||
|
||||
あなたも変態。 いいね?
|
||||
|
||||
|travis|
|
||||
|pypi|
|
||||
|license|
|
||||
|
||||
|
||||
nHentai is a CLI tool for downloading doujinshi from <http://nhentai.net>
|
||||
|
||||
============
|
||||
Installation
|
||||
============
|
||||
.. code-block::
|
||||
|
||||
git clone https://github.com/RicterZ/nhentai
|
||||
cd nhentai
|
||||
python setup.py install
|
||||
|
||||
=====================
|
||||
Installation (Gentoo)
|
||||
=====================
|
||||
.. code-block::
|
||||
|
||||
layman -fa glicOne
|
||||
sudo emerge net-misc/nhentai
|
||||
|
||||
=====
|
||||
Usage
|
||||
=====
|
||||
**IMPORTANT**: To bypass the nhentai frequency limit, you should use `--cookie` option to store your cookie.
|
||||
*The default download folder will be the path where you run the command (CLI path).*
|
||||
|
||||
|
||||
Set your nhentai cookie against captcha:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --cookie 'YOUR COOKIE FROM nhentai.net'
|
||||
|
||||
Download specified doujinshi:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --id=123855,123866
|
||||
|
||||
Download doujinshi with ids specified in a file (doujinshi ids split by line):
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --file=doujinshi.txt
|
||||
|
||||
Search a keyword and download the first page:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --search="tomori" --page=1 --download
|
||||
|
||||
Download by tag name:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --tag lolicon --download --page=2
|
||||
|
||||
Download your favorites with delay:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --favorites --download --delay 1
|
||||
|
||||
Format output doujinshi folder name:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --id 261100 --format '[%i]%s'
|
||||
|
||||
Supported doujinshi folder formatter:
|
||||
|
||||
- %i: Doujinshi id
|
||||
- %t: Doujinshi name
|
||||
- %s: Doujinshi subtitle (translated name)
|
||||
- %a: Doujinshi authors' name
|
||||
|
||||
|
||||
Other options:
|
||||
|
||||
.. code-block::
|
||||
|
||||
Options:
|
||||
# Operation options
|
||||
-h, --help show this help message and exit
|
||||
-D, --download download doujinshi (for search results)
|
||||
-S, --show just show the doujinshi information
|
||||
|
||||
# Doujinshi options
|
||||
--id=ID doujinshi ids set, e.g. 1,2,3
|
||||
-s KEYWORD, --search=KEYWORD
|
||||
search doujinshi by keyword
|
||||
--tag=TAG download doujinshi by tag
|
||||
-F, --favorites list or download your favorites.
|
||||
|
||||
# Multi-page options
|
||||
--page=PAGE page number of search results
|
||||
--max-page=MAX_PAGE The max page when recursive download tagged doujinshi
|
||||
|
||||
# Download options
|
||||
-o OUTPUT_DIR, --output=OUTPUT_DIR
|
||||
output dir
|
||||
-t THREADS, --threads=THREADS
|
||||
thread count for downloading doujinshi
|
||||
-T TIMEOUT, --timeout=TIMEOUT
|
||||
timeout for downloading doujinshi
|
||||
-d DELAY, --delay=DELAY
|
||||
slow down between downloading every doujinshi
|
||||
-p PROXY, --proxy=PROXY
|
||||
uses a proxy, for example: http://127.0.0.1:1080
|
||||
-f FILE, --file=FILE read gallery IDs from file.
|
||||
--format=NAME_FORMAT format the saved folder name
|
||||
|
||||
# Generating options
|
||||
--html generate a html viewer at current directory
|
||||
--no-html don't generate HTML after downloading
|
||||
-C, --cbz generate Comic Book CBZ File
|
||||
--rm-origin-dir remove downloaded doujinshi dir when generated CBZ
|
||||
file.
|
||||
|
||||
# nHentai options
|
||||
--cookie=COOKIE set cookie of nhentai to bypass Google recaptcha
|
||||
|
||||
|
||||
==============
|
||||
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:
|
||||
|
||||
.. code-block::
|
||||
|
||||
i.h.loli.club -> i.nhentai.net
|
||||
h.loli.club -> nhentai.net
|
||||
|
||||
Set `NHENTAI` env var to your nhentai mirror.
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
NHENTAI=http://h.loli.club nhentai --id 123456
|
||||
|
||||
|
||||
.. image:: ./images/search.png?raw=true
|
||||
:alt: nhentai
|
||||
:align: center
|
||||
.. image:: ./images/download.png?raw=true
|
||||
:alt: nhentai
|
||||
:align: center
|
||||
.. image:: ./images/viewer.png?raw=true
|
||||
:alt: nhentai
|
||||
:align: center
|
||||
|
||||
============
|
||||
あなたも変態
|
||||
============
|
||||
.. image:: ./images/image.jpg?raw=true
|
||||
:alt: nhentai
|
||||
:align: center
|
||||
|
||||
|
||||
|
||||
.. |travis| image:: https://travis-ci.org/RicterZ/nhentai.svg?branch=master
|
||||
:target: https://travis-ci.org/RicterZ/nhentai
|
||||
|
||||
.. |pypi| image:: https://img.shields.io/pypi/dm/nhentai.svg
|
||||
:target: https://pypi.org/project/nhentai/
|
||||
|
||||
.. |license| image:: https://img.shields.io/github/license/ricterz/nhentai.svg
|
||||
:target: https://github.com/RicterZ/nhentai/blob/master/LICENSE
|
||||
nhentai
|
||||
=======
|
||||
|
||||
.. code-block::
|
||||
|
||||
_ _ _ _
|
||||
_ __ | | | | ___ _ __ | |_ __ _(_)
|
||||
| '_ \| |_| |/ _ \ '_ \| __/ _` | |
|
||||
| | | | _ | __/ | | | || (_| | |
|
||||
|_| |_|_| |_|\___|_| |_|\__\__,_|_|
|
||||
|
||||
|
||||
あなたも変態。 いいね?
|
||||
|
||||
|travis|
|
||||
|pypi|
|
||||
|license|
|
||||
|
||||
|
||||
nHentai is a CLI tool for downloading doujinshi from <http://nhentai.net>
|
||||
|
||||
============
|
||||
Installation
|
||||
============
|
||||
.. code-block::
|
||||
|
||||
git clone https://github.com/RicterZ/nhentai
|
||||
cd nhentai
|
||||
python setup.py install
|
||||
|
||||
=====================
|
||||
Installation (Gentoo)
|
||||
=====================
|
||||
.. code-block::
|
||||
|
||||
layman -fa glicOne
|
||||
sudo emerge net-misc/nhentai
|
||||
|
||||
=====
|
||||
Usage
|
||||
=====
|
||||
**IMPORTANT**: To bypass the nhentai frequency limit, you should use `--cookie` option to store your cookie.
|
||||
|
||||
*The default download folder will be the path where you run the command (CLI path).*
|
||||
|
||||
|
||||
Set your nhentai cookie against captcha:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --cookie "YOUR COOKIE FROM nhentai.net"
|
||||
|
||||
Download specified doujinshi:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --id=123855,123866
|
||||
|
||||
Download doujinshi with ids specified in a file (doujinshi ids split by line):
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --file=doujinshi.txt
|
||||
|
||||
Search a keyword and download the first page:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --search="tomori" --page=1 --download
|
||||
|
||||
Download by tag name:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --tag lolicon --download --page=2
|
||||
|
||||
Download by language:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --language english --download --page=2
|
||||
|
||||
Download by artist name:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --artist henreader --download
|
||||
|
||||
Download by character name:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --character "kuro von einsbern" --download
|
||||
|
||||
Download by parody name:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --parody "the idolmaster" --download
|
||||
|
||||
Download by group name:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --group clesta --download
|
||||
|
||||
Download using multiple tags (--tag, --character, --paordy and --group supported):
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --tag "lolicon, teasing" --artist "tamano kedama, atte nanakusa"
|
||||
|
||||
Download your favorites with delay:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --favorites --download --delay 1
|
||||
|
||||
Format output doujinshi folder name:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
nhentai --id 261100 --format '[%i]%s'
|
||||
|
||||
Supported doujinshi folder formatter:
|
||||
|
||||
- %i: Doujinshi id
|
||||
- %t: Doujinshi name
|
||||
- %s: Doujinshi subtitle (translated name)
|
||||
- %a: Doujinshi authors' name
|
||||
|
||||
|
||||
Other options:
|
||||
|
||||
.. code-block::
|
||||
|
||||
Options:
|
||||
# Operation options
|
||||
-h, --help show this help message and exit
|
||||
-D, --download download doujinshi (for search results)
|
||||
-S, --show just show the doujinshi information
|
||||
|
||||
# Doujinshi options
|
||||
--id=ID doujinshi ids set, e.g. 1,2,3
|
||||
-s KEYWORD, --search=KEYWORD
|
||||
search doujinshi by keyword
|
||||
--tag=TAG download doujinshi by tag
|
||||
-F, --favorites list or download your favorites.
|
||||
|
||||
# Multi-page options
|
||||
--page=PAGE page number of search results
|
||||
--max-page=MAX_PAGE The max page when recursive download tagged doujinshi
|
||||
|
||||
# Download options
|
||||
-o OUTPUT_DIR, --output=OUTPUT_DIR
|
||||
output dir
|
||||
-t THREADS, --threads=THREADS
|
||||
thread count for downloading doujinshi
|
||||
-T TIMEOUT, --timeout=TIMEOUT
|
||||
timeout for downloading doujinshi
|
||||
-d DELAY, --delay=DELAY
|
||||
slow down between downloading every doujinshi
|
||||
-p PROXY, --proxy=PROXY
|
||||
uses a proxy, for example: http://127.0.0.1:1080
|
||||
-f FILE, --file=FILE read gallery IDs from file.
|
||||
--format=NAME_FORMAT format the saved folder name
|
||||
|
||||
# Generating options
|
||||
--html generate a html viewer at current directory
|
||||
--no-html don't generate HTML after downloading
|
||||
--gen-main generate a main viewer contain all the doujin in the folder
|
||||
-C, --cbz generate Comic Book CBZ File
|
||||
--rm-origin-dir remove downloaded doujinshi dir when generated CBZ
|
||||
file.
|
||||
|
||||
# nHentai options
|
||||
--cookie=COOKIE set cookie of nhentai to bypass Google recaptcha
|
||||
|
||||
|
||||
==============
|
||||
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:
|
||||
|
||||
.. code-block::
|
||||
|
||||
i.h.loli.club -> i.nhentai.net
|
||||
h.loli.club -> nhentai.net
|
||||
|
||||
Set `NHENTAI` env var to your nhentai mirror.
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
NHENTAI=http://h.loli.club nhentai --id 123456
|
||||
|
||||
|
||||
.. image:: ./images/search.png?raw=true
|
||||
:alt: nhentai
|
||||
:align: center
|
||||
.. image:: ./images/download.png?raw=true
|
||||
:alt: nhentai
|
||||
:align: center
|
||||
.. image:: ./images/viewer.png?raw=true
|
||||
:alt: nhentai
|
||||
:align: center
|
||||
|
||||
============
|
||||
あなたも変態
|
||||
============
|
||||
.. image:: ./images/image.jpg?raw=true
|
||||
:alt: nhentai
|
||||
:align: center
|
||||
|
||||
|
||||
|
||||
.. |travis| image:: https://travis-ci.org/RicterZ/nhentai.svg?branch=master
|
||||
:target: https://travis-ci.org/RicterZ/nhentai
|
||||
|
||||
.. |pypi| image:: https://img.shields.io/pypi/dm/nhentai.svg
|
||||
:target: https://pypi.org/project/nhentai/
|
||||
|
||||
.. |license| image:: https://img.shields.io/github/license/ricterz/nhentai.svg
|
||||
:target: https://github.com/RicterZ/nhentai/blob/master/LICENSE
|
||||
|
@ -1,3 +1,3 @@
|
||||
__version__ = '0.3.4'
|
||||
__version__ = '0.3.8'
|
||||
__author__ = 'RicterZ'
|
||||
__email__ = 'ricterzheng@gmail.com'
|
||||
|
@ -10,7 +10,7 @@ except ImportError:
|
||||
|
||||
import nhentai.constant as constant
|
||||
from nhentai import __version__
|
||||
from nhentai.utils import urlparse, generate_html
|
||||
from nhentai.utils import urlparse, generate_html, generate_main_html, DB
|
||||
from nhentai.logger import logger
|
||||
|
||||
try:
|
||||
@ -48,8 +48,16 @@ def cmd_parser():
|
||||
|
||||
# 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', '-s', type='string', dest='keyword', action='store', help='search doujinshi by keyword')
|
||||
parser.add_option('--search', '-s', 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('--artist', type='string', dest='artist', action='store', help='download doujinshi by artist')
|
||||
parser.add_option('--character', type='string', dest='character', action='store',
|
||||
help='download doujinshi by character')
|
||||
parser.add_option('--parody', type='string', dest='parody', action='store', help='download doujinshi by parody')
|
||||
parser.add_option('--group', type='string', dest='group', action='store', help='download doujinshi by group')
|
||||
parser.add_option('--language', type='string', dest='language', action='store',
|
||||
help='download doujinshi by language')
|
||||
parser.add_option('--favorites', '-F', action='store_true', dest='favorites',
|
||||
help='list or download your favorites.')
|
||||
|
||||
@ -58,6 +66,10 @@ def cmd_parser():
|
||||
help='page number of search results')
|
||||
parser.add_option('--max-page', type='int', dest='max_page', action='store', default=1,
|
||||
help='The max page when recursive download tagged doujinshi')
|
||||
parser.add_option('--page-range', type='string', dest='page_range', action='store',
|
||||
help='page range of favorites. e.g. 1,2-5,14')
|
||||
parser.add_option('--sorting', dest='sorting', action='store', default='date',
|
||||
help='sorting of doujinshi (date / popular)', choices=['date', 'popular'])
|
||||
|
||||
# download options
|
||||
parser.add_option('--output', '-o', type='string', dest='output_dir', action='store', default='',
|
||||
@ -69,7 +81,7 @@ def cmd_parser():
|
||||
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='',
|
||||
help='uses a proxy, for example: http://127.0.0.1:1080')
|
||||
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',
|
||||
help='format the saved folder name', default='[%i][%a][%t]')
|
||||
@ -79,6 +91,8 @@ def cmd_parser():
|
||||
help='generate a html viewer at current directory')
|
||||
parser.add_option('--no-html', dest='is_nohtml', action='store_true',
|
||||
help='don\'t generate HTML after downloading')
|
||||
parser.add_option('--gen-main', dest='main_viewer', action='store_true',
|
||||
help='generate a main viewer contain all the doujin in the folder')
|
||||
parser.add_option('--cbz', '-C', dest='is_cbz', action='store_true',
|
||||
help='generate Comic Book CBZ File')
|
||||
parser.add_option('--rm-origin-dir', dest='rm_origin_dir', action='store_true', default=False,
|
||||
@ -87,9 +101,14 @@ def cmd_parser():
|
||||
# nhentai options
|
||||
parser.add_option('--cookie', type='str', dest='cookie', action='store',
|
||||
help='set cookie of nhentai to bypass Google recaptcha')
|
||||
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',
|
||||
help='clean download history')
|
||||
|
||||
try:
|
||||
sys.argv = list(map(lambda x: unicode(x.decode(sys.stdin.encoding)), sys.argv))
|
||||
sys.argv = [unicode(i.decode(sys.stdin.encoding)) for i in sys.argv]
|
||||
print()
|
||||
except (NameError, TypeError):
|
||||
pass
|
||||
except UnicodeDecodeError:
|
||||
@ -101,8 +120,21 @@ 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:
|
||||
if args.main_viewer and not args.id and not args.keyword and \
|
||||
not args.tag and not args.artist and not args.character and \
|
||||
not args.parody and not args.group and not args.language and not args.favorites:
|
||||
generate_main_html()
|
||||
exit(0)
|
||||
|
||||
if args.clean_download_history:
|
||||
with DB() as db:
|
||||
db.clean_all()
|
||||
|
||||
logger.info('Download history cleaned.')
|
||||
exit(0)
|
||||
|
||||
if os.path.exists(constant.NHENTAI_COOKIE):
|
||||
with open(constant.NHENTAI_COOKIE, 'r') as f:
|
||||
constant.COOKIE = f.read()
|
||||
|
||||
if args.cookie:
|
||||
@ -110,7 +142,7 @@ def cmd_parser():
|
||||
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:
|
||||
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)))
|
||||
@ -119,17 +151,29 @@ def cmd_parser():
|
||||
logger.info('Cookie saved.')
|
||||
exit(0)
|
||||
|
||||
'''
|
||||
if args.login:
|
||||
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:
|
||||
_, _ = args.login.split(':', 1)
|
||||
except ValueError:
|
||||
logger.error('Invalid `username:password` pair.')
|
||||
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)
|
||||
|
||||
if not args.is_download:
|
||||
logger.warning('YOU DO NOT SPECIFY `--download` OPTION !!!')
|
||||
'''
|
||||
logger.info('Proxy \'{0}\' saved.'.format(args.proxy))
|
||||
exit(0)
|
||||
|
||||
if args.favorites:
|
||||
if not constant.COOKIE:
|
||||
@ -137,21 +181,23 @@ def cmd_parser():
|
||||
exit(1)
|
||||
|
||||
if args.id:
|
||||
_ = map(lambda id_: id_.strip(), args.id.split(','))
|
||||
args.id = set(map(int, filter(lambda id_: id_.isdigit(), _)))
|
||||
_ = [i.strip() for i in args.id.split(',')]
|
||||
args.id = set(int(i) for i in _ if i.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(), _)))
|
||||
_ = [i.strip() for i in f.readlines()]
|
||||
args.id = set(int(i) for i in _ if i.isdigit())
|
||||
|
||||
if (args.is_download or args.is_show) and not args.id and not args.keyword and \
|
||||
not args.tag and not args.favorites:
|
||||
not args.tag and not args.artist and not args.character and \
|
||||
not args.parody and not args.group and not args.language 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.tag and not args.favorites:
|
||||
if not args.keyword and not args.id and not args.tag and not args.artist and \
|
||||
not args.character and not args.parody and not args.group and not args.language and not args.favorites:
|
||||
parser.print_help()
|
||||
exit(1)
|
||||
|
||||
@ -162,11 +208,4 @@ def cmd_parser():
|
||||
logger.critical('Maximum number of used threads is 15')
|
||||
exit(1)
|
||||
|
||||
if args.proxy:
|
||||
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:
|
||||
constant.PROXY = {'http': args.proxy, 'https': args.proxy}
|
||||
|
||||
return args
|
||||
|
@ -6,19 +6,29 @@ import platform
|
||||
import time
|
||||
|
||||
from nhentai.cmdline import cmd_parser, banner
|
||||
from nhentai.parser import doujinshi_parser, search_parser, print_doujinshi, favorites_parser, tag_parser, login
|
||||
from nhentai.parser import doujinshi_parser, search_parser, print_doujinshi, favorites_parser, tag_parser
|
||||
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, generate_cbz, generate_main_html, check_cookie, signal_handler, DB
|
||||
|
||||
|
||||
def main():
|
||||
banner()
|
||||
logger.info('Using mirror: {0}'.format(BASE_URL))
|
||||
options = cmd_parser()
|
||||
logger.info('Using mirror: {0}'.format(BASE_URL))
|
||||
|
||||
from nhentai.constant import PROXY
|
||||
# constant.PROXY will be changed after cmd_parser()
|
||||
if PROXY != {}:
|
||||
logger.info('Using proxy: {0}'.format(PROXY))
|
||||
|
||||
# check your cookie
|
||||
check_cookie()
|
||||
|
||||
index = 0
|
||||
doujinshis = []
|
||||
doujinshi_ids = []
|
||||
doujinshi_list = []
|
||||
|
||||
@ -26,42 +36,78 @@ def main():
|
||||
if not options.is_download:
|
||||
logger.warning('You do not specify --download option')
|
||||
|
||||
doujinshi_ids = favorites_parser()
|
||||
doujinshis = favorites_parser(options.page_range)
|
||||
|
||||
elif options.tag:
|
||||
doujinshis = tag_parser(options.tag, max_page=options.max_page)
|
||||
print_doujinshi(doujinshis)
|
||||
if options.is_download and doujinshis:
|
||||
doujinshi_ids = map(lambda d: d['id'], doujinshis)
|
||||
doujinshis = tag_parser(options.tag, sorting=options.sorting, max_page=options.max_page)
|
||||
|
||||
elif options.artist:
|
||||
index = 1
|
||||
|
||||
elif options.character:
|
||||
index = 2
|
||||
|
||||
elif options.parody:
|
||||
index = 3
|
||||
|
||||
elif options.group:
|
||||
index = 4
|
||||
|
||||
elif options.language:
|
||||
index = 5
|
||||
|
||||
elif options.keyword:
|
||||
doujinshis = search_parser(options.keyword, options.page)
|
||||
print_doujinshi(doujinshis)
|
||||
if options.is_download:
|
||||
doujinshi_ids = map(lambda d: d['id'], doujinshis)
|
||||
doujinshis = search_parser(options.keyword, sorting=options.sorting, page=options.page)
|
||||
|
||||
elif not doujinshi_ids:
|
||||
doujinshi_ids = options.id
|
||||
|
||||
if index:
|
||||
doujinshis = tag_parser(options.language, max_page=options.max_page, index=index)
|
||||
|
||||
print_doujinshi(doujinshis)
|
||||
if options.is_download and doujinshis:
|
||||
doujinshi_ids = [i['id'] for i in doujinshis]
|
||||
|
||||
if options.is_save_download_history:
|
||||
with DB() as db:
|
||||
data = set(db.get_all())
|
||||
|
||||
doujinshi_ids = list(set(doujinshi_ids) - data)
|
||||
|
||||
if doujinshi_ids:
|
||||
for id_ in doujinshi_ids:
|
||||
for i, id_ in enumerate(doujinshi_ids):
|
||||
if options.delay:
|
||||
time.sleep(options.delay)
|
||||
|
||||
doujinshi_info = doujinshi_parser(id_)
|
||||
doujinshi_list.append(Doujinshi(name_format=options.name_format, **doujinshi_info))
|
||||
|
||||
if doujinshi_info:
|
||||
doujinshi_list.append(Doujinshi(name_format=options.name_format, **doujinshi_info))
|
||||
|
||||
if (i + 1) % 10 == 0:
|
||||
logger.info('Progress: %d / %d' % (i + 1, len(doujinshi_ids)))
|
||||
|
||||
if not options.is_show:
|
||||
downloader = Downloader(path=options.output_dir,
|
||||
thread=options.threads, timeout=options.timeout, delay=options.delay)
|
||||
downloader = Downloader(path=options.output_dir, size=options.threads,
|
||||
timeout=options.timeout, delay=options.delay)
|
||||
|
||||
for doujinshi in doujinshi_list:
|
||||
|
||||
doujinshi.downloader = downloader
|
||||
doujinshi.download()
|
||||
if options.is_save_download_history:
|
||||
with DB() as db:
|
||||
db.add_one(doujinshi.id)
|
||||
|
||||
if not options.is_nohtml and not options.is_cbz:
|
||||
generate_html(options.output_dir, doujinshi)
|
||||
elif options.is_cbz:
|
||||
generate_cbz(options.output_dir, doujinshi, options.rm_origin_dir)
|
||||
|
||||
if options.main_viewer:
|
||||
generate_main_html(options.output_dir)
|
||||
|
||||
if not platform.system() == 'Windows':
|
||||
logger.log(15, '🍻 All done.')
|
||||
else:
|
||||
@ -71,12 +117,8 @@ def main():
|
||||
[doujinshi.show() for doujinshi in doujinshi_list]
|
||||
|
||||
|
||||
def signal_handler(signal, frame):
|
||||
logger.error('Ctrl-C signal received. Stopping...')
|
||||
exit(1)
|
||||
|
||||
|
||||
signal.signal(signal.SIGINT, signal_handler)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
@ -2,7 +2,12 @@
|
||||
from __future__ import unicode_literals, print_function
|
||||
import os
|
||||
import tempfile
|
||||
from nhentai.utils import urlparse
|
||||
|
||||
try:
|
||||
from urlparse import urlparse
|
||||
except ImportError:
|
||||
from urllib.parse import urlparse
|
||||
|
||||
|
||||
BASE_URL = os.getenv('NHENTAI', 'https://nhentai.net')
|
||||
|
||||
@ -12,7 +17,13 @@ __api_suspended_SEARCH_URL = '%s/api/galleries/search' % BASE_URL
|
||||
DETAIL_URL = '%s/g' % BASE_URL
|
||||
SEARCH_URL = '%s/search/' % BASE_URL
|
||||
|
||||
TAG_URL = '%s/tag' % BASE_URL
|
||||
TAG_URL = ['%s/tag' % BASE_URL,
|
||||
'%s/artist' % BASE_URL,
|
||||
'%s/character' % BASE_URL,
|
||||
'%s/parody' % BASE_URL,
|
||||
'%s/group' % BASE_URL,
|
||||
'%s/language' % BASE_URL]
|
||||
|
||||
TAG_API_URL = '%s/api/galleries/tagged' % BASE_URL
|
||||
LOGIN_URL = '%s/login/' % BASE_URL
|
||||
CHALLENGE_URL = '%s/challenge' % BASE_URL
|
||||
@ -22,6 +33,9 @@ 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_HISTORY = os.path.join(NHENTAI_HOME, 'history.sqlite3')
|
||||
|
||||
PROXY = {}
|
||||
|
||||
|
@ -41,7 +41,7 @@ class Doujinshi(object):
|
||||
name_format = name_format.replace('%a', self.info.artists)
|
||||
name_format = name_format.replace('%t', self.name)
|
||||
name_format = name_format.replace('%s', self.info.subtitle)
|
||||
self.filename = name_format
|
||||
self.filename = format_filename(name_format)
|
||||
|
||||
def __repr__(self):
|
||||
return '<Doujinshi: {0}>'.format(self.name)
|
||||
@ -50,9 +50,9 @@ class Doujinshi(object):
|
||||
table = [
|
||||
["Doujinshi", self.name],
|
||||
["Subtitle", self.info.subtitle],
|
||||
["Characters", self.info.character],
|
||||
["Characters", self.info.characters],
|
||||
["Authors", self.info.artists],
|
||||
["Language", self.info.language],
|
||||
["Languages", self.info.languages],
|
||||
["Tags", self.info.tags],
|
||||
["URL", self.url],
|
||||
["Pages", self.pages],
|
||||
|
@ -1,10 +1,15 @@
|
||||
# coding: utf-
|
||||
from __future__ import unicode_literals, print_function
|
||||
|
||||
import multiprocessing
|
||||
import signal
|
||||
|
||||
from future.builtins import str as text
|
||||
import os
|
||||
import requests
|
||||
import threadpool
|
||||
import time
|
||||
import multiprocessing as mp
|
||||
|
||||
try:
|
||||
from urllib.parse import urlparse
|
||||
@ -13,29 +18,25 @@ except ImportError:
|
||||
|
||||
from nhentai.logger import logger
|
||||
from nhentai.parser import request
|
||||
from nhentai.utils import Singleton
|
||||
|
||||
from nhentai.utils import Singleton, signal_handler
|
||||
|
||||
requests.packages.urllib3.disable_warnings()
|
||||
semaphore = mp.Semaphore()
|
||||
|
||||
|
||||
class NhentaiImageNotExistException(Exception):
|
||||
class NHentaiImageNotExistException(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class Downloader(Singleton):
|
||||
|
||||
def __init__(self, path='', thread=1, timeout=30, delay=0):
|
||||
if not isinstance(thread, (int, )) or thread < 1 or thread > 15:
|
||||
raise ValueError('Invalid threads count')
|
||||
def __init__(self, path='', size=5, timeout=30, delay=0):
|
||||
self.size = size
|
||||
self.path = str(path)
|
||||
self.thread_count = thread
|
||||
self.threads = []
|
||||
self.thread_pool = None
|
||||
self.timeout = timeout
|
||||
self.delay = delay
|
||||
|
||||
def _download(self, url, folder='', filename='', retried=0):
|
||||
def download_(self, url, folder='', filename='', retried=0):
|
||||
if self.delay:
|
||||
time.sleep(self.delay)
|
||||
logger.info('Starting to download {0} ...'.format(url))
|
||||
@ -54,9 +55,9 @@ class Downloader(Singleton):
|
||||
try:
|
||||
response = request('get', url, stream=True, timeout=self.timeout)
|
||||
if response.status_code != 200:
|
||||
raise NhentaiImageNotExistException
|
||||
raise NHentaiImageNotExistException
|
||||
|
||||
except NhentaiImageNotExistException as e:
|
||||
except NHentaiImageNotExistException as e:
|
||||
raise e
|
||||
|
||||
except Exception as e:
|
||||
@ -78,27 +79,37 @@ class Downloader(Singleton):
|
||||
except (requests.HTTPError, requests.Timeout) as e:
|
||||
if retried < 3:
|
||||
logger.warning('Warning: {0}, retrying({1}) ...'.format(str(e), retried))
|
||||
return 0, self._download(url=url, folder=folder, filename=filename, retried=retried+1)
|
||||
return 0, self.download_(url=url, folder=folder, filename=filename, retried=retried+1)
|
||||
else:
|
||||
return 0, None
|
||||
|
||||
except NhentaiImageNotExistException as e:
|
||||
except NHentaiImageNotExistException as e:
|
||||
os.remove(os.path.join(folder, base_filename.zfill(3) + extension))
|
||||
return -1, url
|
||||
|
||||
except Exception as e:
|
||||
import traceback
|
||||
traceback.print_stack()
|
||||
logger.critical(str(e))
|
||||
return 0, None
|
||||
|
||||
except KeyboardInterrupt:
|
||||
return -3, None
|
||||
|
||||
return 1, url
|
||||
|
||||
def _download_callback(self, request, result):
|
||||
def _download_callback(self, result):
|
||||
result, data = result
|
||||
if result == 0:
|
||||
logger.warning('fatal errors occurred, ignored')
|
||||
# exit(1)
|
||||
elif result == -1:
|
||||
logger.warning('url {} return status code 404'.format(data))
|
||||
elif result == -2:
|
||||
logger.warning('Ctrl-C pressed, exiting sub processes ...')
|
||||
elif result == -3:
|
||||
# workers wont be run, just pass
|
||||
pass
|
||||
else:
|
||||
logger.log(15, '{0} downloaded successfully'.format(data))
|
||||
|
||||
@ -115,14 +126,34 @@ class Downloader(Singleton):
|
||||
os.makedirs(folder)
|
||||
except EnvironmentError as e:
|
||||
logger.critical('{0}'.format(str(e)))
|
||||
exit(1)
|
||||
|
||||
else:
|
||||
logger.warn('Path \'{0}\' already exist.'.format(folder))
|
||||
|
||||
queue = [([url], {'folder': folder}) for url in queue]
|
||||
queue = [(self, url, folder) for url in queue]
|
||||
|
||||
self.thread_pool = threadpool.ThreadPool(self.thread_count)
|
||||
requests_ = threadpool.makeRequests(self._download, queue, self._download_callback)
|
||||
[self.thread_pool.putRequest(req) for req in requests_]
|
||||
pool = multiprocessing.Pool(self.size, init_worker)
|
||||
|
||||
self.thread_pool.wait()
|
||||
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():
|
||||
return Downloader.download_(obj, url=url, folder=folder)
|
||||
else:
|
||||
return -3, None
|
||||
|
||||
|
||||
def init_worker():
|
||||
signal.signal(signal.SIGINT, subprocess_signal)
|
||||
|
||||
|
||||
def subprocess_signal(signal, frame):
|
||||
if semaphore.acquire(timeout=1):
|
||||
logger.warning('Ctrl-C pressed, exiting sub processes ...')
|
||||
|
||||
raise KeyboardInterrupt
|
||||
|
@ -1,34 +1,18 @@
|
||||
# coding: utf-8
|
||||
from __future__ import unicode_literals, print_function
|
||||
|
||||
import sys
|
||||
import os
|
||||
import re
|
||||
import threadpool
|
||||
import requests
|
||||
import time
|
||||
from bs4 import BeautifulSoup
|
||||
from tabulate import tabulate
|
||||
|
||||
import nhentai.constant as constant
|
||||
from nhentai.utils import request
|
||||
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):
|
||||
global session
|
||||
if not hasattr(session, method):
|
||||
raise AttributeError('\'requests.Session\' object has no attribute \'{0}\''.format(method))
|
||||
|
||||
session.headers.update({'Cookie': constant.COOKIE})
|
||||
return getattr(session, method)(url, proxies=constant.PROXY, verify=False, **kwargs)
|
||||
|
||||
|
||||
def _get_csrf_token(content):
|
||||
html = BeautifulSoup(content, 'html.parser')
|
||||
csrf_token_elem = html.find('input', attrs={'name': 'csrfmiddlewaretoken'})
|
||||
@ -66,7 +50,22 @@ def login(username, password):
|
||||
exit(2)
|
||||
|
||||
|
||||
def favorites_parser():
|
||||
def _get_title_and_id(response):
|
||||
result = []
|
||||
html = BeautifulSoup(response, 'html.parser')
|
||||
doujinshi_search_result = html.find_all('div', attrs={'class': 'gallery'})
|
||||
for doujinshi in doujinshi_search_result:
|
||||
doujinshi_container = doujinshi.find('div', attrs={'class': 'caption'})
|
||||
title = doujinshi_container.text.strip()
|
||||
title = title if len(title) < 85 else title[:82] + '...'
|
||||
id_ = re.search('/g/(\d+)/', doujinshi.a['href']).group(1)
|
||||
result.append({'id': id_, 'title': title})
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def favorites_parser(page_range=''):
|
||||
result = []
|
||||
html = BeautifulSoup(request('get', constant.FAV_URL).content, 'html.parser')
|
||||
count = html.find('span', attrs={'class': 'count'})
|
||||
if not count:
|
||||
@ -89,20 +88,47 @@ def favorites_parser():
|
||||
if os.getenv('DEBUG'):
|
||||
pages = 1
|
||||
|
||||
ret = []
|
||||
doujinshi_id = re.compile('data-id="([\d]+)"')
|
||||
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 range(1, pages + 1):
|
||||
for page in page_range_list:
|
||||
try:
|
||||
logger.info('Getting doujinshi ids of page %d' % page)
|
||||
resp = request('get', constant.FAV_URL + '?page=%d' % page).text
|
||||
ids = doujinshi_id.findall(resp)
|
||||
ret.extend(ids)
|
||||
resp = request('get', constant.FAV_URL + '?page=%d' % page).content
|
||||
|
||||
result.extend(_get_title_and_id(resp))
|
||||
except Exception as e:
|
||||
logger.error('Error: %s, continue', str(e))
|
||||
|
||||
return ret
|
||||
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_):
|
||||
@ -125,8 +151,8 @@ def doujinshi_parser(id_):
|
||||
return doujinshi_parser(str(id_))
|
||||
|
||||
except Exception as e:
|
||||
logger.critical(str(e))
|
||||
raise SystemExit
|
||||
logger.warn('Error: {}, ignored'.format(str(e)))
|
||||
return None
|
||||
|
||||
html = BeautifulSoup(response, 'html.parser')
|
||||
doujinshi_info = html.find('div', attrs={'id': 'info'})
|
||||
@ -138,7 +164,7 @@ def doujinshi_parser(id_):
|
||||
doujinshi['subtitle'] = subtitle.text if subtitle else ''
|
||||
|
||||
doujinshi_cover = html.find('div', attrs={'id': 'cover'})
|
||||
img_id = re.search('/galleries/([\d]+)/cover\.(jpg|png)$', doujinshi_cover.a.img.attrs['data-src'])
|
||||
img_id = re.search('/galleries/([\d]+)/cover\.(jpg|png|gif)$', doujinshi_cover.a.img.attrs['data-src'])
|
||||
|
||||
ext = []
|
||||
for i in html.find_all('div', attrs={'class': 'thumb-container'}):
|
||||
@ -162,7 +188,7 @@ def doujinshi_parser(id_):
|
||||
|
||||
# gain information of the doujinshi
|
||||
information_fields = doujinshi_info.find_all('div', attrs={'class': 'field-name'})
|
||||
needed_fields = ['Characters', 'Artists', 'Language', 'Tags']
|
||||
needed_fields = ['Characters', 'Artists', 'Languages', 'Tags', 'Parodies', 'Groups', 'Categories']
|
||||
for field in information_fields:
|
||||
field_name = field.contents[0].strip().strip(':')
|
||||
if field_name in needed_fields:
|
||||
@ -170,33 +196,122 @@ def doujinshi_parser(id_):
|
||||
field.find_all('a', attrs={'class': 'tag'})]
|
||||
doujinshi[field_name.lower()] = ', '.join(data)
|
||||
|
||||
time_field = doujinshi_info.find('time')
|
||||
if time_field.has_attr('datetime'):
|
||||
doujinshi['date'] = time_field['datetime']
|
||||
return doujinshi
|
||||
|
||||
|
||||
def search_parser(keyword, page):
|
||||
def search_parser(keyword, sorting='date', page=1):
|
||||
logger.debug('Searching doujinshis of keyword {0}'.format(keyword))
|
||||
result = []
|
||||
try:
|
||||
response = request('get', url=constant.SEARCH_URL, params={'q': keyword, 'page': page}).content
|
||||
except requests.ConnectionError as e:
|
||||
logger.critical(e)
|
||||
logger.warn('If you are in China, please configure the proxy to fu*k GFW.')
|
||||
raise SystemExit
|
||||
response = request('get', url=constant.SEARCH_URL, params={'q': keyword, 'page': page, 'sort': sorting}).content
|
||||
|
||||
html = BeautifulSoup(response, 'html.parser')
|
||||
doujinshi_search_result = html.find_all('div', attrs={'class': 'gallery'})
|
||||
for doujinshi in doujinshi_search_result:
|
||||
doujinshi_container = doujinshi.find('div', attrs={'class': 'caption'})
|
||||
title = doujinshi_container.text.strip()
|
||||
title = title if len(title) < 85 else title[:82] + '...'
|
||||
id_ = re.search('/g/(\d+)/', doujinshi.a['href']).group(1)
|
||||
result.append({'id': id_, 'title': title})
|
||||
result = _get_title_and_id(response)
|
||||
if not result:
|
||||
logger.warn('Not found anything of keyword {}'.format(keyword))
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def print_doujinshi(doujinshi_list):
|
||||
if not doujinshi_list:
|
||||
return
|
||||
doujinshi_list = [(i['id'], i['title']) for i in doujinshi_list]
|
||||
headers = ['id', 'doujinshi']
|
||||
logger.info('Search Result\n' +
|
||||
tabulate(tabular_data=doujinshi_list, headers=headers, tablefmt='rst'))
|
||||
|
||||
|
||||
def tag_parser(tag_name, sorting='date', max_page=1, index=0):
|
||||
result = []
|
||||
tag_name = tag_name.lower()
|
||||
if ',' in tag_name:
|
||||
tag_name = [i.strip().replace(' ', '-') for i in tag_name.split(',')]
|
||||
else:
|
||||
tag_name = tag_name.strip().replace(' ', '-')
|
||||
if sorting == 'date':
|
||||
sorting = ''
|
||||
|
||||
for p in range(1, max_page + 1):
|
||||
if sys.version_info >= (3, 0, 0):
|
||||
unicode_ = str
|
||||
else:
|
||||
unicode_ = unicode
|
||||
|
||||
if isinstance(tag_name, (str, unicode_)):
|
||||
logger.debug('Fetching page {0} for doujinshi with tag \'{1}\''.format(p, tag_name))
|
||||
response = request('get', url='%s/%s/%s?page=%d' % (constant.TAG_URL[index], tag_name, sorting, p)).content
|
||||
result += _get_title_and_id(response)
|
||||
else:
|
||||
for i in tag_name:
|
||||
logger.debug('Fetching page {0} for doujinshi with tag \'{1}\''.format(p, i))
|
||||
response = request('get',
|
||||
url='%s/%s/%s?page=%d' % (constant.TAG_URL[index], i, sorting, p)).content
|
||||
result += _get_title_and_id(response)
|
||||
|
||||
if not result:
|
||||
logger.error('Cannot find doujinshi id of tag \'{0}\''.format(tag_name))
|
||||
return
|
||||
|
||||
if not result:
|
||||
logger.warn('No results for tag \'{}\''.format(tag_name))
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def __api_suspended_search_parser(keyword, sorting, page):
|
||||
logger.debug('Searching doujinshis using keywords {0}'.format(keyword))
|
||||
result = []
|
||||
i = 0
|
||||
while i < 5:
|
||||
try:
|
||||
response = request('get', url=constant.SEARCH_URL, params={'query': keyword, 'page': page, 'sort': sorting}).json()
|
||||
except Exception as e:
|
||||
i += 1
|
||||
if not i < 5:
|
||||
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:
|
||||
raise Exception('No result in response')
|
||||
|
||||
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('No results for keywords {}'.format(keyword))
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def __api_suspended_tag_parser(tag_id, sorting, max_page=1):
|
||||
logger.info('Searching for doujinshi with tag id {0}'.format(tag_id))
|
||||
result = []
|
||||
response = request('get', url=constant.TAG_API_URL, params={'sort': sorting, 'tag_id': tag_id}).json()
|
||||
page = max_page if max_page <= response['num_pages'] else int(response['num_pages'])
|
||||
|
||||
for i in range(1, page + 1):
|
||||
logger.info('Getting page {} ...'.format(i))
|
||||
|
||||
if page != 1:
|
||||
response = request('get', url=constant.TAG_API_URL,
|
||||
params={'sort': sorting, '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('No results for tag id {}'.format(tag_id))
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def __api_suspended_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_))
|
||||
@ -221,11 +336,11 @@ def __api_suspended_doujinshi_parser(id_):
|
||||
doujinshi['name'] = response['title']['english']
|
||||
doujinshi['subtitle'] = response['title']['japanese']
|
||||
doujinshi['img_id'] = response['media_id']
|
||||
doujinshi['ext'] = ''.join(map(lambda s: s['t'], response['images']['pages']))
|
||||
doujinshi['ext'] = ''.join([i['t'] for i in response['images']['pages']])
|
||||
doujinshi['pages'] = len(response['images']['pages'])
|
||||
|
||||
# gain information of the doujinshi
|
||||
needed_fields = ['character', 'artist', 'language', 'tag']
|
||||
needed_fields = ['character', 'artist', 'language', 'tag', 'parody', 'group', 'category']
|
||||
for tag in response['tags']:
|
||||
tag_type = tag['type']
|
||||
if tag_type in needed_fields:
|
||||
@ -244,94 +359,5 @@ def __api_suspended_doujinshi_parser(id_):
|
||||
return doujinshi
|
||||
|
||||
|
||||
def __api_suspended_search_parser(keyword, page):
|
||||
logger.debug('Searching doujinshis using keywords {0}'.format(keyword))
|
||||
result = []
|
||||
i = 0
|
||||
while i < 5:
|
||||
try:
|
||||
response = request('get', url=constant.SEARCH_URL, params={'query': keyword, 'page': page}).json()
|
||||
except Exception as e:
|
||||
i += 1
|
||||
if not i < 5:
|
||||
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:
|
||||
raise Exception('No result in response')
|
||||
|
||||
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('No results for keywords {}'.format(keyword))
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def print_doujinshi(doujinshi_list):
|
||||
if not doujinshi_list:
|
||||
return
|
||||
doujinshi_list = [(i['id'], i['title']) for i in doujinshi_list]
|
||||
headers = ['id', 'doujinshi']
|
||||
logger.info('Search Result\n' +
|
||||
tabulate(tabular_data=doujinshi_list, headers=headers, tablefmt='rst'))
|
||||
|
||||
|
||||
def __api_suspended_tag_parser(tag_id, max_page=1):
|
||||
logger.info('Searching for doujinshi with tag id {0}'.format(tag_id))
|
||||
result = []
|
||||
response = request('get', url=constant.TAG_API_URL, params={'sort': 'popular', 'tag_id': tag_id}).json()
|
||||
page = max_page if max_page <= response['num_pages'] else int(response['num_pages'])
|
||||
|
||||
for i in range(1, page + 1):
|
||||
logger.info('Getting page {} ...'.format(i))
|
||||
|
||||
if page != 1:
|
||||
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('No results for tag id {}'.format(tag_id))
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def tag_parser(tag_name, max_page=1):
|
||||
result = []
|
||||
tag_name = tag_name.lower()
|
||||
tag_name = tag_name.replace(' ', '-')
|
||||
|
||||
for p in range(1, max_page + 1):
|
||||
logger.debug('Fetching page {0} for doujinshi with tag \'{1}\''.format(p, tag_name))
|
||||
response = request('get', url='%s/%s?page=%d' % (constant.TAG_URL, tag_name, p)).content
|
||||
|
||||
html = BeautifulSoup(response, 'html.parser')
|
||||
doujinshi_items = html.find_all('div', attrs={'class': 'gallery'})
|
||||
if not doujinshi_items:
|
||||
logger.error('Cannot find doujinshi id of tag \'{0}\''.format(tag_name))
|
||||
return
|
||||
|
||||
for i in doujinshi_items:
|
||||
doujinshi_id = i.a.attrs['href'].strip('/g')
|
||||
doujinshi_title = i.a.text.strip()
|
||||
doujinshi_title = doujinshi_title if len(doujinshi_title) < 85 else doujinshi_title[:82] + '...'
|
||||
result.append({'title': doujinshi_title, 'id': doujinshi_id})
|
||||
|
||||
if not result:
|
||||
logger.warn('No results for tag \'{}\''.format(tag_name))
|
||||
|
||||
return result
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
print(doujinshi_parser("32271"))
|
||||
|
80
nhentai/serializer.py
Normal file
80
nhentai/serializer.py
Normal file
@ -0,0 +1,80 @@
|
||||
# coding: utf-8
|
||||
import json
|
||||
import os
|
||||
|
||||
|
||||
def serialize(doujinshi, dir):
|
||||
metadata = {'title': doujinshi.name,
|
||||
'subtitle': doujinshi.info.subtitle}
|
||||
if doujinshi.info.date:
|
||||
metadata['upload_date'] = doujinshi.info.date
|
||||
if doujinshi.info.parodies:
|
||||
metadata['parody'] = [i.strip() for i in doujinshi.info.parodies.split(',')]
|
||||
if doujinshi.info.characters:
|
||||
metadata['character'] = [i.strip() for i in doujinshi.info.characters.split(',')]
|
||||
if doujinshi.info.tags:
|
||||
metadata['tag'] = [i.strip() for i in doujinshi.info.tags.split(',')]
|
||||
if doujinshi.info.artists:
|
||||
metadata['artist'] = [i.strip() for i in doujinshi.info.artists.split(',')]
|
||||
if doujinshi.info.groups:
|
||||
metadata['group'] = [i.strip() for i in doujinshi.info.groups.split(',')]
|
||||
if doujinshi.info.languages:
|
||||
metadata['language'] = [i.strip() for i in doujinshi.info.languages.split(',')]
|
||||
metadata['category'] = doujinshi.info.categories
|
||||
metadata['URL'] = doujinshi.url
|
||||
metadata['Pages'] = doujinshi.pages
|
||||
|
||||
with open(os.path.join(dir, 'metadata.json'), 'w') as f:
|
||||
json.dump(metadata, f, separators=','':')
|
||||
|
||||
|
||||
def merge_json():
|
||||
lst = []
|
||||
output_dir = "./"
|
||||
os.chdir(output_dir)
|
||||
doujinshi_dirs = next(os.walk('.'))[1]
|
||||
for folder in doujinshi_dirs:
|
||||
files = os.listdir(folder)
|
||||
if 'metadata.json' not in files:
|
||||
continue
|
||||
data_folder = output_dir + folder + '/' + 'metadata.json'
|
||||
json_file = open(data_folder, 'r')
|
||||
json_dict = json.load(json_file)
|
||||
json_dict['Folder'] = folder
|
||||
lst.append(json_dict)
|
||||
return lst
|
||||
|
||||
|
||||
def serialize_unique(lst):
|
||||
dictionary = {}
|
||||
parody = []
|
||||
character = []
|
||||
tag = []
|
||||
artist = []
|
||||
group = []
|
||||
for dic in lst:
|
||||
if 'parody' in dic:
|
||||
parody.extend([i for i in dic['parody']])
|
||||
if 'character' in dic:
|
||||
character.extend([i for i in dic['character']])
|
||||
if 'tag' in dic:
|
||||
tag.extend([i for i in dic['tag']])
|
||||
if 'artist' in dic:
|
||||
artist.extend([i for i in dic['artist']])
|
||||
if 'group' in dic:
|
||||
group.extend([i for i in dic['group']])
|
||||
dictionary['parody'] = list(set(parody))
|
||||
dictionary['character'] = list(set(character))
|
||||
dictionary['tag'] = list(set(tag))
|
||||
dictionary['artist'] = list(set(artist))
|
||||
dictionary['group'] = list(set(group))
|
||||
return dictionary
|
||||
|
||||
|
||||
def set_js_database():
|
||||
with open('data.js', 'w') as f:
|
||||
indexed_json = merge_json()
|
||||
unique_json = json.dumps(serialize_unique(indexed_json), separators=','':')
|
||||
indexed_json = json.dumps(indexed_json, separators=','':')
|
||||
f.write('var data = ' + indexed_json)
|
||||
f.write(';\nvar tags = ' + unique_json)
|
133
nhentai/utils.py
133
nhentai/utils.py
@ -2,11 +2,36 @@
|
||||
from __future__ import unicode_literals, print_function
|
||||
|
||||
import sys
|
||||
import re
|
||||
import os
|
||||
import string
|
||||
import zipfile
|
||||
import shutil
|
||||
import requests
|
||||
import sqlite3
|
||||
|
||||
from nhentai import constant
|
||||
from nhentai.logger import logger
|
||||
from nhentai.serializer import serialize, set_js_database
|
||||
|
||||
|
||||
def request(method, url, **kwargs):
|
||||
session = requests.Session()
|
||||
session.headers.update({
|
||||
'Referer': constant.LOGIN_URL,
|
||||
'User-Agent': 'nhentai command line client (https://github.com/RicterZ/nhentai)',
|
||||
'Cookie': constant.COOKIE
|
||||
})
|
||||
return getattr(session, method)(url, proxies=constant.PROXY, verify=False, **kwargs)
|
||||
|
||||
|
||||
def check_cookie():
|
||||
response = request('get', constant.BASE_URL).text
|
||||
username = re.findall('"/users/\d+/(.*?)"', response)
|
||||
if not username:
|
||||
logger.error('Cannot get your username, please check your cookie or use `nhentai --cookie` to set your cookie')
|
||||
else:
|
||||
logger.info('Login successfully! Your username: {}'.format(username[0]))
|
||||
|
||||
|
||||
class _Singleton(type):
|
||||
@ -56,19 +81,19 @@ def generate_html(output_dir='.', doujinshi_obj=None):
|
||||
|
||||
image_html += '<img src="{0}" class="image-item"/>\n'\
|
||||
.format(image)
|
||||
|
||||
html = readfile('viewer/index.html')
|
||||
css = readfile('viewer/styles.css')
|
||||
js = readfile('viewer/scripts.js')
|
||||
|
||||
if doujinshi_obj is not None:
|
||||
title = doujinshi_obj.name
|
||||
serialize(doujinshi_obj, doujinshi_dir)
|
||||
name = doujinshi_obj.name
|
||||
if sys.version_info < (3, 0):
|
||||
title = title.encode('utf-8')
|
||||
name = doujinshi_obj.name.encode('utf-8')
|
||||
else:
|
||||
title = 'nHentai HTML Viewer'
|
||||
name = {'title': 'nHentai HTML Viewer'}
|
||||
|
||||
data = html.format(TITLE=title, IMAGES=image_html, SCRIPTS=js, STYLES=css)
|
||||
data = html.format(TITLE=name, IMAGES=image_html, SCRIPTS=js, STYLES=css)
|
||||
try:
|
||||
if sys.version_info < (3, 0):
|
||||
with open(os.path.join(doujinshi_dir, 'index.html'), 'w') as f:
|
||||
@ -82,10 +107,71 @@ def generate_html(output_dir='.', doujinshi_obj=None):
|
||||
logger.warning('Writen HTML Viewer failed ({})'.format(str(e)))
|
||||
|
||||
|
||||
def generate_main_html(output_dir='./'):
|
||||
"""
|
||||
Generate a main html to show all the contain doujinshi.
|
||||
With a link to their `index.html`.
|
||||
Default output folder will be the CLI path.
|
||||
"""
|
||||
|
||||
image_html = ''
|
||||
|
||||
main = readfile('viewer/main.html')
|
||||
css = readfile('viewer/main.css')
|
||||
js = readfile('viewer/main.js')
|
||||
|
||||
element = '\n\
|
||||
<div class="gallery-favorite">\n\
|
||||
<div class="gallery">\n\
|
||||
<a href="./{FOLDER}/index.html" class="cover" style="padding:0 0 141.6% 0"><img\n\
|
||||
src="./{FOLDER}/{IMAGE}" />\n\
|
||||
<div class="caption">{TITLE}</div>\n\
|
||||
</a>\n\
|
||||
</div>\n\
|
||||
</div>\n'
|
||||
|
||||
os.chdir(output_dir)
|
||||
doujinshi_dirs = next(os.walk('.'))[1]
|
||||
|
||||
for folder in doujinshi_dirs:
|
||||
files = os.listdir(folder)
|
||||
files.sort()
|
||||
|
||||
if 'index.html' in files:
|
||||
logger.info('Add doujinshi \'{}\''.format(folder))
|
||||
else:
|
||||
continue
|
||||
|
||||
image = files[0] # 001.jpg or 001.png
|
||||
if folder is not None:
|
||||
title = folder.replace('_', ' ')
|
||||
else:
|
||||
title = 'nHentai HTML Viewer'
|
||||
|
||||
image_html += element.format(FOLDER=folder, IMAGE=image, TITLE=title)
|
||||
if image_html == '':
|
||||
logger.warning('None index.html found, --gen-main paused.')
|
||||
return
|
||||
try:
|
||||
data = main.format(STYLES=css, SCRIPTS=js, PICTURE=image_html)
|
||||
if sys.version_info < (3, 0):
|
||||
with open('./main.html', 'w') as f:
|
||||
f.write(data)
|
||||
else:
|
||||
with open('./main.html', 'wb') as f:
|
||||
f.write(data.encode('utf-8'))
|
||||
shutil.copy(os.path.dirname(__file__)+'/viewer/logo.png', './')
|
||||
set_js_database()
|
||||
logger.log(
|
||||
15, 'Main Viewer has been write to \'{0}main.html\''.format(output_dir))
|
||||
except Exception as e:
|
||||
logger.warning('Writen Main Viewer failed ({})'.format(str(e)))
|
||||
|
||||
|
||||
def generate_cbz(output_dir='.', doujinshi_obj=None, rm_origin_dir=False):
|
||||
if doujinshi_obj is not None:
|
||||
doujinshi_dir = os.path.join(output_dir, doujinshi_obj.filename)
|
||||
cbz_filename = os.path.join(os.path.join(doujinshi_dir, '..'), '%s.cbz' % doujinshi_obj.id)
|
||||
cbz_filename = os.path.join(os.path.join(doujinshi_dir, '..'), '{}.cbz'.format(doujinshi_obj.filename))
|
||||
else:
|
||||
cbz_filename = './doujinshi.cbz'
|
||||
doujinshi_dir = '.'
|
||||
@ -118,10 +204,41 @@ an invalid filename.
|
||||
"""
|
||||
valid_chars = "-_.()[] %s%s" % (string.ascii_letters, string.digits)
|
||||
filename = ''.join(c for c in s if c in valid_chars)
|
||||
filename = filename.replace(' ', '_') # I don't like spaces in filenames.
|
||||
if len(filename) > 100:
|
||||
filename = filename[:100] + '...]'
|
||||
|
||||
# Remove [] from filename
|
||||
filename = filename.replace('[]', '')
|
||||
filename = filename.replace('[]', '').strip()
|
||||
return filename
|
||||
|
||||
|
||||
def signal_handler(signal, frame):
|
||||
logger.error('Ctrl-C signal received. Stopping...')
|
||||
exit(1)
|
||||
|
||||
|
||||
class DB(object):
|
||||
conn = None
|
||||
cur = None
|
||||
|
||||
def __enter__(self):
|
||||
self.conn = sqlite3.connect(constant.NHENTAI_HISTORY)
|
||||
self.cur = self.conn.cursor()
|
||||
self.cur.execute('CREATE TABLE IF NOT EXISTS download_history (id text)')
|
||||
self.conn.commit()
|
||||
return self
|
||||
|
||||
def __exit__(self, exc_type, exc_val, exc_tb):
|
||||
self.conn.close()
|
||||
|
||||
def clean_all(self):
|
||||
self.cur.execute('DELETE FROM download_history WHERE 1')
|
||||
self.conn.commit()
|
||||
|
||||
def add_one(self, data):
|
||||
self.cur.execute('INSERT INTO download_history VALUES (?)', [data])
|
||||
self.conn.commit()
|
||||
|
||||
def get_all(self):
|
||||
data = self.cur.execute('SELECT id FROM download_history')
|
||||
return [i[0] for i in data]
|
||||
|
@ -2,6 +2,7 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes, viewport-fit=cover" />
|
||||
<title>{TITLE}</title>
|
||||
<style>
|
||||
{STYLES}
|
||||
|
BIN
nhentai/viewer/logo.png
Normal file
BIN
nhentai/viewer/logo.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 10 KiB |
332
nhentai/viewer/main.css
Normal file
332
nhentai/viewer/main.css
Normal file
@ -0,0 +1,332 @@
|
||||
/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
|
||||
/* Original from https://static.nhentai.net/css/main_style.9bb9b703e601.css */
|
||||
a {
|
||||
background-color: transparent;
|
||||
-webkit-text-decoration-skip: objects
|
||||
}
|
||||
|
||||
img {
|
||||
border-style: none
|
||||
}
|
||||
|
||||
html {
|
||||
box-sizing: border-box
|
||||
}
|
||||
|
||||
*,:after,:before {
|
||||
box-sizing: inherit
|
||||
}
|
||||
|
||||
body,html {
|
||||
font-family: 'Noto Sans',sans-serif;
|
||||
font-size: 14px;
|
||||
line-height: 1.42857143;
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
text-align: center;
|
||||
color: #34495e;
|
||||
background-color: #fff;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale
|
||||
}
|
||||
|
||||
a {
|
||||
text-decoration: none;
|
||||
color: #34495e
|
||||
}
|
||||
|
||||
blockquote {
|
||||
border: 0
|
||||
}
|
||||
|
||||
.container {
|
||||
display: block;
|
||||
clear: both;
|
||||
margin-left: 15rem;
|
||||
margin-right: 0.5rem;
|
||||
margin-bottom: 5px;
|
||||
margin-top: 5px;
|
||||
padding: 4px;
|
||||
border-radius: 9px;
|
||||
background-color: #ecf0f1;
|
||||
width: 100% - 15rem;
|
||||
max-width: 1500px
|
||||
}
|
||||
|
||||
.gallery,.gallery-favorite,.thumb-container {
|
||||
display: inline-block;
|
||||
vertical-align: top
|
||||
}
|
||||
|
||||
.gallery img,.gallery-favorite img,.thumb-container img {
|
||||
display: block;
|
||||
max-width: 100%;
|
||||
height: auto
|
||||
}
|
||||
|
||||
@media screen and (min-width: 980px) {
|
||||
.gallery,.gallery-favorite,.thumb-container {
|
||||
width:19%;
|
||||
margin: 3px;
|
||||
}
|
||||
}
|
||||
|
||||
@media screen and (max-width: 979px) {
|
||||
.gallery,.gallery-favorite,.thumb-container {
|
||||
width:24%;
|
||||
margin: 2px
|
||||
}
|
||||
}
|
||||
|
||||
@media screen and (max-width: 772px) {
|
||||
.gallery,.gallery-favorite,.thumb-container {
|
||||
width:32%;
|
||||
margin: 1.5px
|
||||
}
|
||||
}
|
||||
|
||||
@media screen and (max-width: 500px) {
|
||||
.gallery,.gallery-favorite,.thumb-container {
|
||||
width:49%;
|
||||
margin: .5px
|
||||
}
|
||||
}
|
||||
|
||||
.gallery a,.gallery-favorite a {
|
||||
display: block
|
||||
}
|
||||
|
||||
.gallery a img,.gallery-favorite a img {
|
||||
position: absolute
|
||||
}
|
||||
|
||||
.caption {
|
||||
line-height: 15px;
|
||||
left: 0;
|
||||
right: 0;
|
||||
top: 100%;
|
||||
position: absolute;
|
||||
z-index: 10;
|
||||
overflow: hidden;
|
||||
width: 100%;
|
||||
max-height: 34px;
|
||||
padding: 3px;
|
||||
background-color: #fff;
|
||||
font-weight: 700;
|
||||
display: block;
|
||||
text-align: center;
|
||||
text-decoration: none;
|
||||
color: #34495e
|
||||
}
|
||||
|
||||
.gallery {
|
||||
position: relative;
|
||||
margin-bottom: 3em
|
||||
}
|
||||
|
||||
.gallery:hover .caption {
|
||||
max-height: 100%;
|
||||
box-shadow: 0 10px 20px rgba(100,100,100,.5)
|
||||
}
|
||||
|
||||
.gallery-favorite .gallery {
|
||||
width: 100%
|
||||
}
|
||||
|
||||
.sidenav {
|
||||
height: 100%;
|
||||
width: 15rem;
|
||||
position: fixed;
|
||||
z-index: 1;
|
||||
top: 0;
|
||||
left: 0;
|
||||
background-color: #0d0d0d;
|
||||
overflow: hidden;
|
||||
|
||||
padding-top: 20px;
|
||||
-webkit-touch-callout: none; /* iOS Safari */
|
||||
-webkit-user-select: none; /* Safari */
|
||||
-khtml-user-select: none; /* Konqueror HTML */
|
||||
-moz-user-select: none; /* Old versions of Firefox */
|
||||
ms-user-select: none; /* Internet Explorer/Edge */
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.sidenav a {
|
||||
background-color: #eee;
|
||||
padding: 5px 0px 5px 15px;
|
||||
text-decoration: none;
|
||||
font-size: 15px;
|
||||
color: #0d0d0d9;
|
||||
display: block;
|
||||
text-align: left;
|
||||
}
|
||||
.sidenav img {
|
||||
width:100%;
|
||||
padding: 0px 5px 0px 5px;
|
||||
|
||||
}
|
||||
|
||||
.sidenav h1 {
|
||||
font-size: 1.5em;
|
||||
margin: 0px 0px 10px;
|
||||
}
|
||||
|
||||
.sidenav a:hover {
|
||||
color: white;
|
||||
background-color: #EC2754;
|
||||
}
|
||||
|
||||
.accordion {
|
||||
font-weight: bold;
|
||||
background-color: #eee;
|
||||
color: #444;
|
||||
padding: 10px 0px 5px 8px;
|
||||
width: 100%;
|
||||
border: none;
|
||||
text-align: left;
|
||||
outline: none;
|
||||
font-size: 15px;
|
||||
transition: 0.4s;
|
||||
cursor:pointer;
|
||||
}
|
||||
|
||||
.accordion:hover {
|
||||
background-color: #ddd;
|
||||
}
|
||||
|
||||
.accordion.active{
|
||||
background-color:#ddd;
|
||||
}
|
||||
|
||||
.nav-btn {
|
||||
font-weight: bold;
|
||||
background-color: #eee;
|
||||
color: #444;
|
||||
padding: 8px 8px 5px 9px;
|
||||
width: 100%;
|
||||
border: none;
|
||||
text-align: left;
|
||||
outline: none;
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
.hidden {
|
||||
display:none;
|
||||
}
|
||||
|
||||
.nav-btn a{
|
||||
font-weight: normal;
|
||||
padding-right: 10px;
|
||||
border-radius: 15px;
|
||||
cursor: crosshair
|
||||
}
|
||||
|
||||
.options {
|
||||
display:block;
|
||||
padding: 0px 0px 0px 0px;
|
||||
background-color: #eee;
|
||||
max-height: 0;
|
||||
overflow: hidden;
|
||||
transition: max-height 0.2s ease-out;
|
||||
cursor:pointer;
|
||||
}
|
||||
|
||||
.search{
|
||||
background-color: #eee;
|
||||
padding-right:40px;
|
||||
white-space: nowrap;
|
||||
padding-top: 5px;
|
||||
height:43px;
|
||||
|
||||
}
|
||||
|
||||
.search input{
|
||||
border-top-right-radius:10px;
|
||||
padding-top:0;
|
||||
padding-bottom:0;
|
||||
font-size:1em;
|
||||
width:100%;
|
||||
height:38px;
|
||||
vertical-align:top;
|
||||
}
|
||||
|
||||
.btn{
|
||||
border-top-left-radius:10px;
|
||||
color:#fff;
|
||||
font-size:100%;
|
||||
padding: 8px;
|
||||
width:38px;
|
||||
background-color:#ed2553;
|
||||
}
|
||||
|
||||
#tags{
|
||||
text-align:left;
|
||||
display: flex;
|
||||
width:15rem;
|
||||
justify-content: start;
|
||||
margin: 2px 2px 2px 0px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.btn-2{
|
||||
font-weight:700;
|
||||
padding-right:0.5rem;
|
||||
padding-left:0.5rem;
|
||||
color:#fff;
|
||||
border:0;
|
||||
font-size:100%;
|
||||
height:1.25rem;
|
||||
outline: 0;
|
||||
border-radius: 0.3rem;
|
||||
cursor: pointer;
|
||||
margin:0.15rem;
|
||||
transition: all 1s linear;
|
||||
}
|
||||
|
||||
.btn-2#parody{
|
||||
background-color: red;
|
||||
}
|
||||
|
||||
.btn-2#character{
|
||||
background-color: blue;
|
||||
}
|
||||
|
||||
.btn-2#tag{
|
||||
background-color: green;
|
||||
}
|
||||
|
||||
.btn-2#artist{
|
||||
background-color: fuchsia;
|
||||
}
|
||||
|
||||
.btn-2#group{
|
||||
background-color: teal;
|
||||
}
|
||||
|
||||
.btn-2.hover{
|
||||
filter: saturate(20%)
|
||||
}
|
||||
|
||||
input,input:focus{
|
||||
border:none;
|
||||
outline:0;
|
||||
}
|
||||
|
||||
html.theme-black,html.theme-black body {
|
||||
color: #d9d9d9;
|
||||
background-color: #0d0d0d
|
||||
}
|
||||
|
||||
html.theme-black #thumbnail-container,html.theme-black .container {
|
||||
background-color: #1f1f1f
|
||||
}
|
||||
|
||||
html.theme-black .gallery:hover .caption {
|
||||
box-shadow: 0 10px 20px rgba(0,0,0,.5)
|
||||
}
|
||||
|
||||
html.theme-black .caption {
|
||||
background-color: #404040;
|
||||
color: #d9d9d9
|
||||
}
|
51
nhentai/viewer/main.html
Normal file
51
nhentai/viewer/main.html
Normal file
@ -0,0 +1,51 @@
|
||||
<!doctype html>
|
||||
<html lang="en" class=" theme-black">
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="theme-color" content="#1f1f1f" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes, viewport-fit=cover" />
|
||||
<title>nHentai Viewer</title>
|
||||
<script type="text/javascript" src="data.js"></script>
|
||||
<!-- <link rel="stylesheet" href="./main.css"> -->
|
||||
<style>
|
||||
{STYLES}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div id="content">
|
||||
<nav class="sidenav">
|
||||
<img src="logo.png">
|
||||
<h1>nHentai Viewer</h1>
|
||||
<button class="accordion">Language</button>
|
||||
<div class="options" id="language">
|
||||
<a>English</a>
|
||||
<a>Japanese</a>
|
||||
<a>Chinese</a>
|
||||
</div>
|
||||
<button class="accordion">Category</button>
|
||||
<div class="options" id ="category">
|
||||
<a>Doujinshi</a>
|
||||
<a>Manga</a>
|
||||
</div>
|
||||
<button class="nav-btn hidden">Filters</button>
|
||||
<div class="search">
|
||||
<input autocomplete="off" type="search" id="tagfilter" name="q" value="" autocapitalize="none" required="">
|
||||
<svg class="btn" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="white" d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"/></svg>
|
||||
<div id="tags">
|
||||
</div>
|
||||
</nav>
|
||||
<div class="container" id="favcontainer">
|
||||
|
||||
{PICTURE}
|
||||
|
||||
</div> <!-- container -->
|
||||
|
||||
</div>
|
||||
<script>
|
||||
{SCRIPTS}
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
177
nhentai/viewer/main.js
Normal file
177
nhentai/viewer/main.js
Normal file
@ -0,0 +1,177 @@
|
||||
//------------------------------------navbar script------------------------------------
|
||||
var menu = document.getElementsByClassName("accordion");
|
||||
for (var i = 0; i < menu.length; i++) {
|
||||
menu[i].addEventListener("click", function() {
|
||||
var panel = this.nextElementSibling;
|
||||
if (panel.style.maxHeight) {
|
||||
this.classList.toggle("active");
|
||||
panel.style.maxHeight = null;
|
||||
} else {
|
||||
panel.style.maxHeight = panel.scrollHeight + "px";
|
||||
this.classList.toggle("active");
|
||||
}
|
||||
});
|
||||
}
|
||||
var language = document.getElementById("language").children;
|
||||
for (var i = 0; i < language.length; i++){
|
||||
language[i].addEventListener("click", function() {
|
||||
toggler = document.getElementById("language")
|
||||
toggler.style.maxHeight = null;
|
||||
document.getElementsByClassName("accordion")[0].classList.toggle("active");
|
||||
filter_maker(this.innerText, "language");
|
||||
});
|
||||
}
|
||||
var category = document.getElementById("category").children;
|
||||
for (var i = 0; i < category.length; i++){
|
||||
category[i].addEventListener("click", function() {
|
||||
document.getElementById("category").style.maxHeight = null;
|
||||
document.getElementsByClassName("accordion")[1].classList.toggle("active");
|
||||
filter_maker(this.innerText, "category");
|
||||
});
|
||||
}
|
||||
//-----------------------------------------------------------------------------------
|
||||
//----------------------------------Tags Script--------------------------------------
|
||||
tag_maker(tags);
|
||||
|
||||
var tag = document.getElementsByClassName("btn-2");
|
||||
for (var i = 0; i < tag.length; i++){
|
||||
tag[i].addEventListener("click", function() {
|
||||
filter_maker(this.innerText, this.id);
|
||||
});
|
||||
}
|
||||
|
||||
var input = document.getElementById("tagfilter");
|
||||
input.addEventListener("input", function() {
|
||||
var tags = document.querySelectorAll(".btn-2");
|
||||
if (this.value.length > 0) {
|
||||
for (var i = 0; i < tags.length; i++) {
|
||||
var tag = tags[i];
|
||||
var nome = tag.innerText;
|
||||
var exp = new RegExp(this.value, "i");;
|
||||
if (exp.test(nome)) {
|
||||
tag.classList.remove("hidden");
|
||||
}
|
||||
else {
|
||||
tag.classList.add("hidden");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (var i = 0; i < tags.length; i++) {
|
||||
var tag = tags[i];
|
||||
tag.classList.add('hidden');
|
||||
}
|
||||
}
|
||||
});
|
||||
input.addEventListener('keypress', function (e) {
|
||||
enter_search(e, this.value);
|
||||
});
|
||||
//-----------------------------------------------------------------------------------
|
||||
//------------------------------------Functions--------------------------------------
|
||||
function enter_search(e, input){
|
||||
var count = 0;
|
||||
var key = e.which || e.keyCode;
|
||||
if (key === 13 && input.length > 0) {
|
||||
var all_tags = document.getElementById("tags").children;
|
||||
for(i = 0; i < all_tags.length; i++){
|
||||
if (!all_tags[i].classList.contains("hidden")){
|
||||
count++;
|
||||
var tag_name = all_tags[i].innerText;
|
||||
var tag_id = all_tags[i].id;
|
||||
if (count>1){break}
|
||||
}
|
||||
}
|
||||
if (count == 1){
|
||||
filter_maker(tag_name, tag_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
function filter_maker(text, class_value){
|
||||
var check = filter_checker(text);
|
||||
var nav_btn = document.getElementsByClassName("nav-btn")[0];
|
||||
if (nav_btn.classList.contains("hidden")){
|
||||
nav_btn.classList.toggle("hidden");
|
||||
}
|
||||
if (check == true){
|
||||
var node = document.createElement("a");
|
||||
var textnode = document.createTextNode(text);
|
||||
node.appendChild(textnode);
|
||||
node.classList.add(class_value);
|
||||
nav_btn.appendChild(node);
|
||||
filter_searcher();
|
||||
}
|
||||
}
|
||||
|
||||
function filter_searcher(){
|
||||
var verifier = null;
|
||||
var tags_filter = [];
|
||||
var doujinshi_id = [];
|
||||
var filter_tag = document.getElementsByClassName("nav-btn")[0].children;
|
||||
filter_tag[filter_tag.length-1].addEventListener("click", function() {
|
||||
this.remove();
|
||||
try{
|
||||
filter_searcher();
|
||||
}
|
||||
catch{
|
||||
var gallery = document.getElementsByClassName("gallery-favorite");
|
||||
for (var i = 0; i < gallery.length; i++){
|
||||
gallery[i].classList.remove("hidden");
|
||||
}
|
||||
}
|
||||
});
|
||||
for (var i=0; i < filter_tag.length; i++){
|
||||
var fclass = filter_tag[i].className;
|
||||
var fname = filter_tag[i].innerText.toLowerCase();
|
||||
tags_filter.push([fclass, fname])
|
||||
}
|
||||
for (var i=0; i < data.length; i++){
|
||||
for (var j=0; j < tags_filter.length; j++){
|
||||
try{
|
||||
if(data[i][tags_filter[j][0]].includes(tags_filter[j][1])){
|
||||
verifier = true;
|
||||
}
|
||||
else{
|
||||
verifier = false;
|
||||
break
|
||||
}
|
||||
}
|
||||
catch{
|
||||
verifier = false;
|
||||
break
|
||||
}
|
||||
}
|
||||
if (verifier){doujinshi_id.push(data[i].Folder);}
|
||||
}
|
||||
var gallery = document.getElementsByClassName("gallery-favorite");
|
||||
for (var i = 0; i < gallery.length; i++){
|
||||
gtext = gallery [i].children[0].children[0].children[1].innerText;
|
||||
if(doujinshi_id.includes(gtext)){
|
||||
gallery[i].classList.remove("hidden");
|
||||
}
|
||||
else{
|
||||
gallery[i].classList.add("hidden");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function filter_checker(text){
|
||||
var filter_tags = document.getElementsByClassName("nav-btn")[0].children;
|
||||
if (filter_tags == null){return true;}
|
||||
for (var i=0; i < filter_tags.length; i++){
|
||||
if (filter_tags[i].innerText == text){return false;}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function tag_maker(data){
|
||||
for (i in data){
|
||||
for (j in data[i]){
|
||||
var node = document.createElement("button");
|
||||
var textnode = document.createTextNode(data[i][j]);
|
||||
node.appendChild(textnode);
|
||||
node.classList.add("btn-2");
|
||||
node.setAttribute('id', i);
|
||||
node.classList.add("hidden");
|
||||
document.getElementById("tags").appendChild(node);
|
||||
}
|
||||
}
|
||||
}
|
@ -1,78 +1,85 @@
|
||||
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 'a':
|
||||
changePage(currentPage - 1);
|
||||
break;
|
||||
|
||||
// Next Image
|
||||
case ' ':
|
||||
case 'esc': // future close page function
|
||||
case 'enter':
|
||||
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;
|
||||
}
|
||||
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}")`;
|
||||
|
||||
scroll(0,0)
|
||||
|
||||
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 'w':
|
||||
scrollBy(0, -40);
|
||||
break;
|
||||
case 'a':
|
||||
changePage(currentPage - 1);
|
||||
break;
|
||||
// Return to previous page
|
||||
case 'q':
|
||||
window.history.go(-1);
|
||||
break;
|
||||
// Next Image
|
||||
case ' ':
|
||||
case 's':
|
||||
scrollBy(0, 40);
|
||||
break;
|
||||
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
|
||||
break;
|
||||
case 39: //right
|
||||
changePage(currentPage + 1);
|
||||
break;
|
||||
case 40: //down
|
||||
break;
|
||||
}
|
||||
};
|
@ -1,69 +1,70 @@
|
||||
*, *::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: 2000px;
|
||||
overflow: scroll;
|
||||
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: 2000px;
|
||||
background: #222;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
cursor: pointer;
|
||||
-webkit-user-select: none;
|
||||
user-select: none;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
#image-container #dest {
|
||||
height: 2000px;
|
||||
width: 100%;
|
||||
background-size: contain;
|
||||
background-repeat: no-repeat;
|
||||
background-position: top;
|
||||
}
|
||||
|
||||
#image-container #page-num {
|
||||
position: static;
|
||||
font-size: 14pt;
|
||||
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;
|
||||
}
|
@ -1,4 +1,5 @@
|
||||
requests>=2.5.0
|
||||
soupsieve<2.0
|
||||
BeautifulSoup4>=4.0.0
|
||||
threadpool>=1.2.7
|
||||
tabulate>=0.7.5
|
||||
|
Reference in New Issue
Block a user