From f8f3ccbb3ab3398f9ef9db8eef192e5da7184b62 Mon Sep 17 00:00:00 2001
From: meisnate12 <meisnate12@gmail.com>
Date: Sat, 11 Mar 2023 15:21:33 -0500
Subject: [PATCH] [129] change how default works

---
 VERSION             |  2 +-
 modules/meta.py     | 10 ++++++----
 modules/webhooks.py |  1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index 5fd95bdb..ff9bb40d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.18.3-develop128
+1.18.3-develop129
diff --git a/modules/meta.py b/modules/meta.py
index 6117c8f0..84ca15f8 100644
--- a/modules/meta.py
+++ b/modules/meta.py
@@ -633,19 +633,21 @@ class MetadataFile(DataFile):
                 styles = util.parse("Set Data", "styles", set_data["styles"], datatype="dictlist")
                 if "default" not in styles:
                     raise Failed("Set Data styles attribute must have a default")
+                if styles["default"] 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:
                     use_key = util.parse("Images", f"use_{set_key}", self.temp_vars, datatype="bool",methods=methods, default=False)
                     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 = "default"
+                style = styles["default"]
                 if f"style_{set_key}" in methods:
-                    style = util.parse("Images", f"style_{set_key}", self.temp_vars, methods=methods, default="default")
+                    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. Options: {', '.join([s for s in styles])}")
-                    style = "default"
+                    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"]
                 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]
diff --git a/modules/webhooks.py b/modules/webhooks.py
index 7a56077a..74cd5cf9 100644
--- a/modules/webhooks.py
+++ b/modules/webhooks.py
@@ -19,6 +19,7 @@ class Webhooks:
         logger.trace("")
         logger.separator("Webhooks", space=False, border=False, trace=True)
         logger.trace("")
+        json["library_mapping_name"] = self.library.mapping_name if self.library else ""
         logger.trace(f"JSON: {json}")
         for webhook in list(set(webhooks)):
             response = None