mirror of
https://github.com/meisnate12/Plex-Meta-Manager
synced 2024-09-20 14:31:59 +00:00
[17] fix conditionals
This commit is contained in:
parent
c57497ba15
commit
397621df3a
2 changed files with 25 additions and 24 deletions
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
||||||
1.17.1-develop16
|
1.17.1-develop17
|
||||||
|
|
|
@ -156,7 +156,6 @@ class DataFile:
|
||||||
for key, value in variables.copy().items():
|
for key, value in variables.copy().items():
|
||||||
variables[f"{key}_encoded"] = requests.utils.quote(str(value))
|
variables[f"{key}_encoded"] = requests.utils.quote(str(value))
|
||||||
|
|
||||||
conditional = {}
|
|
||||||
default = {}
|
default = {}
|
||||||
def add_default(d_key, d_value):
|
def add_default(d_key, d_value):
|
||||||
for v_key, v_value in variables.items():
|
for v_key, v_value in variables.items():
|
||||||
|
@ -165,6 +164,15 @@ class DataFile:
|
||||||
default[d_key] = d_value
|
default[d_key] = d_value
|
||||||
default[f"{d_key}_encoded"] = requests.utils.quote(str(d_value))
|
default[f"{d_key}_encoded"] = requests.utils.quote(str(d_value))
|
||||||
|
|
||||||
|
def small_var_check(var_check):
|
||||||
|
for var_k, var_v in variables.items():
|
||||||
|
if f"<<{var_k}>>" in str(var_check):
|
||||||
|
var_check = str(var_check).replace(f"<<{var_k}>>", str(var_v))
|
||||||
|
for var_k, var_v in default.items():
|
||||||
|
if f"<<{var_k}>>" in str(var_check):
|
||||||
|
var_check = str(var_check).replace(f"<<{var_k}>>", str(var_v))
|
||||||
|
return var_check
|
||||||
|
|
||||||
if "default" in template:
|
if "default" in template:
|
||||||
if not template["default"]:
|
if not template["default"]:
|
||||||
raise Failed(f"{self.data_type} Error: template sub-attribute default is blank")
|
raise Failed(f"{self.data_type} Error: template sub-attribute default is blank")
|
||||||
|
@ -177,13 +185,6 @@ class DataFile:
|
||||||
final_key = final_key.replace(f"<<{k}>>", str(v))
|
final_key = final_key.replace(f"<<{k}>>", str(v))
|
||||||
if final_key not in optional:
|
if final_key not in optional:
|
||||||
final_value = template["default"][dv]
|
final_value = template["default"][dv]
|
||||||
if isinstance(final_value, dict):
|
|
||||||
if "variable" not in final_value:
|
|
||||||
raise Failed(f"{self.data_type} Error: variable sub-attribute required when the default variable is a dictionary")
|
|
||||||
if "values" not in final_value:
|
|
||||||
raise Failed(f"{self.data_type} Error: values sub-attribute required when the default variable is a dictionary")
|
|
||||||
conditional[final_key] = final_value
|
|
||||||
else:
|
|
||||||
add_default(final_key, final_value)
|
add_default(final_key, final_value)
|
||||||
|
|
||||||
if "optional" in template:
|
if "optional" in template:
|
||||||
|
@ -208,9 +209,7 @@ class DataFile:
|
||||||
for con_key, con_value in template["conditionals"].items():
|
for con_key, con_value in template["conditionals"].items():
|
||||||
if not isinstance(con_value, dict):
|
if not isinstance(con_value, dict):
|
||||||
raise Failed(f"{self.data_type} Error: template sub-attribute conditionals is not a dictionary")
|
raise Failed(f"{self.data_type} Error: template sub-attribute conditionals is not a dictionary")
|
||||||
for k, v in variables.items():
|
con_key = small_var_check(con_key)
|
||||||
if f"<<{k}>>" in con_key:
|
|
||||||
con_key = con_key.replace(f"<<{k}>>", str(v))
|
|
||||||
if con_key in variables:
|
if con_key in variables:
|
||||||
continue
|
continue
|
||||||
if "conditions" not in con_value:
|
if "conditions" not in con_value:
|
||||||
|
@ -227,17 +226,19 @@ class DataFile:
|
||||||
if "value" not in condition:
|
if "value" not in condition:
|
||||||
raise Failed(f"{self.data_type} Error: each condition must have a result value")
|
raise Failed(f"{self.data_type} Error: each condition must have a result value")
|
||||||
condition_passed = True
|
condition_passed = True
|
||||||
for var_key, var_value in condition:
|
for var_key, var_value in condition.items():
|
||||||
if var_key == "value":
|
if var_key == "value":
|
||||||
continue
|
continue
|
||||||
for k, v in variables.items():
|
var_key = small_var_check(var_key)
|
||||||
if f"<<{k}>>" in var_key:
|
var_value = small_var_check(var_value)
|
||||||
var_key = var_key.replace(f"<<{k}>>", str(v))
|
if var_key in variables:
|
||||||
if f"<<{k}>>" in str(var_value):
|
if (isinstance(var_value, list) and variables[var_key] not in var_value) or \
|
||||||
var_value = str(var_value).replace(f"<<{k}>>", str(v))
|
(not isinstance(var_value, list) and variables[var_key] != var_value):
|
||||||
if var_key not in variables or \
|
condition_passed = False
|
||||||
(not isinstance(var_value, list) and variables[var_key] != var_value) or \
|
break
|
||||||
(isinstance(var_value, list) and variables[var_key] not in var_value):
|
elif var_key in default:
|
||||||
|
if (isinstance(var_value, list) and default[var_key] not in var_value) or \
|
||||||
|
(not isinstance(var_value, list) and default[var_key] != var_value):
|
||||||
condition_passed = False
|
condition_passed = False
|
||||||
break
|
break
|
||||||
if condition_passed:
|
if condition_passed:
|
||||||
|
|
Loading…
Reference in a new issue