From 7e56d9b9018fc8122526f4cbdbe019fb89044e71 Mon Sep 17 00:00:00 2001 From: Ricter Z Date: Wed, 24 Oct 2018 22:06:49 +0800 Subject: [PATCH] fix #33 --- nhentai/downloader.py | 3 --- nhentai/utils.py | 11 ++++------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/nhentai/downloader.py b/nhentai/downloader.py index d98673a..9920d4a 100644 --- a/nhentai/downloader.py +++ b/nhentai/downloader.py @@ -103,9 +103,6 @@ class Downloader(Singleton): if self.path: folder = os.path.join(self.path, folder) - if len(folder) > 100: - folder = folder[:100] - if not os.path.exists(folder): logger.warn('Path \'{0}\' does not exist, creating.'.format(folder)) try: diff --git a/nhentai/utils.py b/nhentai/utils.py index 4e779e8..618a6ad 100644 --- a/nhentai/utils.py +++ b/nhentai/utils.py @@ -86,9 +86,9 @@ def generate_html(output_dir='.', doujinshi_obj=None): def generate_cbz(output_dir='.', doujinshi_obj=None): if doujinshi_obj is not None: 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, - str(doujinshi_obj.name[:200])))) + doujinshi_obj.name))) else: cbz_filename = './doujinshi.cbz' 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)) - - - - - 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 @@ -124,4 +119,6 @@ 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] return filename