v2.1.26

Add user_email parameter for notifications

CHANGELOG.md

@@ -1,5 +1,26 @@
 # 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:
+  * Fix: Audio and video codec showing up as * on the activity cards.
+  * New: Poster and background image on the activity cards for live TV.
+* UI:
+  * Fix: Alert message for invalid Tautulli Public Domain setting.
+
+
 ## v2.1.24-beta (2018-10-29)
 
 * Monitoring:

data/interfaces/default/current_activity_instance.html

@@ -80,7 +80,9 @@ DOCUMENTATION :: END
      data-rating_key="${data['rating_key']}" data-parent_rating_key="${data['parent_rating_key']}" data-grandparent_rating_key="${data['grandparent_rating_key']}">
     <div class="dashboard-activity-container">
         <%
-            if data['channel_stream'] == 0:
+            if data['live'] == 1:
+                background_url = 'images/art-live.png'
+            elif data['channel_stream'] == 0:
                 background_url = 'pms_image_proxy?img=' + data['art'] + '&width=500&height=280&opacity=40&background=282828&blur=3&fallback=art&refresh=true'
             else:
                 if (data['art'] and data['art'].startswith('http')) or (data['thumb'] and data['thumb'].startswith('http')):
@@ -93,7 +95,9 @@ DOCUMENTATION :: END
                 % if data['media_type'] == 'track':
                 <div id="poster-${sk}-bg" class="dashboard-activity-poster" style="background-image: url(pms_image_proxy?img=${data['parent_thumb']}&width=300&height=300&opacity=60&background=282828&blur=3&fallback=cover&refresh=true);"></div>
                 % endif
-                % if data['channel_stream'] == 0:
+                % if data['live'] == 1:
+                    <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(images/poster-live.png);"></div>
+                % elif data['channel_stream'] == 0:
                     % if data['media_type'] == 'movie':
                     <a id="poster-url-${sk}" href="${href}" title="${data['title']}">
                         <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=300&height=450&fallback=poster&refresh=true);"></div>
@@ -113,7 +117,7 @@ DOCUMENTATION :: END
                         <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(pms_image_proxy?img=${data['parent_thumb'] or data['thumb']}&width=300&height=450&fallback=poster&refresh=true);"></div>
                         % endif
                     % else:
-                    <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(images/art.png);"></div>
+                    <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(images/poster.png);"></div>
                     % endif
                 % else:
                     % if data['channel_icon'].startswith('http'):

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')}"
                 };
             }

data/interfaces/default/settings.html

@@ -472,7 +472,7 @@
                                 <div class="col-md-8">
                                     <input type="text" class="form-control" id="http_base_url" name="http_base_url" value="${config['http_base_url']}" placeholder="http://mydomain.com" data-parsley-trigger="change" data-parsley-pattern="^https?:\/\/\S+$" data-parsley-errors-container="#http_base_url_error"  data-parsley-error-message="Invalid URL">
                                 </div>
-                                <div id=http_base_url_error" class="alert alert-danger settings-alert" role="alert"></div>
+                                <div id="http_base_url_error" class="alert alert-danger settings-alert" role="alert"></div>
                             </div>
                             <p class="help-block">
                                 Set your public Tautulli domain for self-hosted notification images and newsletters. (e.g. http://mydomain.com)

data/interfaces/default/stream_data.html

@@ -230,7 +230,7 @@ DOCUMENTATION :: END
                 <tbody>
                     <tr>
                         <td>Codec</td>
-                        <td>${data['stream_subtitle_codec'].upper()}</td>
+                        <td>${data['stream_subtitle_codec'].upper() or '-'}</td>
                         <td>${data['subtitle_codec'].upper()}</td>
                     </tr>
                 </tbody>

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/pmsconnect.py

@@ -1888,6 +1888,18 @@ class PmsConnect(object):
 
         stream_details['transcode_decision'] = transcode_decision
 
+        # Override * in audio codecs
+        if stream_details['stream_audio_codec'] == '*':
+            stream_details['stream_audio_codec'] = source_audio_details['audio_codec']
+        if transcode_details['transcode_audio_codec'] == '*':
+            transcode_details['transcode_audio_codec'] = source_audio_details['audio_codec']
+
+        # Override * in video codecs
+        if stream_details['stream_video_codec'] == '*':
+            stream_details['stream_video_codec'] = source_video_details['video_codec']
+        if transcode_details['transcode_video_codec'] == '*':
+            transcode_details['transcode_video_codec'] = source_video_details['video_codec']
+
         # Get the quality profile
         if media_type in ('movie', 'episode', 'clip') and 'stream_bitrate' in stream_details:
             if sync_id:

plexpy/version.py

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