diff --git a/VERSION b/VERSION index ec26294d..27dbb5c8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.3-develop23 +1.18.3-develop24 diff --git a/defaults/overlays/versions.yml b/defaults/overlays/versions.yml index 4f123a16..f8d58472 100644 --- a/defaults/overlays/versions.yml +++ b/defaults/overlays/versions.yml @@ -12,6 +12,11 @@ external_templates: default: vertical_align: top conditionals: + horizontal_align: + default: right + conditions: + - overlay_level: episode + value: center vertical_offset: default: 15 conditions: @@ -34,11 +39,6 @@ external_templates: value: 0 - horizontal_align: [left, right] value: 15 - horizontal_align: - default: right - conditions: - - overlay_level: episode - value: center back_color: "#00000099" back_width: 105 back_height: 105 diff --git a/docs/home/kb.md b/docs/home/kb.md index 9e79e93f..e91d484a 100644 --- a/docs/home/kb.md +++ b/docs/home/kb.md @@ -1,24 +1,5 @@ # Frequently Asked Questions & Knowledgebase -## {} - -{fas}`spinner;sd-text-primary` - -- An icon {fas}`spinner;sd-text-primary`, some more text. -- An icon {fab}`github`, some more text. -- An icon {fab}`gitkraken;sd-text-success fa-xl`, some more text. -- An icon {fas}`skull;sd-text-danger`, some more text. - -## :: - -:fas:`spinner;sd-text-primary` - -- An icon :fas:`spinner;sd-text-primary`, some more text. -- An icon :fab:`github`, some more text. -- An icon :fab:`gitkraken;sd-text-success fa-xl`, some more text. -- An icon :fas:`skull;sd-text-danger`, some more text. - - This page aims to provide knowledge based on combined user experience, and to answer the frequent questions that we are asked in our [Discord Server](https://discord.gg/NfH6mGFuAB). ## Frequently Asked Questions diff --git a/modules/meta.py b/modules/meta.py index e81a4bba..9a102810 100644 --- a/modules/meta.py +++ b/modules/meta.py @@ -378,6 +378,7 @@ class DataFile: if var_key == "value": continue error_text = "" + con_value = "" var_key = replace_var(var_key, [variables, default]) var_value = replace_var(var_value, [variables, default]) if var_key.endswith(".exists"): @@ -403,9 +404,11 @@ class DataFile: elif str(con_value) != str(var_value): error_text = f'is not "{var_value}"' else: - error_text = "is not a variable provided or a default variable" + error_text = " is not a variable provided or a default variable" if error_text: - logger.trace(f'Condition {i} Failed: {var_key}: "{con_value}" {error_text}') + if con_value: + error_text = f': "{con_value}" {error_text}' + logger.trace(f'Condition {i} Failed: {var_key}{error_text}') condition_passed = False if condition_passed: logger.debug(f'Conditional Variable: {final_key} is "{condition["value"]}"') diff --git a/modules/util.py b/modules/util.py index e9d9aabf..befd4716 100644 --- a/modules/util.py +++ b/modules/util.py @@ -711,7 +711,7 @@ def parse_and_or(error, attribute, data, test_list): raise Failed(f"{error} Error: Cannot have a blank {attribute}") if str(item) not in test_list: raise Failed(f"{error} Error: {attribute} {item} is invalid") - or_num.append(test_list[str(item)]) + or_num.append(str(test_list[str(item)])) if final: final += "," final += "|".join(or_num)