Merge f3f031bd9c into f7bc208fd1

data/interfaces/default/history_table_modal.html

@@ -38,6 +38,7 @@
             type: "post",
             data: function ( d ) {
                 return { 'json_data': JSON.stringify( d ),
+                         'grouping': false,
                          'start_date': '${data}'
                        };
             }

data/interfaces/default/settings.html

@@ -496,6 +496,12 @@ available_notification_agents = notifiers.available_notification_agents()
                             </div>
                             <p class="help-block">Set the progress percentage of when a watched notification should be triggered. Minimum 50, Maximum 95.</p>
                         </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" name="notify_consecutive" id="notify_consecutive" value="1" ${config['notify_consecutive']}> Allow Consecutive Notifications
+                            </label>
+                            <p class="help-block">Disable to prevent consecutive notifications (i.e. both watched &amp; stopped notifications).</p>
+                        </div>
 
                         <div class="padded-header">
                             <h3>Custom Notification Messages</h3>

plexpy/activity_handler.py

@@ -1,4 +1,4 @@
-# This file is part of PlexPy.
+# This file is part of PlexPy.
 #
 #  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 import time
 import plexpy
 
-from plexpy import logger, pmsconnect, activity_processor, threading, notification_handler
+from plexpy import logger, pmsconnect, activity_processor, threading, notification_handler, helpers
 
 
 class ActivityHandler(object):
@@ -83,6 +83,8 @@ class ActivityHandler(object):
             db_session = ap.get_session_by_key(session_key=self.get_session_key())
 
             # Fire off notifications
+            progress_percent = helpers.get_percent(self.timeline['viewOffset'], db_session['duration'])
+            if plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < plexpy.CONFIG.NOTIFY_WATCHED_PERCENT:
                 threading.Thread(target=notification_handler.notify,
                                  kwargs=dict(stream_data=db_session, notify_action='stop')).start()
 
@@ -110,6 +112,8 @@ class ActivityHandler(object):
             db_session = ap.get_session_by_key(session_key=self.get_session_key())
 
             # Fire off notifications
+            progress_percent = helpers.get_percent(self.timeline['viewOffset'], db_session['duration'])
+            if plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < 99:
                 threading.Thread(target=notification_handler.notify,
                                 kwargs=dict(stream_data=db_session, notify_action='pause')).start()
 
@@ -130,6 +134,8 @@ class ActivityHandler(object):
             db_session = ap.get_session_by_key(session_key=self.get_session_key())
 
             # Fire off notifications
+            progress_percent = helpers.get_percent(self.timeline['viewOffset'], db_session['duration'])
+            if plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < 99:
                 threading.Thread(target=notification_handler.notify,
                                  kwargs=dict(stream_data=db_session, notify_action='resume')).start()
 
@@ -165,8 +171,6 @@ class ActivityHandler(object):
     # This function receives events from our websocket connection
     def process(self):
         if self.is_valid_session():
-            from plexpy import helpers
-
             ap = activity_processor.ActivityProcessor()
             db_session = ap.get_session_by_key(session_key=self.get_session_key())
 

plexpy/activity_pinger.py

@@ -1,4 +1,4 @@
-# This file is part of PlexPy.
+# This file is part of PlexPy.
 #
 #  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -48,6 +48,12 @@ def check_active_sessions(ws_request=False):
             for stream in db_streams:
                 if any(d['session_key'] == str(stream['session_key']) and d['rating_key'] == str(stream['rating_key'])
                        for d in media_container):
+
+                    if stream['view_offset'] and stream['duration']:
+                        progress_percent = helpers.get_percent(stream['view_offset'], stream['duration'])
+                    else:
+                        progress_percent = None
+
                     # The user's session is still active
                     for session in media_container:
                         if session['session_key'] == str(stream['session_key']) and \
@@ -55,13 +61,15 @@ def check_active_sessions(ws_request=False):
                             # The user is still playing the same media item
                             # Here we can check the play states
                             if session['state'] != stream['state']:
-                                if session['state'] == 'paused':
+                                if session['state'] == 'paused' \
+                                    and (plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < 99):
                                     # Push any notifications -
                                     # Push it on it's own thread so we don't hold up our db actions
                                     threading.Thread(target=notification_handler.notify,
                                                      kwargs=dict(stream_data=stream, notify_action='pause')).start()
 
-                                if session['state'] == 'playing' and stream['state'] == 'paused':
+                                if session['state'] == 'playing' and stream['state'] == 'paused' \
+                                    and (plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < 99):
                                     # Push any notifications -
                                     # Push it on it's own thread so we don't hold up our db actions
                                     threading.Thread(target=notification_handler.notify,
@@ -126,9 +134,7 @@ def check_active_sessions(ws_request=False):
                             # Check if the user has reached the offset in the media we defined as the "watched" percent
                             # Don't trigger if state is buffer as some clients push the progress to the end when
                             # buffering on start.
-                            if session['view_offset'] and session['duration'] and session['state'] != 'buffering':
+                            if progress_percent >= plexpy.CONFIG.NOTIFY_WATCHED_PERCENT and session['state'] != 'buffering':
-                                if helpers.get_percent(session['view_offset'],
-                                                       session['duration']) > plexpy.CONFIG.NOTIFY_WATCHED_PERCENT:
                                 # Push any notifications -
                                 # Push it on it's own thread so we don't hold up our db actions
                                 threading.Thread(target=notification_handler.notify,
@@ -141,15 +147,18 @@ def check_active_sessions(ws_request=False):
                     monitor_db.action('DELETE FROM sessions WHERE session_key = ? AND rating_key = ?',
                                       [stream['session_key'], stream['rating_key']])
 
-                    # Check if the user has reached the offset in the media we defined as the "watched" percent
                     if stream['view_offset'] and stream['duration']:
-                        if helpers.get_percent(stream['view_offset'],
+                        progress_percent = helpers.get_percent(stream['view_offset'], stream['duration'])
-                                               stream['duration']) > plexpy.CONFIG.NOTIFY_WATCHED_PERCENT:
+                    else:
+                        progress_percent = None
+
+                    # Check if the user has reached the offset in the media we defined as the "watched" percent
+                    if plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent >= plexpy.CONFIG.NOTIFY_WATCHED_PERCENT:
                         # Push any notifications -
                         # Push it on it's own thread so we don't hold up our db actions
                         threading.Thread(target=notification_handler.notify,
                                             kwargs=dict(stream_data=stream, notify_action='watched')).start()
-
+                    if plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < plexpy.CONFIG.NOTIFY_WATCHED_PERCENT:
                         # Push any notifications - Push it on it's own thread so we don't hold up our db actions
                         threading.Thread(target=notification_handler.notify,
                                          kwargs=dict(stream_data=stream, notify_action='stop')).start()

plexpy/config.py

@@ -122,6 +122,7 @@ _CONFIG_DEFINITIONS = {
     'NMA_ON_RESUME': (int, 'NMA', 0),
     'NMA_ON_BUFFER': (int, 'NMA', 0),
     'NMA_ON_WATCHED': (int, 'NMA', 0),
+    'NOTIFY_CONSECUTIVE': (int, 'Monitoring', 1),
     'NOTIFY_WATCHED_PERCENT': (int, 'Monitoring', 85),
     'NOTIFY_ON_START_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'),
     'NOTIFY_ON_START_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) started playing {title}.'),

plexpy/webserve.py

@@ -439,6 +439,7 @@ class WebInterface(object):
             "music_logging_enable": checked(plexpy.CONFIG.MUSIC_LOGGING_ENABLE),
             "logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL,
             "pms_is_remote": checked(plexpy.CONFIG.PMS_IS_REMOTE),
+            "notify_consecutive": checked(plexpy.CONFIG.NOTIFY_CONSECUTIVE),
             "notify_watched_percent": plexpy.CONFIG.NOTIFY_WATCHED_PERCENT,
             "notify_on_start_subject_text": plexpy.CONFIG.NOTIFY_ON_START_SUBJECT_TEXT,
             "notify_on_start_body_text": plexpy.CONFIG.NOTIFY_ON_START_BODY_TEXT,
@@ -476,7 +477,7 @@ class WebInterface(object):
             "tv_notify_on_stop", "movie_notify_on_stop", "music_notify_on_stop",
             "tv_notify_on_pause", "movie_notify_on_pause", "music_notify_on_pause", "refresh_users_on_startup",
             "ip_logging_enable", "video_logging_enable", "music_logging_enable", "pms_is_remote", "home_stats_type",
-            "group_history_tables"
+            "group_history_tables", "notify_consecutive"
         ]
         for checked_config in checked_configs:
             if checked_config not in kwargs: