Merge branch 'dev'

Change Plex click through to app.plex.tv instead of local IP

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## v1.1.8 (2015-09-09)
+
+* Add platform images for Windows devices. Thanks @JonnyWong.
+* Add click-through to PlexWeb preplay page from info page. Thanks @JonnyWong. 
+* Fix broken delete option on info pages. Thanks @JonnyWong.
+* Fix tagline bug in PlexWatch db import tool.
+* Fix home stats text overflow bug. Thanks @JonnyWong.
+
+
+## v1.1.7 (2015-09-07)
+
+* Show tagline in info screens for movies. Thanks @JonnyWong.
+* Add play/pause/buffer icon to activity pane. Thanks @JonnyWong.
+* Add transcoder info in activity pane info. Thanks @JonnyWong.
+* Show transcoder progress on activity progress bar. Thanks @JonnyWong.
+* Fix bug where custom notification strings would be ignored if unicode characters were present.
+* Fix text overflow issue on home stats cards. Thanks @JonnyWong.
+* Fix regression with user friendly name change input in edit screen. Thanks @JonnyWong.
+
+
 ## v1.1.6 (2015-09-06)
 
 * Home stats cards are now expandable to show multiple items. Configurable in settings. Thanks @JonnyWong.

README.md

@@ -1,5 +1,7 @@
 #PlexPy
 
+[![Join the chat at https://gitter.im/drzoidberg33/plexpy](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/drzoidberg33/plexpy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 A python based web application for monitoring, analytics and notifications for Plex Media Server (www.plex.tv).
 
 This project is based on code from Headphones (https://github.com/rembo10/headphones) and PlexWatchWeb (https://github.com/ecleese/plexWatchWeb).

data/interfaces/default/css/plexpy.css

@@ -683,6 +683,13 @@ a:hover .dashboard-activity-poster {
     -webkit-transition: all 0s;
     transition: all 0s;
 }
+.dashboard-activity-progress .bufferbar {
+    padding-top: 6px;
+    background-color: #444;
+    position: absolute;
+    height: 6px;
+    overflow: hidden;
+}
 .dashboard-activity-progress .bar {
     padding-top: 6px;
     background-color: #faa732;
@@ -693,6 +700,9 @@ a:hover .dashboard-activity-poster {
     background-image: linear-gradient(to bottom, #fbb450, #f89406);
     background-repeat: repeat-x;
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+    position: absolute;
+    height: 6px;
+    overflow: hidden;
 }
 .dashboard-activity-metadata-wrapper {
     position: relative;
@@ -963,11 +973,40 @@ a .dashboard-activity-metadata-user-thumb:hover {
     overflow: hidden;
     z-index: 1;
 }
-a .summary-poster-face:hover,
+.summary-poster-face-overlay {
-a .summary-poster-face-episode:hover {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    background-image: -webkit-gradient(linear,left 0,left 100%,from(rgba(0,0,0,.7)),to(rgba(0,0,0,.9)));
+    background-image: -webkit-linear-gradient(top,rgba(0,0,0,.7),0,rgba(0,0,0,.9),100%);
+    background-image: -moz-linear-gradient(top,rgba(0,0,0,.7) 0,rgba(0,0,0,.9) 100%);
+    background-image: linear-gradient(to bottom,rgba(0,0,0,.7) 0,rgba(0,0,0,.9) 100%);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b3000000', endColorstr='#e6000000', GradientType=0);
     webkit-box-shadow: inset 0 0 0 2px #e9a049;
     -moz-box-shadow: inset 0 0 0 2px #e9a049;
     box-shadow: inset 0 0 0 2px #e9a049;
+    opacity: 0;
+    transition: opacity .2s;
+}
+.summary-poster-face-overlay span {
+    display: block;
+    width: 100%;
+    height: 100%;
+    background-image: url(/interfaces/default/images/plex-logo-light.svg);
+    background-size: 100px;
+    background-repeat: no-repeat;
+    background-position: center;
+    opacity: 0;
+    transition: opacity .3s;
+}
+a:hover .summary-poster-face .summary-poster-face-overlay,
+a:hover .summary-poster-face-episode .summary-poster-face-overlay,
+a:hover .summary-poster-face .summary-poster-face-overlay span,
+a:hover .summary-poster-face-episode .summary-poster-face-overlay span {
+    opacity: 1;
 }
 .summary-content-padding {
     float: left;
@@ -1541,6 +1580,7 @@ a .season-episodes-card-overlay:hover {
     -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
     -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
     box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    white-space: nowrap;
 }
 .home-platforms-instance li {
     position: relative;
@@ -1553,7 +1593,6 @@ a .season-episodes-card-overlay:hover {
     height: 120px;
 }
 .home-platforms-instance-name {
-    float: left;
     color: #fff;
     text-overflow: ellipsis;
     overflow: hidden;
@@ -1565,53 +1604,21 @@ a .season-episodes-card-overlay:hover {
     padding: 0 0 0 20px;
 }
 .home-platforms-instance-name h4 {
-    margin: 10px 0 20px 0;
+    margin: 10px 0 4px 0;
-}
-.home-platforms-instance-name h5 {
-    font-size: 14px;
-    line-height: 16px;
-    margin: 15px 0 2px 0;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.home-platforms-instance-name2 {
-    position: absolute;
-    top: 34px;
-    left: 215px;
-}
-.home-platforms-instance-name2 h5 {
-    font-size: 14px;
-    line-height: 16px;
-    margin: 15px 0 2px 0;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.home-platforms-instance-name2 h3 {
-    font-size: 30px;
-    font-weight: bold;
-    color: #F9AA03;
-    line-height: 22px;
-    position: relative;
-    top: 5px;
-    margin: 0 5px 0 0;
-    padding-top: 6px;
-    float: left;
-}
-.home-platforms-instance-name2 p {
-    color: #aaa;
-    font-size: 12px;
-    float: left;
-    position: relative;
-    top: 21px;
-    left: 0px;
 }
 .home-platforms-instance-playcount {
-    float: left;
+    display: inline-block;
     position: relative;
     padding: 6px 0 0 20px;
-    width: 100%;
+    max-width: 100%;
+}
+.home-platforms-instance-playcount h4 {
+    font-size: 14px;
+    line-height: 16px;
+    margin: 10px 0 10px 0;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 .home-platforms-instance-playcount h3 {
     font-size: 30px;
@@ -1638,6 +1645,14 @@ a .season-episodes-card-overlay:hover {
     padding: 6px 0 0 20px;
     width: 100%;
 }
+.home-platforms-instance-last-user h4 {
+    font-size: 14px;
+    line-height: 16px;
+    margin: 10px 0 10px 0;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
 .home-platforms-instance-last-user h5 {
     font-size: 12px;
     position: relative;
@@ -2220,6 +2235,9 @@ a .home-platforms-instance-list-oval:hover,
     color: #fff;
     cursor: pointer;
 }
+.edit-user-name > input[type='text'] {
+    margin: 0;
+}
 .popover {
     z-index: 2;
 }

data/interfaces/default/current_activity.html

@@ -34,6 +34,9 @@ title                       Returns the name of the episode, movie or music trac
 year                        Returns the year of the episode, movie, or clip.
 player                      Returns the name of the platform used to play the stream.
 platform                    Returns the type of platform used to play the stream.
+throttled                   Returns true if the transcode session is throttled.
+transcode_progress          Returns the current transcode progress of the item. 0 to 100.
+transcode_speed             Returns the current transcode speed of the item.
 audio_decision              Returns the audio transcode decision. Either 'transcode', 'copy' or 'direct play'.
 audio_codec                 Returns the name of the audio codec.
 audio_channels              Returns the number of audio channels.
@@ -68,7 +71,6 @@ DOCUMENTATION :: END
     <a href="info?item_id=${a['rating_key']}">
     % endif
         <div class="dashboard-activity-poster">
-            <script>console.log('${a['indexes']}');</script>
             % if a['type'] == 'movie' and not a['indexes']:
             <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['art']}&width=500&height=280);"></div>
             % elif a['type'] == 'episode' and not a['indexes']:
@@ -116,7 +118,12 @@ DOCUMENTATION :: END
                         % if a['audio_decision'] == 'direct play':
                         Stream &nbsp;<strong>Direct Play</strong>
                         % else:
-                        Stream &nbsp;<strong>Transcoding</strong>
+                        Stream &nbsp;<strong>Transcoding
+                            (Speed: ${a['transcode_speed']})
+                            % if a['throttled'] == '1':
+                            (Throttled)
+                            % endif
+                        </strong>
                         % endif
                         <br />
                         % if a['audio_decision'] == 'direct play':
@@ -130,7 +137,12 @@ DOCUMENTATION :: END
                         % if a['video_decision'] == 'direct play':
                         Stream &nbsp;<strong>Direct Play</strong>
                         % else:
-                        Stream &nbsp;<strong>Transcoding</strong>
+                        Stream &nbsp;<strong>Transcoding
+                            (Speed: ${a['transcode_speed']})
+                            % if a['throttled'] == '1':
+                            (Throttled)
+                            % endif
+                        </strong>
                         % endif
                         <br />
                         % if a['video_decision'] == 'direct play':
@@ -163,6 +175,7 @@ DOCUMENTATION :: END
     % endif
     <div class="dashboard-activity-progress">
         <div class="dashboard-activity-progress-bar">
+            <div class="bufferbar" style="width: ${a['transcode_progress']}%">${a['transcode_progress']}%</div>
             <div class="bar" style="width: ${a['progress_percent']}%">${a['progress_percent']}%</div>
         </div>
     </div>
@@ -171,6 +184,13 @@ DOCUMENTATION :: END
             <div class="dashboard-activity-metadata-user-thumb" style="background-image: url(${a['user_thumb']});"></div>
         </a>
         <div class="dashboard-activity-metadata-title">
+            % if a['state'] == 'playing':
+            <i class="fa fa-play"></i>&nbsp;
+            % elif a['state'] == 'paused':
+            <i class="fa fa-pause"></i>&nbsp;
+            % elif a['state'] == 'buffering':
+            <i class="fa fa-spinner"></i>&nbsp;
+            % endif
             % if a['type'] == 'episode':
             <a href="info?item_id=${a['rating_key']}">${a['grandparent_title']} - ${a['title']}</a>
             % elif a['type'] == 'movie':

data/interfaces/default/home_stats.html

@@ -73,13 +73,13 @@ DOCUMENTATION :: END
             <div class="home-platforms-instance-info">
                 <div class="home-platforms-instance-name">
                     <h4>Most Watched TV</h4>
-                    <h5>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4>
                         <a href="info?item_id=${top_stat['rows'][0]['rating_key']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
-                    </h5>
+                    </h4>
-                </div>
-                <div class="home-platforms-instance-playcount">
                     % if top_stat['stat_type'] == 'total_plays':
                     <h3>${top_stat['rows'][0]['total_plays']}</h3>
                     <p> plays</p>
@@ -153,13 +153,13 @@ DOCUMENTATION :: END
             <div class="home-platforms-instance-info">
                 <div class="home-platforms-instance-name">
                     <h4>Most Popular TV</h4>
-                    <h5>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4>
                         <a href="info?item_id=${top_stat['rows'][0]['rating_key']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
-                    </h5>
+                    </h4>
-                </div>
-                <div class="home-platforms-instance-playcount">
                     <h3>${top_stat['rows'][0]['users_watched']}</h3>
                     <p> users</p>
                 </div>
@@ -225,13 +225,13 @@ DOCUMENTATION :: END
             <div class="home-platforms-instance-info">
                 <div class="home-platforms-instance-name">
                     <h4>Most Watched Movie</h4>
-                    <h5>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4>
                         <a href="info?item_id=${top_stat['rows'][0]['rating_key']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
-                    </h5>
+                    </h4>
-                </div>
-                <div class="home-platforms-instance-playcount">
                     % if top_stat['stat_type'] == 'total_plays':
                     <h3>${top_stat['rows'][0]['total_plays']}</h3>
                     <p> plays</p>
@@ -305,13 +305,13 @@ DOCUMENTATION :: END
             <div class="home-platforms-instance-info">
                 <div class="home-platforms-instance-name">
                     <h4>Most Popular Movie</h4>
-                    <h5>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4>
                         <a href="info?item_id=${top_stat['rows'][0]['rating_key']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
-                    </h5>
+                    </h4>
-                </div>
-                <div class="home-platforms-instance-playcount">
                     <h3>${top_stat['rows'][0]['users_watched']}</h3>
                     <p> users</p>
                 </div>
@@ -377,7 +377,9 @@ DOCUMENTATION :: END
             <div class="home-platforms-instance-info">
                 <div class="home-platforms-instance-name">
                     <h4>Most Active User</h4>
-                    <h5>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4>
                         % if top_stat['rows'][0]['user_id']:
                         <a href="user?user_id=${top_stat['rows'][0]['user_id']}">
                             % else:
@@ -385,9 +387,7 @@ DOCUMENTATION :: END
                                 % endif
                                 ${top_stat['rows'][0]['friendly_name']}
                             </a>
-                    </h5>
+                    </h4>
-                </div>
-                <div class="home-platforms-instance-playcount">
                     % if top_stat['stat_type'] == 'total_plays':
                     <h3>${top_stat['rows'][0]['total_plays']}</h3>
                     <p> plays</p>
@@ -473,9 +473,9 @@ DOCUMENTATION :: END
             <div class="home-platforms-instance-info">
                 <div class="home-platforms-instance-name">
                     <h4>Most Active Platform</h4>
-                    <h5>${top_stat['rows'][0]['platform_type']}</h5>
                 </div>
                 <div class="home-platforms-instance-playcount">
+                    <h4>${top_stat['rows'][0]['platform_type']}</h4>
                     % if top_stat['stat_type'] == 'total_plays':
                     <h3>${top_stat['rows'][0]['total_plays']}</h3>
                     <p> plays</p>
@@ -535,13 +535,13 @@ DOCUMENTATION :: END
             <div class="home-platforms-instance-info">
                 <div class="home-platforms-instance-name">
                     <h4>Last Watched</h4>
-                    <h5>
+                </div>
+                <div class="home-platforms-instance-last-user">
+                    <h4>
                         <a href="info?source=history&item_id=${top_stat['rows'][0]['row_id']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
-                    </h5>
+                    </h4>
-                </div>
-                <div class="home-platforms-instance-last-user">
                     <h5>
                         % if top_stat['rows'][0]['user_id']:
                         <a href="user?user_id=${top_stat['rows'][0]['user_id']}">

data/interfaces/default/images/plex-logo-light.svg

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="3086px" height="1000px" viewBox="0 0 3086 1000" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
+    <title>plex-logo-light</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <radialGradient cx="89.2670157%" cy="49.76%" fx="89.2670157%" fy="49.76%" r="92.4996161%" id="radialGradient-1">
+            <stop stop-color="#F9BE03" offset="0%"></stop>
+            <stop stop-color="#CC7C19" offset="100%"></stop>
+        </radialGradient>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="plex-logo-light" sketch:type="MSArtboardGroup">
+            <g sketch:type="MSLayerGroup">
+                <path d="M3085.99,0 L2795.989,0 L2505.99,500 L2795.989,1000 L3085.737,1000 L2795.989,500.25 L3085.99,0" id="X" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+                <path d="M2186,0 L2476.00071,0 L2796,500.25 L2476.00071,1000.5 L2186,1000.5 L2505.99929,500.25 L2186,0" id="chevron" fill="url(#radialGradient-1)" sketch:type="MSShapeGroup"></path>
+                <path d="M2085.947,1000 L1508.874,1000 L1508.874,0 L2085.947,0 L2085.947,173.737 L1721.339,173.737 L1721.339,393.299 L2060.594,393.299 L2060.594,567.03 L1721.339,567.03 L1721.339,824.895 L2085.947,824.895 L2085.947,1000" id="E" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+                <path d="M791.276,1000 L791.276,0 L1003.316,0 L1003.316,824.895 L1408.925,824.895 L1408.925,1000 L791.276,1000" id="L" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+                <g id="P" fill="#FFFFFF" sketch:type="MSShapeGroup">
+                    <path d="M589.947,558.824 C522.679,615.831 427.037,644.325 303.009,644.325 L212.04,644.325 L212.04,1000 L0,1000 L0,643.947829 L0,470.337388 L290,470.697418 C467.563171,468.627777 476.842468,359.878967 476.842468,322.200012 C476.842468,287.221283 476.842468,175.445374 319,173.699997 L0,173.703242 L0,0 L319.424,0 C440.717,0 532.939,26.107 596.101,78.321 C659.253,130.534 690.834,208.392 690.834,311.902 C690.834,419.527 657.202,501.83 589.947,558.824 Z" id="Path"></path>
+                    <rect id="Path" x="0" y="110" width="212.2" height="429"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

data/interfaces/default/info.html

@@ -81,13 +81,21 @@ DOCUMENTATION :: END
             <div class="summary-content-title-wrapper">
                 <div class="col-md-9">
                     <div class="summary-content-poster hidden-xs hidden-sm">
+                        <a href="http://app.plex.tv/web/app#!/server/${config['pms_identifier']}/details/%2Flibrary%2Fmetadata%2F${data['rating_key']}" target="Plex/Web" title="View in Plex/Web">
                             % if data['type'] == 'episode':
-                        <div class="summary-poster-face-episode" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=500&height=280&fallback=poster);"></div>
+                            <div class="summary-poster-face-episode" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=500&height=280&fallback=poster);">
-                        % elif data['type'] == 'season':
+                                <div class="summary-poster-face-overlay">
-                        <div class="summary-poster-face" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=300&height=450&fallback=poster);"></div>
+                                    <span></span>
+                                </div>
+                            </div>
                             % else:
-                        <div class="summary-poster-face" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=300&height=450&fallback=poster);"></div>
+                            <div class="summary-poster-face" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=300&height=450&fallback=poster);">
+                                <div class="summary-poster-face-overlay">
+                                    <span></span>
+                                </div>
+                            </div>
                             % endif
+                        </a>
                     </div>
                     <div class="summary-content-title">
                         % if data['type'] == 'movie' or data['type'] == 'show':
@@ -144,6 +152,11 @@ DOCUMENTATION :: END
                                 % endif
                             </div>
                         </div>
+                        % if data['type'] == 'movie' and data['tagline']:
+                        <div class="summary-content-summary">
+                            <p><strong> ${data['tagline']} </strong></p>
+                        </div>
+                        % endif
                         <div class="summary-content-summary">
                             <p> ${data['summary']} </p>
                         </div>
@@ -258,6 +271,24 @@ DOCUMENTATION :: END
                     </div>
                     <div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
                     </div>
+                    <div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
+                        <div class="modal-dialog">
+                            <div class="modal-content">
+                                <div class="modal-header">
+                                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+                                    <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4>
+                                </div>
+                                <div class="modal-body" style="text-align: center;">
+                                    <p>Are you REALLY sure you want to delete <strong><span id="deleteCount"></span></strong> history item(s)?</p>
+                                    <p>This is permanent and cannot be undone!</p>
+                                </div>
+                                <div class="modal-footer">
+                                    <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
+                                    <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-delete">Delete</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
                 % endif
             </div>
@@ -307,19 +338,43 @@ DOCUMENTATION :: END
             }
         }
         history_table = $('#history_table').DataTable(history_table_options);
-
         var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 10] });
         $(colvis.button()).appendTo('div.colvis-button-bar');
 
         clearSearchButton('history_table', history_table);
 
-        $('#row-edit-mode').click(function() {
+        $('#row-edit-mode').on('click', function() {
+            $('#row-edit-mode-alert').fadeIn(200);
+
             if ($(this).hasClass('active')) {
-                $('.delete-control').each(function() {
+                if (history_to_delete.length > 0) {
-                    $(this).addClass('hidden');
+                    $('#deleteCount').text(history_to_delete.length);
+                    $('#confirm-modal').modal();
+                    $('#confirm-modal').one('click', '#confirm-delete', function () {
+                        for (var i = 0; i < history_to_delete.length; i++) {
+                            $.ajax({
+                                url: 'delete_history_rows',
+                                data: { row_id: history_to_delete[i] },
+                                async: true,
+                                success: function (data) {
+                                    var msg = "History deleted";
+                                    showMsg(msg, false, true, 2000);
+                                }
                             });
+                        }
+                        history_table.draw();
+                    });
+                }
+
+                $('.delete-control').each(function () {
+                    $(this).addClass('hidden');
+                    $('#row-edit-mode-alert').fadeOut(200);
+                });
+
             } else {
+                history_to_delete = [];
                 $('.delete-control').each(function() {
+                    $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
                     $(this).removeClass('hidden');
                 });
             }
@@ -381,6 +436,7 @@ DOCUMENTATION :: END
             }
         });
     });
+
     $.ajax({
         url: 'get_show_children',
         type: "GET",
@@ -460,9 +516,7 @@ DOCUMENTATION :: END
 <script>
     $("#airdate").html(moment($("#airdate").text()).format('MMM DD, YYYY'));
     $("#runtime").html(millisecondsToMinutes($("#runtime").text(), true));
-</script>
-% endif
-<script>
     $('div.art-face').animate({ opacity: 0.2 }, { duration: 1000 });
 </script>
+% endif
 </%def>

data/interfaces/default/js/script.js

@@ -219,6 +219,10 @@ function getPlatformImagePath(platformName) {
         return 'interfaces/default/images/platforms/playstation.png';
 	} else if (platformName.indexOf("Mystery 5") > -1) {
         return 'interfaces/default/images/platforms/xbox.png';
+	} else if (platformName.indexOf("Windows") > -1) {
+	    return 'interfaces/default/images/platforms/win8.png';
+	} else if (platformName.indexOf("Windows phone") > -1) {
+	    return 'interfaces/default/images/platforms/wp.png';
 	} else {
         return 'interfaces/default/images/platforms/default.png';
     }

data/interfaces/default/library_stats.html

@@ -38,21 +38,21 @@ DOCUMENTATION :: END
             <div class="home-platforms-instance-info">
                 <div class="home-platforms-instance-name">
                     <h4>${library['rows']['title']}</h4>
-                    <h5>${library['rows']['count_type']}</h5>
                 </div>
                 <div class="home-platforms-instance-playcount">
+                    <h5>${library['rows']['count_type']}</h5>
                     <h3>${library['rows']['count']}</h3>
                     <p> items</p>
                 </div>
                 % if library['type'] == 'show':
-                <div class="home-platforms-instance-name2">
+                <div class="home-platforms-instance-playcount" style="padding-left: 10px;">
                     <h5>${library['rows']['episode_count_type']}</h5>
                     <h3>${library['rows']['episode_count']}</h3>
                     <p> items</p>
                 </div>
                 % endif
                 % if library['type'] == 'artist':
-                <div class="home-platforms-instance-name2">
+                <div class="home-platforms-instance-playcount" style="padding-left: 10px;">
                     <h5>${library['rows']['album_count_type']}</h5>
                     <h3>${library['rows']['album_count']}</h3>
                     <p> items</p>

data/interfaces/default/settings.html

@@ -321,7 +321,7 @@ available_notification_agents = notifiers.available_notification_agents()
 
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" id="pms_use_bif" name="pms_use_bif" value="1" ${config['pms_use_bif']}> Use BIF thumbs
+                                <input type="checkbox" id="pms_use_bif" name="pms_use_bif" value="1" ${config['pms_use_bif']}> Use video preview thumbnails (BIF)
                             </label>
                             <p class="help-block">If you have media indexing enabled on your server, use these on the activity pane.</p>
                         </div>

data/interfaces/default/users.html

@@ -16,7 +16,7 @@
             <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
                 <i class="fa fa-pencil"></i> Edit mode
             </button>&nbsp
-            <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect rows to delete. Data is deleted upon exiting delete mode.</div>
+            <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect users to purge. Data is purged upon exiting edit mode.</div>
         </div>
     </div>
     <div class='table-card-back'>
@@ -119,6 +119,13 @@
                     $(this).addClass('hidden');
                     $('#row-edit-mode-alert').fadeOut(200);
                 });
+                $('.edit-user-control > .edit-user-name').each(function () {
+                    a = $(this).children('a');
+                    input = $(this).children('input');
+                    a.text(input.val());
+                    a.removeClass('hidden');
+                    input.addClass('hidden');
+                });
 
             } else {
                 users_to_purge = [];
@@ -126,6 +133,10 @@
                     $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
                     $(this).removeClass('hidden');
                 });
+                $('.edit-user-control > .edit-user-name').each(function () {
+                    $(this).children('a').addClass('hidden');
+                    $(this).children('input').removeClass('hidden');
+                });
             }
         });
     });

plexpy/__init__.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
@@ -377,7 +377,7 @@ def dbcheck():
         'title TEXT, parent_title TEXT, grandparent_title TEXT, full_title TEXT, media_index INTEGER, '
         'parent_media_index INTEGER, thumb TEXT, parent_thumb TEXT, grandparent_thumb TEXT, art TEXT, media_type TEXT, '
         'year INTEGER, originally_available_at TEXT, added_at INTEGER, updated_at INTEGER, last_viewed_at INTEGER, '
-        'content_rating TEXT, summary TEXT, rating TEXT, duration INTEGER DEFAULT 0, guid TEXT, '
+        'content_rating TEXT, summary TEXT, tagline TEXT, rating TEXT, duration INTEGER DEFAULT 0, guid TEXT, '
         'directors TEXT, writers TEXT, actors TEXT, genres TEXT, studio TEXT)'
         ''
     )
@@ -517,15 +517,24 @@ def dbcheck():
             'ALTER TABLE sessions ADD COLUMN transcode_height INTEGER'
         )
 
-    # Upgrade sessions table from earlier versions
+    # Upgrade session_history_metadata table from earlier versions
     try:
         c_db.execute('SELECT full_title from session_history_metadata')
     except sqlite3.OperationalError:
-        logger.debug(u"Altering database. Updating database table sessions.")
+        logger.debug(u"Altering database. Updating database table session_history_metadata.")
         c_db.execute(
             'ALTER TABLE session_history_metadata ADD COLUMN full_title TEXT'
         )
 
+    # Upgrade session_history_metadata table from earlier versions
+    try:
+        c_db.execute('SELECT tagline from session_history_metadata')
+    except sqlite3.OperationalError:
+        logger.debug(u"Altering database. Updating database table session_history_metadata.")
+        c_db.execute(
+            'ALTER TABLE session_history_metadata ADD COLUMN tagline TEXT'
+        )
+
     # notify_log table :: This is a table which logs notifications sent
     c_db.execute(
         'CREATE TABLE IF NOT EXISTS notify_log (id INTEGER PRIMARY KEY AUTOINCREMENT, '

plexpy/datafactory.py

@@ -578,8 +578,8 @@ class DataFactory(object):
         if row_id:
             query = 'SELECT rating_key, parent_rating_key, grandparent_rating_key, title, parent_title, grandparent_title, ' \
                     'full_title, media_index, parent_media_index, thumb, parent_thumb, grandparent_thumb, art, media_type, ' \
-                    'year, originally_available_at, added_at, updated_at, last_viewed_at, content_rating, summary, rating, ' \
+                    'year, originally_available_at, added_at, updated_at, last_viewed_at, content_rating, summary, tagline, ' \
-                    'duration, guid, directors, writers, actors, genres, studio ' \
+                    'rating, duration, guid, directors, writers, actors, genres, studio ' \
                     'FROM session_history_metadata ' \
                     'WHERE id = ?'
             result = monitor_db.select(query=query, args=[row_id])
@@ -605,6 +605,7 @@ class DataFactory(object):
                         'title': item['title'],
                         'content_rating': item['content_rating'],
                         'summary': item['summary'],
+                        'tagline': item['tagline'],
                         'rating': item['rating'],
                         'duration': item['duration'],
                         'year': item['year'],

plexpy/monitor.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
@@ -343,17 +343,17 @@ class MonitorProcessing(object):
                         'grandparent_rating_key, title, parent_title, grandparent_title, full_title, media_index, ' \
                         'parent_media_index, thumb, parent_thumb, grandparent_thumb, art, media_type, year, ' \
                         'originally_available_at, added_at, updated_at, last_viewed_at, content_rating, summary, ' \
-                        'rating, duration, guid, directors, writers, actors, genres, studio) VALUES ' \
+                        'tagline, rating, duration, guid, directors, writers, actors, genres, studio) VALUES ' \
                         '(last_insert_rowid(), ' \
-                        '?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'
+                        '?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'
 
                 args = [session['rating_key'], session['parent_rating_key'], session['grandparent_rating_key'],
                         session['title'], session['parent_title'], session['grandparent_title'], full_title,
                         metadata['index'], metadata['parent_index'], metadata['thumb'], metadata['parent_thumb'],
                         metadata['grandparent_thumb'], metadata['art'], session['media_type'], metadata['year'],
                         metadata['originally_available_at'], metadata['added_at'], metadata['updated_at'],
-                        metadata['last_viewed_at'], metadata['content_rating'], metadata['summary'], metadata['rating'],
+                        metadata['last_viewed_at'], metadata['content_rating'], metadata['summary'], metadata['tagline'], 
-                        metadata['duration'], metadata['guid'], directors, writers, actors, genres, metadata['studio']]
+                        metadata['rating'], metadata['duration'], metadata['guid'], directors, writers, actors, genres, metadata['studio']]
 
                 # logger.debug(u"PlexPy Monitor :: Writing session_history_metadata transaction...")
                 self.db.action(query=query, args=args)

plexpy/notification_handler.py

@@ -349,14 +349,14 @@ def build_notify_text(session, state):
 
         if on_start_subject and on_start_body:
             try:
-                subject_text = on_start_subject.format(**available_params)
+                subject_text = unicode(on_start_subject).format(**available_params)
             except LookupError, e:
                 logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e)
             except:
                 logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.")
 
             try:
-                body_text = on_start_body.format(**available_params)
+                body_text = unicode(on_start_body).format(**available_params)
             except LookupError, e:
                 logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e)
             except:
@@ -373,14 +373,14 @@ def build_notify_text(session, state):
 
         if on_stop_subject and on_stop_body:
             try:
-                subject_text = on_stop_subject.format(**available_params)
+                subject_text = unicode(on_stop_subject).format(**available_params)
             except LookupError, e:
                 logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e)
             except:
                 logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.")
 
             try:
-                body_text = on_stop_body.format(**available_params)
+                body_text = unicode(on_stop_body).format(**available_params)
             except LookupError, e:
                 logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e)
             except:
@@ -397,14 +397,14 @@ def build_notify_text(session, state):
 
         if on_pause_subject and on_pause_body:
             try:
-                subject_text = on_pause_subject.format(**available_params)
+                subject_text = unicode(on_pause_subject).format(**available_params)
             except LookupError, e:
                 logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e)
             except:
                 logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.")
 
             try:
-                body_text = on_pause_body.format(**available_params)
+                body_text = unicode(on_pause_body).format(**available_params)
             except LookupError, e:
                 logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e)
             except:
@@ -421,14 +421,14 @@ def build_notify_text(session, state):
 
         if on_resume_subject and on_resume_body:
             try:
-                subject_text = on_resume_subject.format(**available_params)
+                subject_text = unicode(on_resume_subject).format(**available_params)
             except LookupError, e:
                 logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e)
             except:
                 logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.")
 
             try:
-                body_text = on_resume_body.format(**available_params)
+                body_text = unicode(on_resume_body).format(**available_params)
             except LookupError, e:
                 logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e)
             except:
@@ -445,14 +445,14 @@ def build_notify_text(session, state):
 
         if on_buffer_subject and on_buffer_body:
             try:
-                subject_text = on_buffer_subject.format(**available_params)
+                subject_text = unicode(on_buffer_subject).format(**available_params)
             except LookupError, e:
                 logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e)
             except:
                 logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.")
 
             try:
-                body_text = on_buffer_body.format(**available_params)
+                body_text = unicode(on_buffer_body).format(**available_params)
             except LookupError, e:
                 logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e)
             except:
@@ -469,14 +469,14 @@ def build_notify_text(session, state):
 
         if on_watched_subject and on_watched_body:
             try:
-                subject_text = on_watched_subject.format(**available_params)
+                subject_text = unicode(on_watched_subject).format(**available_params)
             except LookupError, e:
                 logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e)
             except:
                 logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.")
 
             try:
-                body_text = on_watched_body.format(**available_params)
+                body_text = unicode(on_watched_body).format(**available_params)
             except LookupError, e:
                 logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e)
             except:

plexpy/plexwatch_import.py

@@ -55,6 +55,7 @@ def extract_plexwatch_xml(xml=None):
         parent_title = helpers.get_xml_attr(a, 'parentTitle')
         studio = helpers.get_xml_attr(a, 'studio')
         title = helpers.get_xml_attr(a, 'title')
+        tagline = helpers.get_xml_attr(a, 'tagline')
 
         directors = []
         if a.getElementsByTagName('Director'):
@@ -153,6 +154,7 @@ def extract_plexwatch_xml(xml=None):
                   'grandparent_title': grandparent_title,
                   'parent_title': parent_title,
                   'title': title,
+                  'tagline': tagline,
                   'guid': guid,
                   'media_index': media_index,
                   'originally_available_at': originally_available_at,
@@ -356,6 +358,7 @@ def import_from_plexwatch(database=None, table_name=None, import_ignore_interval
                                     'last_viewed_at': extracted_xml['last_viewed_at'],
                                     'content_rating': row['content_rating'],
                                     'summary': row['summary'],
+                                    'tagline': extracted_xml['tagline'],
                                     'rating': extracted_xml['rating'],
                                     'duration': extracted_xml['duration'],
                                     'guid': extracted_xml['guid'],

plexpy/pmsconnect.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
@@ -362,6 +362,7 @@ class PmsConnect(object):
                         'title': helpers.get_xml_attr(metadata_main, 'title'),
                         'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
                         'summary': helpers.get_xml_attr(metadata_main, 'summary'),
+                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
                         'rating': helpers.get_xml_attr(metadata_main, 'rating'),
                         'duration': helpers.get_xml_attr(metadata_main, 'duration'),
                         'year': helpers.get_xml_attr(metadata_main, 'year'),
@@ -383,6 +384,8 @@ class PmsConnect(object):
         elif metadata_type == 'episode':
             metadata = {'type': metadata_type,
                         'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
+                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
+                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
                         'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
                         'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
                         'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
@@ -391,6 +394,7 @@ class PmsConnect(object):
                         'title': helpers.get_xml_attr(metadata_main, 'title'),
                         'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
                         'summary': helpers.get_xml_attr(metadata_main, 'summary'),
+                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
                         'rating': helpers.get_xml_attr(metadata_main, 'rating'),
                         'duration': helpers.get_xml_attr(metadata_main, 'duration'),
                         'year': helpers.get_xml_attr(metadata_main, 'year'),
@@ -420,6 +424,7 @@ class PmsConnect(object):
                         'title': helpers.get_xml_attr(metadata_main, 'title'),
                         'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
                         'summary': helpers.get_xml_attr(metadata_main, 'summary'),
+                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
                         'rating': helpers.get_xml_attr(metadata_main, 'rating'),
                         'duration': helpers.get_xml_attr(metadata_main, 'duration'),
                         'year': helpers.get_xml_attr(metadata_main, 'year'),
@@ -443,6 +448,7 @@ class PmsConnect(object):
             show_details = self.get_metadata_details(parent_rating_key)
             metadata = {'type': metadata_type,
                         'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
+                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
                         'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
                         'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
                         'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
@@ -451,6 +457,7 @@ class PmsConnect(object):
                         'title': helpers.get_xml_attr(metadata_main, 'title'),
                         'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
                         'summary': show_details['metadata']['summary'],
+                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
                         'rating': helpers.get_xml_attr(metadata_main, 'rating'),
                         'duration': show_details['metadata']['duration'],
                         'year': helpers.get_xml_attr(metadata_main, 'year'),
@@ -480,6 +487,7 @@ class PmsConnect(object):
                         'title': helpers.get_xml_attr(metadata_main, 'title'),
                         'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
                         'summary': helpers.get_xml_attr(metadata_main, 'summary'),
+                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
                         'rating': helpers.get_xml_attr(metadata_main, 'rating'),
                         'duration': helpers.get_xml_attr(metadata_main, 'duration'),
                         'year': helpers.get_xml_attr(metadata_main, 'year'),
@@ -570,6 +578,9 @@ class PmsConnect(object):
 
             if session.getElementsByTagName('TranscodeSession'):
                 transcode_session = session.getElementsByTagName('TranscodeSession')[0]
+                throttled = helpers.get_xml_attr(transcode_session, 'throttled')
+                transcode_progress = helpers.get_xml_attr(transcode_session, 'progress')
+                transcode_speed = helpers.get_xml_attr(transcode_session, 'speed')
                 audio_decision = helpers.get_xml_attr(transcode_session, 'audioDecision')
                 transcode_audio_channels = helpers.get_xml_attr(transcode_session, 'audioChannels')
                 transcode_audio_codec = helpers.get_xml_attr(transcode_session, 'audioCodec')
@@ -577,6 +588,9 @@ class PmsConnect(object):
                 transcode_protocol = helpers.get_xml_attr(transcode_session, 'protocol')
                 duration = helpers.get_xml_attr(transcode_session, 'duration')
             else:
+                throttled = '0'
+                transcode_progress = '0'
+                transcode_speed = ''
                 transcode_audio_channels = ''
                 transcode_audio_codec = ''
                 transcode_container = ''
@@ -612,6 +626,9 @@ class PmsConnect(object):
                               'rating_key': helpers.get_xml_attr(session, 'ratingKey'),
                               'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'),
                               'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'),
+                              'throttled': throttled,
+                              'transcode_progress': transcode_progress,
+                              'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)),
                               'audio_decision': audio_decision,
                               'audio_channels': audio_channels,
                               'audio_codec': audio_codec,
@@ -656,6 +673,9 @@ class PmsConnect(object):
 
             if session.getElementsByTagName('TranscodeSession'):
                 transcode_session = session.getElementsByTagName('TranscodeSession')[0]
+                throttled = helpers.get_xml_attr(transcode_session, 'throttled')
+                transcode_progress = helpers.get_xml_attr(transcode_session, 'progress')
+                transcode_speed = helpers.get_xml_attr(transcode_session, 'speed')
                 audio_decision = helpers.get_xml_attr(transcode_session, 'audioDecision')
                 transcode_audio_channels = helpers.get_xml_attr(transcode_session, 'audioChannels')
                 transcode_audio_codec = helpers.get_xml_attr(transcode_session, 'audioCodec')
@@ -666,6 +686,9 @@ class PmsConnect(object):
                 transcode_container = helpers.get_xml_attr(transcode_session, 'container')
                 transcode_protocol = helpers.get_xml_attr(transcode_session, 'protocol')
             else:
+                throttled = '0'
+                transcode_progress = '0'
+                transcode_speed = ''
                 transcode_audio_channels = ''
                 transcode_audio_codec = ''
                 transcode_video_codec = ''
@@ -723,6 +746,9 @@ class PmsConnect(object):
                                   'rating_key': helpers.get_xml_attr(session, 'ratingKey'),
                                   'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'),
                                   'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'),
+                                  'throttled': throttled,
+                                  'transcode_progress': transcode_progress,
+                                  'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)),
                                   'audio_decision': audio_decision,
                                   'audio_channels': audio_channels,
                                   'audio_codec': audio_codec,
@@ -776,6 +802,9 @@ class PmsConnect(object):
                                   'rating_key': helpers.get_xml_attr(session, 'ratingKey'),
                                   'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'),
                                   'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'),
+                                  'throttled': throttled,
+                                  'transcode_progress': transcode_progress,
+                                  'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)),
                                   'audio_decision': audio_decision,
                                   'audio_channels': audio_channels,
                                   'audio_codec': audio_codec,
@@ -829,6 +858,9 @@ class PmsConnect(object):
                                   'rating_key': helpers.get_xml_attr(session, 'ratingKey'),
                                   'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'),
                                   'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'),
+                                  'throttled': throttled,
+                                  'transcode_progress': transcode_progress,
+                                  'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)),
                                   'audio_decision': audio_decision,
                                   'audio_channels': audio_channels,
                                   'audio_codec': audio_codec,

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_VERSION = "master"
-PLEXPY_RELEASE_VERSION = "1.1.6"
+PLEXPY_RELEASE_VERSION = "1.1.8"

plexpy/webserve.py

@@ -762,6 +762,10 @@ class WebInterface(object):
     def info(self, item_id=None, source=None, **kwargs):
         metadata = None
 
+        config = {
+            "pms_identifier": plexpy.CONFIG.PMS_IDENTIFIER
+        }
+
         if source == 'history':
             data_factory = datafactory.DataFactory()
             metadata = data_factory.get_metadata_details(row_id=item_id)
@@ -772,7 +776,7 @@ class WebInterface(object):
                 metadata = result['metadata']
 
         if metadata:
-            return serve_template(templatename="info.html", data=metadata, title="Info")
+            return serve_template(templatename="info.html", data=metadata, title="Info", config=config)
         else:
             logger.warn('Unable to retrieve data.')
             return serve_template(templatename="info.html", data=None, title="Info")