X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=nhentai%2Futils.py;h=f7532bf12e3900bbde6683f49fd5b9676d2fe2ee;hb=7594625d72ef851e78c21ad18106ae39c8186245;hp=2a0cb5c0580ba4e13a8d8195d04fd92f98f90d63;hpb=1746e731ecba69c2a4a7e5dfa900dda3f98f2106;p=nhentai.git
diff --git a/nhentai/utils.py b/nhentai/utils.py
index 2a0cb5c..f7532bf 100644
--- a/nhentai/utils.py
+++ b/nhentai/utils.py
@@ -1,10 +1,8 @@
# coding: utf-8
-from __future__ import unicode_literals, print_function
import sys
import re
import os
-import string
import zipfile
import shutil
import requests
@@ -20,9 +18,13 @@ def request(method, url, **kwargs):
session.headers.update({
'Referer': constant.LOGIN_URL,
'User-Agent': 'nhentai command line client (https://github.com/RicterZ/nhentai)',
- 'Cookie': constant.COOKIE
+ 'Cookie': constant.CONFIG['cookie']
})
- return getattr(session, method)(url, proxies=constant.PROXY, verify=False, **kwargs)
+
+ if not kwargs.get('proxies', None):
+ kwargs['proxies'] = constant.CONFIG['proxy']
+
+ return getattr(session, method)(url, verify=False, **kwargs)
def check_cookie():
@@ -64,7 +66,7 @@ def readfile(path):
return file.read()
-def generate_html(output_dir='.', doujinshi_obj=None):
+def generate_html(output_dir='.', doujinshi_obj=None, template='default'):
image_html = ''
if doujinshi_obj is not None:
@@ -72,6 +74,13 @@ def generate_html(output_dir='.', doujinshi_obj=None):
else:
doujinshi_dir = '.'
+ if not os.path.exists(doujinshi_dir):
+ logger.warning('Path \'{0}\' does not exist, creating.'.format(doujinshi_dir))
+ try:
+ os.makedirs(doujinshi_dir)
+ except EnvironmentError as e:
+ logger.critical('{0}'.format(str(e)))
+
file_list = os.listdir(doujinshi_dir)
file_list.sort()
@@ -79,11 +88,11 @@ def generate_html(output_dir='.', doujinshi_obj=None):
if not os.path.splitext(image)[1] in ('.jpg', '.png'):
continue
- image_html += '
\n'\
+ image_html += '\n' \
.format(image)
- html = readfile('viewer/index.html')
- css = readfile('viewer/styles.css')
- js = readfile('viewer/scripts.js')
+ html = readfile('viewer/{}/index.html'.format(template))
+ css = readfile('viewer/{}/styles.css'.format(template))
+ js = readfile('viewer/{}/scripts.js'.format(template))
if doujinshi_obj is not None:
serialize_json(doujinshi_obj, doujinshi_dir)
@@ -160,7 +169,7 @@ def generate_main_html(output_dir='./'):
else:
with open('./main.html', 'wb') as f:
f.write(data.encode('utf-8'))
- shutil.copy(os.path.dirname(__file__)+'/viewer/logo.png', './')
+ shutil.copy(os.path.dirname(__file__) + '/viewer/logo.png', './')
set_js_database()
logger.log(
15, 'Main Viewer has been written to \'{0}main.html\''.format(output_dir))
@@ -168,7 +177,7 @@ def generate_main_html(output_dir='./'):
logger.warning('Writing Main Viewer failed ({})'.format(str(e)))
-def generate_cbz(output_dir='.', doujinshi_obj=None, rm_origin_dir=False, write_comic_info=False):
+def generate_cbz(output_dir='.', doujinshi_obj=None, rm_origin_dir=False, write_comic_info=True):
if doujinshi_obj is not None:
doujinshi_dir = os.path.join(output_dir, doujinshi_obj.filename)
if write_comic_info:
@@ -196,52 +205,62 @@ def generate_cbz(output_dir='.', doujinshi_obj=None, rm_origin_dir=False, write_
def generate_pdf(output_dir='.', doujinshi_obj=None, rm_origin_dir=False):
try:
import img2pdf
- except ImportError:
- logger.error("Please install img2pdf package by using pip.")
- """Write images to a PDF file using img2pdf."""
- if doujinshi_obj is not None:
- doujinshi_dir = os.path.join(output_dir, doujinshi_obj.filename)
- pdf_filename = os.path.join(
- os.path.join(doujinshi_dir, '..'),
- '{}.pdf'.format(doujinshi_obj.filename)
- )
- else:
- pdf_filename = './doujinshi.pdf'
- doujinshi_dir = '.'
+ """Write images to a PDF file using img2pdf."""
+ if doujinshi_obj is not None:
+ doujinshi_dir = os.path.join(output_dir, doujinshi_obj.filename)
+ pdf_filename = os.path.join(
+ os.path.join(doujinshi_dir, '..'),
+ '{}.pdf'.format(doujinshi_obj.filename)
+ )
+ else:
+ pdf_filename = './doujinshi.pdf'
+ doujinshi_dir = '.'
- file_list = os.listdir(doujinshi_dir)
- file_list.sort()
+ file_list = os.listdir(doujinshi_dir)
+ file_list.sort()
- logger.info('Writing PDF file to path: {}'.format(pdf_filename))
- with open(pdf_filename, 'wb') as pdf_f:
- full_path_list = (
- [os.path.join(doujinshi_dir, image) for image in file_list]
- )
- pdf_f.write(img2pdf.convert(full_path_list))
+ logger.info('Writing PDF file to path: {}'.format(pdf_filename))
+ with open(pdf_filename, 'wb') as pdf_f:
+ full_path_list = (
+ [os.path.join(doujinshi_dir, image) for image in file_list]
+ )
+ pdf_f.write(img2pdf.convert(full_path_list))
- if rm_origin_dir:
- shutil.rmtree(doujinshi_dir, ignore_errors=True)
+ if rm_origin_dir:
+ shutil.rmtree(doujinshi_dir, ignore_errors=True)
- logger.log(15, 'PDF file has been written to \'{0}\''.format(doujinshi_dir))
+ logger.log(15, 'PDF file has been written to \'{0}\''.format(doujinshi_dir))
+ except ImportError:
+ logger.error("Please install img2pdf package by using pip.")
-def format_filename(s):
- """Take a string and return a valid filename constructed from the string.
-Uses a whitelist approach: any characters not present in valid_chars are
-removed. Also spaces are replaced with underscores.
-Note: this method may produce invalid filenames such as ``, `.` or `..`
-When I use this method I prepend a date string like '2009_01_15_19_46_32_'
-and append a file extension like '.txt', so I avoid the potential of using
-an invalid filename.
+def unicode_truncate(s, length, encoding='utf-8'):
+ """https://stackoverflow.com/questions/1809531/truncating-unicode-so-it-fits-a-maximum-size-when-encoded-for-wire-transfer
+ """
+ encoded = s.encode(encoding)[:length]
+ return encoded.decode(encoding, 'ignore')
+
-"""
+def format_filename(s):
+ """
+ It used to be a whitelist approach allowed only alphabet and a part of symbols.
+ but most doujinshi's names include Japanese 2-byte characters and these was rejected.
+ so it is using blacklist approach now.
+ if filename include forbidden characters (\'/:,;*?"<>|) ,it replace space character(' ').
+ """
# maybe you can use `--format` to select a suitable filename
- valid_chars = "-_.()[] %s%s" % (string.ascii_letters, string.digits)
- filename = ''.join(c for c in s if c in valid_chars)
+ ban_chars = '\\\'/:,;*?"<>|\t'
+ filename = s.translate(str.maketrans(ban_chars, ' ' * len(ban_chars))).strip()
+ filename = ' '.join(filename.split())
+ print(repr(filename))
+
+ while filename.endswith('.'):
+ filename = filename[:-1]
+
if len(filename) > 100:
- filename = filename[:100] + '...]'
+ filename = filename[:100] + u'â¦'
# Remove [] from filename
filename = filename.replace('[]', '').strip()
@@ -264,7 +283,7 @@ def paging(page_string):
start, end = i.split('-')
if not (start.isdigit() and end.isdigit()):
raise Exception('Invalid page number')
- page_list.extend(list(range(int(start), int(end)+1)))
+ page_list.extend(list(range(int(start), int(end) + 1)))
else:
if not i.isdigit():
raise Exception('Invalid page number')
@@ -273,6 +292,34 @@ def paging(page_string):
return page_list
+def generate_metadata_file(output_dir, table, doujinshi_obj=None):
+ logger.info('Writing Metadata Info')
+
+ if doujinshi_obj is not None:
+ doujinshi_dir = os.path.join(output_dir, doujinshi_obj.filename)
+ else:
+ doujinshi_dir = '.'
+
+ logger.info(doujinshi_dir)
+
+ f = open(os.path.join(doujinshi_dir, 'info.txt'), 'w', encoding='utf-8')
+
+ fields = ['TITLE', 'ORIGINAL TITLE', 'AUTHOR', 'ARTIST', 'CIRCLE', 'SCANLATOR',
+ 'TRANSLATOR', 'PUBLISHER', 'DESCRIPTION', 'STATUS', 'CHAPTERS', 'PAGES',
+ 'TAGS', 'TYPE', 'LANGUAGE', 'RELEASED', 'READING DIRECTION', 'CHARACTERS',
+ 'SERIES', 'PARODY', 'URL']
+ special_fields = ['PARODY', 'TITLE', 'ORIGINAL TITLE', 'CHARACTERS', 'AUTHOR',
+ 'LANGUAGE', 'TAGS', 'URL', 'PAGES']
+
+ for i in range(len(fields)):
+ f.write('{}: '.format(fields[i]))
+ if fields[i] in special_fields:
+ f.write(str(table[special_fields.index(fields[i])][1]))
+ f.write('\n')
+
+ f.close()
+
+
class DB(object):
conn = None
cur = None