From db59426503f14c9d4fefe34c21761abfd32743af Mon Sep 17 00:00:00 2001 From: Nontre <62849884+Nontre12@users.noreply.github.com> Date: Wed, 24 Mar 2021 21:49:45 +0100 Subject: [PATCH] FIX: Use of img2lib even if it is not installed --- nhentai/utils.py | 50 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/nhentai/utils.py b/nhentai/utils.py index 099f6a1..c28a3ee 100644 --- a/nhentai/utils.py +++ b/nhentai/utils.py @@ -194,35 +194,35 @@ 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 = '.' - - file_list = os.listdir(doujinshi_dir) - file_list.sort() + + """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 = '.' - 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)) + file_list = os.listdir(doujinshi_dir) + file_list.sort() - if rm_origin_dir: - shutil.rmtree(doujinshi_dir, ignore_errors=True) + 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.log(15, 'PDF file has been written to \'{0}\''.format(doujinshi_dir)) + if rm_origin_dir: + 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 -- 2.44.0