Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 08:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "OP-4465 - updated filter_profiles to handle arrays in values"

Browse source 
This reverts commit b50e609874.
This commit is contained in:
Petr Kalis 2022-12-12 18:13:21 +01:00
parent 3296ac68ef
commit e82f831c5a
1 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
openpype/lib/profiles_filtering.py
View file

@ -79,11 +79,11 @@ def fullmatch(regex, string, flags=0):
return None return None
def validate_value_by_regexes(values, in_list): def validate_value_by_regexes(value, in_list):
"""Validates in any regex from list match entered value. """Validates in any regex from list match entered value.
Args: Args:
values (str|list): String where regexes is checked. value (str): String where regexes is checked.
in_list (list): List with regexes. in_list (list): List with regexes.
Returns: Returns:
@ -102,21 +102,17 @@ def validate_value_by_regexes(values, in_list):
# If value is not set and in list has specific values then resolve value # If value is not set and in list has specific values then resolve value
# as not matching. # as not matching.
if not values: if not value:
return -1 return -1
if isinstance(values, str):
values = [values]
regexes = compile_list_of_regexes(in_list) regexes = compile_list_of_regexes(in_list)
for regex in regexes: for regex in regexes:
for value in values: if hasattr(regex, "fullmatch"):
if hasattr(regex, "fullmatch"): result = regex.fullmatch(value)
result = regex.fullmatch(value) else:
else: result = fullmatch(regex, value)
result = fullmatch(regex, value) if result:
if result: return 1
return 1
return -1 return -1
@ -140,8 +136,7 @@ def filter_profiles(profiles_data, key_values, keys_order=None, logger=None):
Args: Args:
profiles_data (list): Profile definitions as dictionaries. profiles_data (list): Profile definitions as dictionaries.
key_values (dict): Mapping of Key <-> Value|[Value]. key_values (dict): Mapping of Key <-> Value. Key is checked if is
Key is checked if is
available in profile and if Value is matching it's values. available in profile and if Value is matching it's values.
keys_order (list, tuple): Order of keys from `key_values` which matters keys_order (list, tuple): Order of keys from `key_values` which matters
only when multiple profiles have same score. only when multiple profiles have same score.
@ -186,12 +181,12 @@ def filter_profiles(profiles_data, key_values, keys_order=None, logger=None):
profile_scores = [] profile_scores = []
for key in keys_order: for key in keys_order:
values = key_values[key] value = key_values[key]
match = validate_value_by_regexes(values, profile.get(key)) match = validate_value_by_regexes(value, profile.get(key))
if match == -1: if match == -1:
profile_value = profile.get(key) or [] profile_value = profile.get(key) or []
logger.debug( logger.debug(
"\"{}\" not found in \"{}\": {}".format(values, key, "\"{}\" not found in \"{}\": {}".format(value, key,
profile_value) profile_value)
) )
profile_points = -1 profile_points = -1