mirror of
https://github.com/jokob-sk/NetAlertX.git
synced 2025-12-06 17:15:38 -08:00
BE: name resolution did not apply regex cleanup
Signed-off-by: jokob-sk <jokob.sk@gmail.com>
This commit is contained in:
@@ -381,10 +381,12 @@ def get_setting_value(key):
|
||||
value = setting_value_to_python_type(set_type, set_value)
|
||||
else:
|
||||
value = setting_value_to_python_type(set_type, str(set_value))
|
||||
|
||||
SETTINGS_SECONDARYCACHE[key] = value
|
||||
|
||||
return value
|
||||
|
||||
# Otherwise fall back to retrive from json
|
||||
# Otherwise fall back to retrieve from json
|
||||
setting = get_setting(key)
|
||||
|
||||
if setting is not None:
|
||||
@@ -458,9 +460,6 @@ def setting_value_to_python_type(set_type, set_value):
|
||||
if isinstance(set_value, str):
|
||||
try:
|
||||
value = json.loads(set_value.replace("'", "\""))
|
||||
|
||||
# reverse transformations to all entries
|
||||
value = reverseTransformers(value, transformers)
|
||||
|
||||
except json.JSONDecodeError as e:
|
||||
mylog('none', [f'[setting_value_to_python_type] Error decoding JSON object: {e}'])
|
||||
@@ -470,6 +469,9 @@ def setting_value_to_python_type(set_type, set_value):
|
||||
elif isinstance(set_value, list):
|
||||
value = set_value
|
||||
|
||||
# Always apply transformers (base64, etc.) to array entries
|
||||
value = reverseTransformers(value, transformers)
|
||||
|
||||
elif dataType == 'object' and elementType == 'input':
|
||||
if isinstance(set_value, str):
|
||||
try:
|
||||
|
||||
@@ -72,6 +72,7 @@ class NameResolver:
|
||||
name += " (IP match)"
|
||||
|
||||
regexes = get_setting_value('NEWDEV_NAME_CLEANUP_REGEX') or []
|
||||
mylog('trace', [f"[cleanDeviceName] applying regexes: {regexes}"])
|
||||
for rgx in regexes:
|
||||
mylog('trace', [f"[cleanDeviceName] applying regex: {rgx}"])
|
||||
name = re.sub(rgx, "", name)
|
||||
|
||||
Reference in New Issue
Block a user