From c9500cdc6c5a15f036dd210be05f2e0b98958292 Mon Sep 17 00:00:00 2001 From: Flo Greistorfer Date: Thu, 27 Jun 2024 12:32:48 +0200 Subject: [PATCH] shutil instead of try except --- generate_html.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/generate_html.py b/generate_html.py index 0a0274d..a598a04 100755 --- a/generate_html.py +++ b/generate_html.py @@ -2,6 +2,7 @@ import os import argparse import urllib.parse +import shutil from multiprocessing import Pool from string import Template import numpy as np @@ -154,9 +155,9 @@ HTMLHEADER = """ def thumbnail_convert(arguments: tuple[str, str]): folder, item = arguments if not os.path.exists(os.path.join(args.root, ".previews", folder.removeprefix(args.root), os.path.splitext(item)[0] + ".jpg")) or args.regenerate: - try: + if shutil.which("magick"): os.system(f'magick "{os.path.join(folder, item)}" -quality 75% -define jpeg:size=1024x1024 -define jpeg:extent=100kb -thumbnail 512x512 -auto-orient "{os.path.join(args.root, ".previews", folder.removeprefix(args.root), os.path.splitext(item)[0])}.jpg"') - except: + else: os.system(f'convert "{os.path.join(folder, item)}" -quality 75% -define jpeg:size=1024x1024 -define jpeg:extent=100kb -thumbnail 512x512 -auto-orient "{os.path.join(args.root, ".previews", folder.removeprefix(args.root), os.path.splitext(item)[0])}.jpg"')