Plex
/
Plex-Meta-Manager
mirror of https://github.com/meisnate12/Plex-Meta-Manager.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[7] fix string casting

Browse Source
pull/1018/head
meisnate12 2 years ago
parent 34779702cb
commit 58e8aef2c9
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File

2
VERSION
Unescape View File

@ -1 +1 @@
1.17.3-develop6 1.17.3-develop7

19
modules/meta.py
Unescape View File

@ -165,13 +165,16 @@ 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))
def replace_var(input_item, search_dict): def replace_var(input_item, search_dicts):
return_item = str(input_item) if not isinstance(search_dicts, list):
search_dicts = [search_dicts]
return_item = input_item
for search_dict in search_dicts:
for rk, rv in search_dict.items(): for rk, rv in search_dict.items():
if f"<<{rk}>>" == return_item: if f"<<{rk}>>" == str(return_item):
return_item = rv return_item = rv
if f"<<{rk}>>" in return_item: if f"<<{rk}>>" in str(return_item):
return_item = return_item.replace(f"<<{rk}>>", str(rv)) return_item = str(return_item).replace(f"<<{rk}>>", str(rv))
return return_item return return_item
ini_default = {} ini_default = {}
@ -213,7 +216,7 @@ class DataFile:
logger.debug(f"Conditional: {con_key}") logger.debug(f"Conditional: {con_key}")
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")
final_key = replace_var(replace_var(con_key, variables), default) final_key = replace_var(con_key, [variables, default])
if final_key != con_key: if final_key != con_key:
logger.debug(f"Variable: {final_key}") logger.debug(f"Variable: {final_key}")
if final_key in variables: if final_key in variables:
@ -235,8 +238,8 @@ class DataFile:
for var_key, var_value in condition.items(): for var_key, var_value in condition.items():
if var_key == "value": if var_key == "value":
continue continue
var_key = replace_var(replace_var(var_key, variables), default) var_key = replace_var(var_key, [variables, default])
var_value = replace_var(replace_var(var_value, variables), default) var_value = replace_var(var_value, [variables, default])
if var_key in variables: if var_key in variables:
if (isinstance(var_value, list) and variables[var_key] not in var_value) or \ if (isinstance(var_value, list) and variables[var_key] not in var_value) or \
(not isinstance(var_value, list) and variables[var_key] != var_value): (not isinstance(var_value, list) and variables[var_key] != var_value):

Write Preview
Loading…
Cancel
Save