From b127ca48742a6a78be3234da2358dc69fdc5220f Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sun, 4 Jun 2023 07:05:29 -0400 Subject: [PATCH] catch extra networks error --- extensions-builtin/a1111-sd-webui-lycoris | 2 +- extensions-builtin/sd-webui-agent-scheduler | 2 +- extensions-builtin/sd-webui-controlnet | 2 +- modules/lycoris | 2 +- modules/ui_extra_networks.py | 40 +++++++++++---------- 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/extensions-builtin/a1111-sd-webui-lycoris b/extensions-builtin/a1111-sd-webui-lycoris index f90a21234..dcb9536dc 160000 --- a/extensions-builtin/a1111-sd-webui-lycoris +++ b/extensions-builtin/a1111-sd-webui-lycoris @@ -1 +1 @@ -Subproject commit f90a21234b7a7bfdafd4a2406c80d59571d69021 +Subproject commit dcb9536dccba7766c6b66cbf2b27969f4f2fc023 diff --git a/extensions-builtin/sd-webui-agent-scheduler b/extensions-builtin/sd-webui-agent-scheduler index aea5146f1..b07031958 160000 --- a/extensions-builtin/sd-webui-agent-scheduler +++ b/extensions-builtin/sd-webui-agent-scheduler @@ -1 +1 @@ -Subproject commit aea5146f1e5fc50401b32e9a0236fd16210b96f3 +Subproject commit b0703195833b8ea055e07b80902cbda1a01363f6 diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet index 7b2bf668e..d8551e447 160000 --- a/extensions-builtin/sd-webui-controlnet +++ b/extensions-builtin/sd-webui-controlnet @@ -1 +1 @@ -Subproject commit 7b2bf668ee4e0ce63dd67c828ea20c064e719796 +Subproject commit d8551e447d8718e15b8ff5de04036d3fd1b3c5ce diff --git a/modules/lycoris b/modules/lycoris index 8b47a5349..dfe51b093 160000 --- a/modules/lycoris +++ b/modules/lycoris @@ -1 +1 @@ -Subproject commit 8b47a5349b59efac812664c5732c6e3947a6fec7 +Subproject commit dfe51b093cf115b61fa82fccda0a932e5fcdca78 diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py index 8ea905f5b..79e5c5ae1 100644 --- a/modules/ui_extra_networks.py +++ b/modules/ui_extra_networks.py @@ -97,24 +97,28 @@ class ExtraNetworksPage: {html.escape(subdir if subdir!="" else "all")} """ for subdir in subdirs]) - for item in self.list_items(): - metadata = item.get("metadata") - if metadata: - self.metadata[item["name"]] = metadata - items_html += self.create_html_for_item(item, tabname) - if items_html == '': - dirs = "".join([f"
  • {x}
  • " for x in self.allowed_directories_for_previews()]) - items_html = shared.html("extra-networks-no-cards.html").format(dirs=dirs) - self_name_id = self.name.replace(" ", "_") - res = f""" -
    -{subdirs_html} -
    -
    -{items_html} -
    -""" - return res + try: + for item in self.list_items(): + metadata = item.get("metadata") + if metadata: + self.metadata[item["name"]] = metadata + items_html += self.create_html_for_item(item, tabname) + if items_html == '': + dirs = "".join([f"
  • {x}
  • " for x in self.allowed_directories_for_previews()]) + items_html = shared.html("extra-networks-no-cards.html").format(dirs=dirs) + self_name_id = self.name.replace(" ", "_") + res = f""" +
    + {subdirs_html} +
    +
    + {items_html} +
    + """ + return res + except Exception as e: + shared.log.error(f'Extra networks page error: {e}') + return '' def list_items(self): raise NotImplementedError()