github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-11 15:56:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add condition parameter type passed from JS

Browse source
This commit is contained in:
JonnyWong16 2017-07-05 18:47:34 -07:00
parent b1264bedd8
commit d4e5a750e0
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plexpy/notification_handler.py
View file

@ -211,15 +211,13 @@ def notify_custom_conditions(notifier_id=None, parameters=None):
% (custom_conditions_logic, e)) % (custom_conditions_logic, e))
return False return False
param_types = {param['value']: param['type']
for category in common.NOTIFICATION_PARAMETERS for param in category['parameters']}
evaluated_conditions = [None] # Set condition {0} to None evaluated_conditions = [None] # Set condition {0} to None
for condition in custom_conditions: for condition in custom_conditions:
parameter = condition['parameter'] parameter = condition['parameter']
operator = condition['operator'] operator = condition['operator']
values = condition['value'] values = condition['value']
parameter_type = condition['type']
# Set blank conditions to None # Set blank conditions to None
if not parameter or not operator or not values: if not parameter or not operator or not values:
@ -230,8 +228,6 @@ def notify_custom_conditions(notifier_id=None, parameters=None):
if isinstance(values, basestring): if isinstance(values, basestring):
values = [values] values = [values]
parameter_type = param_types[parameter]
# Cast the condition values to the correct type # Cast the condition values to the correct type
try: try:
if parameter_type == 'str': if parameter_type == 'str':
@ -283,12 +279,16 @@ def notify_custom_conditions(notifier_id=None, parameters=None):
elif operator == 'ends with': elif operator == 'ends with':
evaluated_conditions.append(parameter_value.endswith(tuple(values))) evaluated_conditions.append(parameter_value.endswith(tuple(values)))
elif operator == 'greater than': elif operator == 'is greater than':
evaluated_conditions.append(any(parameter_value > c for c in values)) evaluated_conditions.append(any(parameter_value > c for c in values))
elif operator == 'less than': elif operator == 'is less than':
evaluated_conditions.append(any(parameter_value < c for c in values)) evaluated_conditions.append(any(parameter_value < c for c in values))
else:
logger.warn(u"PlexPy NotificationHandler :: Invalid condition operator '%s'." % operator)
evaluated_conditions.append(None)
# Format and evaluate the logic string # Format and evaluate the logic string
try: try:
evaluated_logic = bool(eval(logic_string.format(*evaluated_conditions))) evaluated_logic = bool(eval(logic_string.format(*evaluated_conditions)))