github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-14 09:12:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'nightly' into python3

Browse source 
# Conflicts:
#	plexpy/notification_handler.py
This commit is contained in:
JonnyWong16 2019-12-11 11:39:59 -08:00
commit 411d88d798
2 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plexpy/helpers.py
View file

@ -586,7 +586,7 @@ def get_ip(host):
ip_address = '' ip_address = ''
if is_valid_ip(host): if is_valid_ip(host):
return host return host
elif not re.fullmatch(r'[0-9]+(?:\.[0-9]+){3}(?!\d*-[a-z0-9]{6})', host): elif not re.match(r'^[0-9]+(?:\.[0-9]+){3}(?!\d*-[a-z0-9]{6})$', host):
try: try:
ip_address = socket.getaddrinfo(host, None)[0][4][0] ip_address = socket.getaddrinfo(host, None)[0][4][0]
logger.debug("IP Checker :: Resolved %s to %s." % (host, ip_address)) logger.debug("IP Checker :: Resolved %s to %s." % (host, ip_address))

29
plexpy/notification_handler.py
View file

@ -101,6 +101,8 @@ def add_notifier_each(notifier_id=None, notify_action=None, stream_data=None, ti
notifiers_enabled = notifiers.get_notifiers(notify_action=notify_action) notifiers_enabled = notifiers.get_notifiers(notify_action=notify_action)
if notifiers_enabled and not manual_trigger: if notifiers_enabled and not manual_trigger:
logger.debug("Tautulli NotificationHandler :: Notifiers enabled for notify_action '%s'." % notify_action)
# Check if notification conditions are satisfied # Check if notification conditions are satisfied
conditions = notify_conditions(notify_action=notify_action, conditions = notify_conditions(notify_action=notify_action,
stream_data=stream_data, stream_data=stream_data,
@ -109,6 +111,9 @@ def add_notifier_each(notifier_id=None, notify_action=None, stream_data=None, ti
conditions = True conditions = True
if notifiers_enabled and (manual_trigger or conditions): if notifiers_enabled and (manual_trigger or conditions):
if manual_trigger:
logger.debug("Tautulli NotificationHandler :: Notifiers enabled for notify_action '%s' (manual trigger)." % notify_action)
if stream_data or timeline_data: if stream_data or timeline_data:
# Build the notification parameters # Build the notification parameters
parameters = build_media_notify_params(notify_action=notify_action, parameters = build_media_notify_params(notify_action=notify_action,
@ -149,6 +154,7 @@ def add_notifier_each(notifier_id=None, notify_action=None, stream_data=None, ti
def notify_conditions(notify_action=None, stream_data=None, timeline_data=None): def notify_conditions(notify_action=None, stream_data=None, timeline_data=None):
# Activity notifications # Activity notifications
if stream_data: if stream_data:
logger.debug("Tautulli NotificationHandler :: Checking global notification conditions.")
# Check if notifications enabled for user and library # Check if notifications enabled for user and library
# user_data = users.Users() # user_data = users.Users()
@ -174,36 +180,37 @@ def notify_conditions(notify_action=None, stream_data=None, timeline_data=None):
user_sessions = [s for s in result['sessions'] if s['user_id'] == stream_data['user_id']] user_sessions = [s for s in result['sessions'] if s['user_id'] == stream_data['user_id']]
if plexpy.CONFIG.NOTIFY_CONCURRENT_BY_IP: if plexpy.CONFIG.NOTIFY_CONCURRENT_BY_IP:
return len(Counter(s['ip_address'] for s in user_sessions)) >= plexpy.CONFIG.NOTIFY_CONCURRENT_THRESHOLD evaluated = len(Counter(s['ip_address'] for s in user_sessions)) >= plexpy.CONFIG.NOTIFY_CONCURRENT_THRESHOLD
else: else:
return len(user_sessions) >= plexpy.CONFIG.NOTIFY_CONCURRENT_THRESHOLD evaluated = len(user_sessions) >= plexpy.CONFIG.NOTIFY_CONCURRENT_THRESHOLD
elif notify_action == 'on_newdevice': elif notify_action == 'on_newdevice':
data_factory = datafactory.DataFactory() data_factory = datafactory.DataFactory()
user_devices = data_factory.get_user_devices(user_id=stream_data['user_id']) user_devices = data_factory.get_user_devices(user_id=stream_data['user_id'])
return stream_data['machine_id'] not in user_devices evaluated = stream_data['machine_id'] not in user_devices
elif stream_data['media_type'] in ('movie', 'episode', 'clip'): elif stream_data['media_type'] in ('movie', 'episode', 'clip'):
progress_percent = helpers.get_percent(stream_data['view_offset'], stream_data['duration']) progress_percent = helpers.get_percent(stream_data['view_offset'], stream_data['duration'])
if notify_action == 'on_stop': if notify_action == 'on_stop':
return (plexpy.CONFIG.NOTIFY_CONSECUTIVE or evaluated = (plexpy.CONFIG.NOTIFY_CONSECUTIVE or
(stream_data['media_type'] == 'movie' and progress_percent < plexpy.CONFIG.MOVIE_WATCHED_PERCENT) or (stream_data['media_type'] == 'movie' and progress_percent < plexpy.CONFIG.MOVIE_WATCHED_PERCENT) or
(stream_data['media_type'] == 'episode' and progress_percent < plexpy.CONFIG.TV_WATCHED_PERCENT)) (stream_data['media_type'] == 'episode' and progress_percent < plexpy.CONFIG.TV_WATCHED_PERCENT))
elif notify_action == 'on_resume': elif notify_action == 'on_resume':
return plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < 99 evaluated = plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < 99
# All other activity notify actions # All other activity notify actions
else: else:
return True evaluated = True
elif stream_data['media_type'] == 'track': elif stream_data['media_type'] == 'track':
return True evaluated = True
else: else:
return False evaluated = False
logger.debug("Tautulli NotificationHandler :: Global notification conditions evaluated to '{}'.".format(evaluated))
# Recently Added notifications # Recently Added notifications
elif timeline_data: elif timeline_data:
@ -215,11 +222,13 @@ def notify_conditions(notify_action=None, stream_data=None, timeline_data=None):
# # logger.debug("Tautulli NotificationHandler :: Notifications for library '%s' is disabled." % library_details['section_name']) # # logger.debug("Tautulli NotificationHandler :: Notifications for library '%s' is disabled." % library_details['section_name'])
# return False # return False
return True evaluated = True
# Server notifications # Server notifications
else: else:
return True evaluated = True
return evaluated
def notify_custom_conditions(notifier_id=None, parameters=None): def notify_custom_conditions(notifier_id=None, parameters=None):