From d679154b22ded04ef35c56108d50561a36f3815e Mon Sep 17 00:00:00 2001 From: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Mon, 21 Oct 2024 13:32:51 +0900 Subject: [PATCH] make PNG Info HTML style selectable allowing user choose between new and old styles of HTML for PNG info page --- modules/extras.py | 22 +++++++++++++--------- modules/shared_items.py | 5 +++++ modules/shared_options.py | 2 +- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/modules/extras.py b/modules/extras.py index e2f9a2a0a..ba89bc37b 100644 --- a/modules/extras.py +++ b/modules/extras.py @@ -44,11 +44,11 @@ def pnginfo_html_v1(geninfo, items): def pnginfo_html_v2(geninfo, items): - # raise ValueError + prompt, negative_prompt, last_line = infotext_utils.split_infotext(geninfo) res = infotext_utils.parameters_to_dict(last_line) if not any([prompt, res, items]): - raise ValueError + return pnginfo_html_v1(geninfo, items) info_html = '' if prompt: @@ -90,21 +90,25 @@ def pnginfo_html_v2(geninfo, items): return info_html +pnginfo_html_map = { + 'Default': pnginfo_html_v2, + 'Parsed': pnginfo_html_v2, + 'Raw': pnginfo_html_v1, +} + + def run_pnginfo(image): if image is None: return '', '', '' geninfo, items = images.read_info_from_image(image) - try: - info = pnginfo_html_v2(geninfo, items) - except ValueError: - info = pnginfo_html_v1(geninfo, items) + info_html = pnginfo_html_map.get(shared.opts.png_info_html_style, pnginfo_html_v2)(geninfo, items) - if len(info) == 0: + if len(info_html) == 0: message = "Nothing found in the image." - info = f"
{message}
{message}