from nhentai import constant
from nhentai.logger import logger
-from nhentai.serializer import serialize_json, serialize_comicxml, set_js_database
+from nhentai.serializer import serialize_json, serialize_comic_xml, 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)',
+ 'User-Agent': constant.CONFIG['useragent'],
'Cookie': constant.CONFIG['cookie']
})
- return getattr(session, method)(url, proxies=constant.CONFIG['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():
- response = request('get', constant.BASE_URL).text
- username = re.findall('"/users/\d+/(.*?)"', response)
+ response = request('get', constant.BASE_URL)
+ if response.status_code == 503 and 'cf-browser-verification' in response.text:
+ logger.error('Blocked by Cloudflare captcha, please set your cookie and useragent')
+ exit(-1)
+
+ username = re.findall('"/users/\d+/(.*?)"', response.text)
if not username:
- logger.error('Cannot get your username, please check your cookie or use `nhentai --cookie` to set your cookie')
+ logger.warning('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]))
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()
if not os.path.splitext(image)[1] in ('.jpg', '.png'):
continue
- image_html += '<img src="{0}" class="image-item"/>\n'\
+ image_html += '<img src="{0}" class="image-item"/>\n' \
.format(image)
html = readfile('viewer/{}/index.html'.format(template))
css = readfile('viewer/{}/styles.css'.format(template))
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))
if doujinshi_obj is not None:
doujinshi_dir = os.path.join(output_dir, doujinshi_obj.filename)
if write_comic_info:
- serialize_comicxml(doujinshi_obj, doujinshi_dir)
+ serialize_comic_xml(doujinshi_obj, doujinshi_dir)
cbz_filename = os.path.join(os.path.join(doujinshi_dir, '..'), '{}.cbz'.format(doujinshi_obj.filename))
else:
cbz_filename = './doujinshi.cbz'
def generate_pdf(output_dir='.', doujinshi_obj=None, rm_origin_dir=False):
try:
import img2pdf
-
+
"""Write images to a PDF file using img2pdf."""
if doujinshi_obj is not None:
doujinshi_dir = os.path.join(output_dir, doujinshi_obj.filename)
shutil.rmtree(doujinshi_dir, ignore_errors=True)
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 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
"""
"""
# maybe you can use `--format` to select a suitable filename
ban_chars = '\\\'/:,;*?"<>|\t'
- filename = s.translate(str.maketrans(ban_chars, ' '*len(ban_chars))).strip()
+ filename = s.translate(str.maketrans(ban_chars, ' ' * len(ban_chars))).strip()
filename = ' '.join(filename.split())
- print(repr(filename))
while filename.endswith('.'):
filename = filename[:-1]
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')
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
projects / nhentai.git / blobdiff