From acc79cd9094c3ed280d9178d9efa985e355faa83 Mon Sep 17 00:00:00 2001 From: pythongosssss <125205205+pythongosssss@users.noreply.github.com> Date: Sat, 12 Aug 2023 17:24:16 +0100 Subject: [PATCH] Support .preview.png for images --- py/better_combos.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/py/better_combos.py b/py/better_combos.py index b0ebe87..8119f16 100644 --- a/py/better_combos.py +++ b/py/better_combos.py @@ -23,12 +23,13 @@ async def view_image(request): def populate_images(names, type): for idx, item_name in enumerate(names): - item_image = os.path.splitext(item_name)[0] + ".png" - item_image_path = folder_paths.get_full_path(type, item_image) - if not item_image_path: - item_image = os.path.splitext(item_name)[0] + ".jpg" - item_image_path = folder_paths.get_full_path( - type, item_image) + + item_name = os.path.splitext(item_name)[0] + for ext in ["png", "jpg", "preview.png"]: + item_image = f"{item_name}.{ext}" + item_image_path = folder_paths.get_full_path(type, item_image) + if item_image_path: + break names[idx] = {"content": item_name, "image": f"{type}/{item_image}" if item_image_path else None, } @@ -42,7 +43,7 @@ class LoraLoaderWithImages(LoraLoader): names = types["required"]["lora_name"][0] populate_images(names, "loras") return types - + def load_lora(self, **kwargs): kwargs["lora_name"] = kwargs["lora_name"]["content"] return super().load_lora(**kwargs) @@ -55,7 +56,7 @@ class CheckpointLoaderSimpleWithImages(CheckpointLoaderSimple): names = types["required"]["ckpt_name"][0] populate_images(names, "checkpoints") return types - + def load_checkpoint(self, **kwargs): kwargs["ckpt_name"] = kwargs["ckpt_name"]["content"] return super().load_checkpoint(**kwargs)