NussNougate/nhentai
4
0
Fork 0
mirror of https://github.com/RicterZ/nhentai.git synced 2025-11-04 02:50:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #33

Browse Source
This commit is contained in:
Ricter Z
2018-10-24 22:06:49 +08:00
parent 8cbb334d36
commit 7e56d9b901
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nhentai/downloader.py
View File

@@ -103,9 +103,6 @@ class Downloader(Singleton):
if self.path: if self.path:
folder = os.path.join(self.path, folder) folder = os.path.join(self.path, folder)
if len(folder) > 100:
folder = folder[:100]
if not os.path.exists(folder): if not os.path.exists(folder):
logger.warn('Path \'{0}\' does not exist, creating.'.format(folder)) logger.warn('Path \'{0}\' does not exist, creating.'.format(folder))
try: try:

11
nhentai/utils.py
View File

@@ -86,9 +86,9 @@ def generate_html(output_dir='.', doujinshi_obj=None):
def generate_cbz(output_dir='.', doujinshi_obj=None): def generate_cbz(output_dir='.', doujinshi_obj=None):
if doujinshi_obj is not None: if doujinshi_obj is not None:
doujinshi_dir = os.path.join(output_dir, format_filename('%s-%s' % (doujinshi_obj.id, doujinshi_dir = os.path.join(output_dir, format_filename('%s-%s' % (doujinshi_obj.id,
str(doujinshi_obj.name[:200])))) doujinshi_obj.name)))
cbz_filename = os.path.join(output_dir, format_filename('%s-%s.cbz' % (doujinshi_obj.id, cbz_filename = os.path.join(output_dir, format_filename('%s-%s.cbz' % (doujinshi_obj.id,
str(doujinshi_obj.name[:200])))) doujinshi_obj.name)))
else: else:
cbz_filename = './doujinshi.cbz' cbz_filename = './doujinshi.cbz'
doujinshi_dir = '.' doujinshi_dir = '.'
@@ -105,11 +105,6 @@ def generate_cbz(output_dir='.', doujinshi_obj=None):
logger.log(15, 'Comic Book CBZ file has been write to \'{0}\''.format(doujinshi_dir)) logger.log(15, 'Comic Book CBZ file has been write to \'{0}\''.format(doujinshi_dir))
def format_filename(s): def format_filename(s):
"""Take a string and return a valid filename constructed from the string. """Take a string and return a valid filename constructed from the string.
Uses a whitelist approach: any characters not present in valid_chars are Uses a whitelist approach: any characters not present in valid_chars are
@@ -124,4 +119,6 @@ an invalid filename.
valid_chars = "-_.() %s%s" % (string.ascii_letters, string.digits) valid_chars = "-_.() %s%s" % (string.ascii_letters, string.digits)
filename = ''.join(c for c in s if c in valid_chars) filename = ''.join(c for c in s if c in valid_chars)
filename = filename.replace(' ', '_') # I don't like spaces in filenames. filename = filename.replace(' ', '_') # I don't like spaces in filenames.
if len(filename) > 100:
filename = filename[:100]
return filename return filename