From 49af433cef1c5ec1210b321b4fddc25bd6246a23 Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Mon, 13 Mar 2023 11:18:39 -0400 Subject: [PATCH] [131] fix second hash error --- VERSION | 2 +- modules/meta.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index f262fb21..d6585357 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.3-develop130 +1.18.3-develop131 diff --git a/modules/meta.py b/modules/meta.py index 44f0079f..957c6634 100644 --- a/modules/meta.py +++ b/modules/meta.py @@ -633,7 +633,8 @@ class MetadataFile(DataFile): styles = util.parse("Set Data", "styles", set_data["styles"], datatype="dictlist") if "default" not in styles or not styles["default"]: raise Failed("Set Data styles attribute must have a default") - if styles["default"][0] not in styles: + style = styles["default"][0] + if style not in styles: raise Failed(f"Set Data styles default style not found. Options: {', '.join([s for s in styles])}") use_key = None if f"use_{set_key}" in methods: @@ -641,13 +642,12 @@ class MetadataFile(DataFile): logger.info(f"Use {set_key}: {use_key}") if use_key is False or (use_all is False and use_key is None): continue - style = styles["default"] if f"style_{set_key}" in methods: style = util.parse("Images", f"style_{set_key}", self.temp_vars, methods=methods, default=style) logger.info(f"Style {set_key}: {style}") if style not in styles: logger.warning(f"Image Set Warning: {set_key} has no style: {style} using default: {styles['default']}. Options: {', '.join([s for s in styles])}") - style = styles["default"] + style = styles["default"][0] if "collections" in set_data and set_data["collections"]: self.set_collections[set_key] = set_data["collections"] image_set = self.temp_vars[methods[f"set_file_{set_key}"]] if f"set_file_{set_key}" in methods else styles[style]