From 44f0cc39c68cd7d101f65fcef1fa015fa2aab604 Mon Sep 17 00:00:00 2001 From: Flo Greistorfer Date: Wed, 10 Jul 2024 22:15:37 +0200 Subject: [PATCH] addional check bruh --- builder.py | 8 +++----- modules/generate_html.py | 7 +++++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/builder.py b/builder.py index d9f22b1..6c0bdfa 100755 --- a/builder.py +++ b/builder.py @@ -77,7 +77,7 @@ def copy_static_files(_args: Args) -> None: shutil.copyfile(_args.theme_path, os.path.join(static_dir, "theme.css")) -def generate_thumbnail(arguments: Tuple[str, str, str, bool]) -> None: +def generate_thumbnail(arguments: Tuple[str, str, str]) -> None: """ Generate a thumbnail for a given image. @@ -86,7 +86,7 @@ def generate_thumbnail(arguments: Tuple[str, str, str, bool]) -> None: arguments : Tuple[str, str, str, bool] A tuple containing the folder, item, root directory, and regenerate thumbnails flag. """ - folder, item, root_directory, regenerate_thumbnails = arguments + folder, item, root_directory = arguments path = os.path.join(root_directory, ".thumbnails", folder.removeprefix(root_directory), item) + ".jpg" oldpath = os.path.join(root_directory, ".thumbnails", folder.removeprefix(root_directory), os.path.splitext(item)[0]) + ".jpg" if os.path.exists(oldpath): @@ -94,9 +94,7 @@ def generate_thumbnail(arguments: Tuple[str, str, str, bool]) -> None: shutil.move(oldpath, path) except FileNotFoundError: pass - if not os.path.exists(path) or regenerate_thumbnails: - if os.path.exists(path): - os.remove(path) + if not os.path.exists(path): try: with Image.open(os.path.join(folder, item)) as imgfile: imgrgb = imgfile.convert("RGB") diff --git a/modules/generate_html.py b/modules/generate_html.py index 9475b27..83122aa 100644 --- a/modules/generate_html.py +++ b/modules/generate_html.py @@ -113,8 +113,11 @@ def process_image(item: str, folder: str, _args: Args, baseurl: str, sizelist: D "width": sizelist[item]["width"], "height": sizelist[item]["height"], } - if not os.path.exists(os.path.join(_args.root_directory, ".thumbnails", baseurl, item)): - thumbnails.append((folder, item, _args.root_directory, _args.regenerate_thumbnails)) + path = os.path.join(_args.root_directory, ".thumbnails", baseurl, item + ".jpg") + if not os.path.exists(path) or _args.regenerate_thumbnails: + if os.path.exists(path): + os.remove(path) + thumbnails.append((folder, item, _args.root_directory)) for _raw in raw: if os.path.exists(os.path.join(folder, extsplit[0] + _raw)):