diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2024-01-04 08:15:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-04 08:15:50 +0000 |
| commit | df62ffbd2525792c115adefdbaeb7799699624b1 (patch) | |
| tree | c5bd1c25eae4d890b7f5f79d938ca5e04802bafc /modules/extra_networks.py | |
| parent | d9034b48a526f0a0c3e8f0dbf7c171bf4f0597fd (diff) | |
| parent | 149c9d223463c8fc34f53f26ca06e02be4c8835b (diff) | |
| download | stable-diffusion-webui-gfx803-df62ffbd2525792c115adefdbaeb7799699624b1.tar.gz stable-diffusion-webui-gfx803-df62ffbd2525792c115adefdbaeb7799699624b1.tar.bz2 stable-diffusion-webui-gfx803-df62ffbd2525792c115adefdbaeb7799699624b1.zip | |
Merge branch 'dev' into avoid-isfiles
Diffstat (limited to 'modules/extra_networks.py')
| -rw-r--r-- | modules/extra_networks.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/extra_networks.py b/modules/extra_networks.py index cd030fa3..04249dff 100644 --- a/modules/extra_networks.py +++ b/modules/extra_networks.py @@ -206,7 +206,7 @@ def parse_prompts(prompts): return res, extra_data
-def get_user_metadata(filename):
+def get_user_metadata(filename, lister=None):
if filename is None:
return {}
@@ -215,10 +215,10 @@ def get_user_metadata(filename): metadata = {}
try:
- with open(metadata_filename, "r", encoding="utf8") as file:
- metadata = json.load(file)
- except FileNotFoundError:
- pass
+ exists = lister.exists(metadata_filename) if lister else os.path.exists(metadata_filename)
+ if exists:
+ with open(metadata_filename, "r", encoding="utf8") as file:
+ metadata = json.load(file)
except Exception as e:
errors.display(e, f"reading extra network user metadata from {metadata_filename}")
|