[24] versions fix

This commit is contained in:
meisnate12 2023-01-24 17:03:30 -05:00
parent eb6b17d7eb
commit 7876bee41b
5 changed files with 12 additions and 28 deletions

View file

@ -1 +1 @@
1.18.3-develop23 1.18.3-develop24

View file

@ -12,6 +12,11 @@ external_templates:
default: default:
vertical_align: top vertical_align: top
conditionals: conditionals:
horizontal_align:
default: right
conditions:
- overlay_level: episode
value: center
vertical_offset: vertical_offset:
default: 15 default: 15
conditions: conditions:
@ -34,11 +39,6 @@ external_templates:
value: 0 value: 0
- horizontal_align: [left, right] - horizontal_align: [left, right]
value: 15 value: 15
horizontal_align:
default: right
conditions:
- overlay_level: episode
value: center
back_color: "#00000099" back_color: "#00000099"
back_width: 105 back_width: 105
back_height: 105 back_height: 105

View file

@ -1,24 +1,5 @@
# Frequently Asked Questions & Knowledgebase # 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). 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 ## Frequently Asked Questions

View file

@ -378,6 +378,7 @@ class DataFile:
if var_key == "value": if var_key == "value":
continue continue
error_text = "" error_text = ""
con_value = ""
var_key = replace_var(var_key, [variables, default]) var_key = replace_var(var_key, [variables, default])
var_value = replace_var(var_value, [variables, default]) var_value = replace_var(var_value, [variables, default])
if var_key.endswith(".exists"): if var_key.endswith(".exists"):
@ -403,9 +404,11 @@ class DataFile:
elif str(con_value) != str(var_value): elif str(con_value) != str(var_value):
error_text = f'is not "{var_value}"' error_text = f'is not "{var_value}"'
else: 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: 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 condition_passed = False
if condition_passed: if condition_passed:
logger.debug(f'Conditional Variable: {final_key} is "{condition["value"]}"') logger.debug(f'Conditional Variable: {final_key} is "{condition["value"]}"')

View file

@ -711,7 +711,7 @@ def parse_and_or(error, attribute, data, test_list):
raise Failed(f"{error} Error: Cannot have a blank {attribute}") raise Failed(f"{error} Error: Cannot have a blank {attribute}")
if str(item) not in test_list: if str(item) not in test_list:
raise Failed(f"{error} Error: {attribute} {item} is invalid") 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: if final:
final += "," final += ","
final += "|".join(or_num) final += "|".join(or_num)