Compare commits

..

8 Commits
0.2.2 ... 0.2.7

Author SHA1 Message Date
dbc834ea2e 0.2.7 2017-06-18 14:25:00 +08:00
71177ff94e 0.2.6 2017-06-18 14:19:28 +08:00
d1ed9b6980 add html doujinshi viewer 2017-06-18 14:19:07 +08:00
42a09e2c1e fix timeout 2017-03-17 20:19:40 +08:00
e306d50b7e fix bug 2017-03-17 20:14:42 +08:00
043f391d04 fix https error 2016-11-23 22:45:03 +08:00
9549c5f5a2 fix bug 2016-11-23 22:35:56 +08:00
5592b30be4 do not download 404 2016-11-23 22:11:47 +08:00
8 changed files with 197 additions and 22 deletions

2
.gitignore vendored
View File

@ -4,4 +4,4 @@ build
dist/
*.egg-info
.python-version
.DS_Store

View File

@ -1,2 +1,3 @@
include README.md
include requirements.txt
include nhentai/doujinshi.html

View File

@ -1,3 +1,3 @@
__version__ = '0.2.2'
__version__ = '0.2.7'
__author__ = 'Ricter'
__email__ = 'ricterzheng@gmail.com'

View File

@ -30,9 +30,12 @@ def banner():
def cmd_parser():
parser = OptionParser()
parser.add_option('--download', dest='is_download', action='store_true', help='download doujinshi or not')
parser.add_option('--show-info', dest='is_show', action='store_true', help='just show the doujinshi information.')
parser = OptionParser('\n nhentai --search [keyword] --download'
'\n NHENTAI=http://h.loli.club nhentai --id [ID ...]'
'\n\nEnvironment Variable:\n'
' NHENTAI nhentai mirror url')
parser.add_option('--download', dest='is_download', action='store_true', help='download doujinshi (for search result)')
parser.add_option('--show-info', dest='is_show', action='store_true', help='just show the doujinshi information')
parser.add_option('--id', type='string', dest='id', action='store', help='doujinshi ids set, e.g. 1,2,3')
parser.add_option('--search', type='string', dest='keyword', action='store', help='search doujinshi by keyword')
parser.add_option('--page', type='int', dest='page', action='store', default=1,
@ -76,8 +79,8 @@ def cmd_parser():
if args.threads <= 0:
args.threads = 1
elif args.threads > 10:
logger.critical('Maximum number of used threads is 10')
elif args.threads > 15:
logger.critical('Maximum number of used threads is 15')
exit(0)
if args.proxy:

View File

@ -1,6 +1,7 @@
#!/usr/bin/env python2.7
# coding: utf-8
from __future__ import unicode_literals, print_function
import os
import signal
import platform
@ -43,6 +44,30 @@ def main():
doujinshi.downloader = downloader
doujinshi.download()
image_html = ''
previous = ''
doujinshi_dir = os.path.join(options.output_dir, str(doujinshi.id))
file_list = os.listdir(doujinshi_dir)
for index, image in enumerate(file_list):
try:
next_ = file_list[file_list.index(image) + 1]
except IndexError:
next_ = ''
image_html += '<img src="{0}" class="image-item {1}" attr-prev="{2}" attr-next="{3}">\n'\
.format(image, 'current' if index == 0 else '', previous, next_)
previous = image
with open(os.path.join(os.path.dirname(__file__), 'doujinshi.html'), 'r') as template:
html = template.read()
data = html.format(TITLE=doujinshi.name, 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')))
if not platform.system() == 'Windows':
logger.log(15, '🍺 All done.')
else:

126
nhentai/doujinshi.html Normal file
View File

@ -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>

View File

@ -14,45 +14,65 @@ from nhentai.parser import request
from nhentai.utils import Singleton
requests.packages.urllib3.disable_warnings()
class NhentaiImageNotExistException(Exception):
pass
class Downloader(Singleton):
def __init__(self, path='', thread=1, timeout=30):
if not isinstance(thread, (int, )) or thread < 1 or thread > 10:
if not isinstance(thread, (int, )) or thread < 1 or thread > 15:
raise ValueError('Invalid threads count')
self.path = str(path)
self.thread_count = thread
self.threads = []
self.timeout = timeout
def _download(self, url, folder='', filename='', retried=False):
def _download(self, url, folder='', filename='', retried=0):
logger.info('Start downloading: {0} ...'.format(url))
filename = filename if filename else os.path.basename(urlparse(url).path)
base_filename, extension = os.path.splitext(filename)
try:
with open(os.path.join(folder, base_filename.zfill(3) + extension), "wb") as f:
response = request('get', url, stream=True, timeout=self.timeout)
if response.status_code != 200:
raise NhentaiImageNotExistException
length = response.headers.get('content-length')
if length is None:
f.write(response.content)
else:
for chunk in response.iter_content(2048):
f.write(chunk)
except requests.HTTPError as e:
if not retried:
logger.error('Error: {0}, retrying'.format(str(e)))
return self._download(url=url, folder=folder, filename=filename, retried=True)
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)
else:
return None
return 0, None
except NhentaiImageNotExistException as e:
os.remove(os.path.join(folder, base_filename.zfill(3) + extension))
return -1, url
except Exception as e:
logger.critical(str(e))
return None
return url
return 0, None
return 1, url
def _download_callback(self, request, result):
if not result:
logger.critical('Too many errors occurred, quit.')
result, data = result
if result == 0:
logger.critical('fatal errors occurred, quit.')
exit(1)
logger.log(15, '{0} download successfully'.format(result))
elif result == -1:
logger.warning('url {} return status code 404'.format(data))
else:
logger.log(15, '{0} download successfully'.format(data))
def download(self, queue, folder=''):
if not isinstance(folder, (text)):
@ -66,7 +86,7 @@ class Downloader(Singleton):
try:
os.makedirs(folder)
except EnvironmentError as e:
logger.critical('Error: {0}'.format(str(e)))
logger.critical('{0}'.format(str(e)))
exit(1)
else:
logger.warn('Path \'{0}\' already exist.'.format(folder))

View File

@ -14,7 +14,7 @@ def request(method, url, **kwargs):
if not hasattr(requests, method):
raise AttributeError('\'requests\' object has no attribute \'{0}\''.format(method))
return requests.__dict__[method](url, proxies=constant.PROXY, **kwargs)
return requests.__dict__[method](url, proxies=constant.PROXY, verify=False, **kwargs)
def doujinshi_parser(id_):
@ -43,7 +43,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['src'])
img_id = re.search('/galleries/([\d]+)/cover\.(jpg|png)$', doujinshi_cover.a.img.attrs['data-src'])
if not img_id:
logger.critical('Tried yo get image id failed')
exit(1)