v2.1.26

Add user_email parameter for notifications

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## v2.1.26 (2018-12-01)
+
+* Monitoring:
+  * Fix: Resume event not being triggered after buffering.
+* Notifications:
+  * New: Added user email as a notification parameter.
+* Graphs:
+  * Fix: History model showing no results for stream info graph.
+* API:
+  * Fix: API returning error when missing a cmd.
+
+
 ## v2.1.25 (2018-11-03)
 
 * Monitoring:

data/interfaces/default/history_table_modal.html

@@ -54,7 +54,7 @@
                     json_data: JSON.stringify(d),
                     user_id: "${data['user_id']}",
                     start_date: "${data['start_date']}",
-                    media_type: "${data.get('media_type')}",
+                    media_type: "${data.get('media_type') or 'all'}",
                     transcode_decision: "${data.get('transcode_decision')}"
                 };
             }

plexpy/activity_handler.py

@@ -266,6 +266,7 @@ class ActivityHandler(object):
                 last_rating_key = str(db_session['rating_key'])
                 last_live_uuid = db_session['live_uuid']
                 last_transcode_key = db_session['transcode_key'].split('/')[-1]
+                last_paused = db_session['last_paused']
 
                 # Make sure the same item is being played
                 if this_rating_key == last_rating_key or this_live_uuid == last_live_uuid:
@@ -280,7 +281,7 @@ class ActivityHandler(object):
                     if this_state != last_state:
                         if this_state == 'paused':
                             self.on_pause()
-                        elif last_state == 'paused' and this_state == 'playing':
+                        elif last_paused and this_state == 'playing':
                             self.on_resume()
                         elif this_state == 'stopped':
                             self.on_stop()

plexpy/api2.py

@@ -598,7 +598,7 @@ General optional parameters:
         if self._api_cmd == 'docs_md':
             return out['response']['data']
 
-        elif self._api_cmd.startswith('download_'):
+        elif self._api_cmd and self._api_cmd.startswith('download_'):
             return
 
         elif self._api_cmd == 'pms_image_proxy':

plexpy/common.py

@@ -331,6 +331,7 @@ NOTIFICATION_PARAMETERS = [
              {'name': 'User Streams', 'type': 'int', 'value': 'user_streams', 'description': 'The number of concurrent streams by the person streaming.'},
              {'name': 'User', 'type': 'str', 'value': 'user', 'description': 'The friendly name of the person streaming.'},
              {'name': 'Username', 'type': 'str', 'value': 'username', 'description': 'The username of the person streaming.'},
+             {'name': 'User Email', 'type': 'str', 'value': 'user_email', 'description': 'The email address of the person streaming.'},
              {'name': 'Device', 'type': 'str', 'value': 'device', 'description': 'The type of client device being used for playback.'},
              {'name': 'Platform', 'type': 'str', 'value': 'platform', 'description': 'The type of client platform being used for playback.'},
              {'name': 'Product', 'type': 'str', 'value': 'product', 'description': 'The type of client product being used for playback.'},

plexpy/notification_handler.py

@@ -749,6 +749,7 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, m
         'user_streams': user_stream_count,
         'user': notify_params['friendly_name'],
         'username': notify_params['user'],
+        'user_email': notify_params['email'],
         'device': notify_params['device'],
         'platform': notify_params['platform'],
         'product': notify_params['product'],

plexpy/version.py

@@ -1,2 +1,2 @@
-PLEXPY_BRANCH = "beta"
-PLEXPY_RELEASE_VERSION = "v2.1.25"
+PLEXPY_BRANCH = "master"
+PLEXPY_RELEASE_VERSION = "v2.1.26"