From 84aa72738798dc0cf15c22d87f1041d31cde2302 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 6 Sep 2015 11:03:47 -0700 Subject: [PATCH 01/15] Fix for 5 digit library stats --- data/interfaces/default/css/plexpy.css | 64 +++++++--------------- data/interfaces/default/home_stats.html | 60 ++++++++++---------- data/interfaces/default/library_stats.html | 6 +- 3 files changed, 53 insertions(+), 77 deletions(-) diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index d8379a65..ff17b76a 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -1541,6 +1541,8 @@ 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; + overflow: hidden; } .home-platforms-instance li { position: relative; @@ -1553,7 +1555,6 @@ a .season-episodes-card-overlay:hover { height: 120px; } .home-platforms-instance-name { - float: left; color: #fff; text-overflow: ellipsis; overflow: hidden; @@ -1565,53 +1566,20 @@ a .season-episodes-card-overlay:hover { padding: 0 0 0 20px; } .home-platforms-instance-name h4 { - margin: 10px 0 20px 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; + margin: 10px 0 4px 0; } .home-platforms-instance-playcount { - float: left; + display: inline-block; position: relative; padding: 6px 0 0 20px; - 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 +1606,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; diff --git a/data/interfaces/default/home_stats.html b/data/interfaces/default/home_stats.html index 175b3887..733bea85 100644 --- a/data/interfaces/default/home_stats.html +++ b/data/interfaces/default/home_stats.html @@ -73,13 +73,13 @@ DOCUMENTATION :: END

Most Watched TV

-
+
+
+

${top_stat['rows'][0]['title']} -

-
-
+ % if top_stat['stat_type'] == 'total_plays':

${top_stat['rows'][0]['total_plays']}

plays

@@ -153,13 +153,13 @@ DOCUMENTATION :: END

Most Popular TV

-
+
+
+

${top_stat['rows'][0]['title']} -

-
-
+

${top_stat['rows'][0]['users_watched']}

users

@@ -225,13 +225,13 @@ DOCUMENTATION :: END

Most Watched Movie

-
+
+
+

${top_stat['rows'][0]['title']} -

-
-
+ % if top_stat['stat_type'] == 'total_plays':

${top_stat['rows'][0]['total_plays']}

plays

@@ -305,13 +305,13 @@ DOCUMENTATION :: END

Most Popular Movie

-
+
+
+

${top_stat['rows'][0]['title']} -

-
-
+

${top_stat['rows'][0]['users_watched']}

users

@@ -377,17 +377,17 @@ DOCUMENTATION :: END

Most Active User

-
- % if top_stat['rows'][0]['user_id']: - - % else: - - % endif - ${top_stat['rows'][0]['friendly_name']} - -
+

+ % if top_stat['rows'][0]['user_id']: + + % else: + + % endif + ${top_stat['rows'][0]['friendly_name']} + +

% if top_stat['stat_type'] == 'total_plays':

${top_stat['rows'][0]['total_plays']}

plays

@@ -473,9 +473,9 @@ DOCUMENTATION :: END

Most Active Platform

-
${top_stat['rows'][0]['platform_type']}
+

${top_stat['rows'][0]['platform_type']}

% if top_stat['stat_type'] == 'total_plays':

${top_stat['rows'][0]['total_plays']}

plays

@@ -535,13 +535,13 @@ DOCUMENTATION :: END

Last Watched

-
+
+
+

${top_stat['rows'][0]['title']} -

-
-
+
% if top_stat['rows'][0]['user_id']: diff --git a/data/interfaces/default/library_stats.html b/data/interfaces/default/library_stats.html index 66b774d9..34ef2a91 100644 --- a/data/interfaces/default/library_stats.html +++ b/data/interfaces/default/library_stats.html @@ -38,21 +38,21 @@ DOCUMENTATION :: END

${library['rows']['title']}

-
${library['rows']['count_type']}
+
${library['rows']['count_type']}

${library['rows']['count']}

items

% if library['type'] == 'show': -
+
${library['rows']['episode_count_type']}

${library['rows']['episode_count']}

items

% endif % if library['type'] == 'artist': -
+
${library['rows']['album_count_type']}

${library['rows']['album_count']}

items

From 48e601d5ff358d964dfb83a1500f4d68ea41178b Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 6 Sep 2015 11:20:49 -0700 Subject: [PATCH 02/15] Restore edit username in users table * Editing usernames was accidentally removed in e7b1e17 --- data/interfaces/default/css/plexpy.css | 3 +++ data/interfaces/default/users.html | 13 ++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index ff17b76a..3ccc11be 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -2196,6 +2196,9 @@ a .home-platforms-instance-list-oval:hover, color: #fff; cursor: pointer; } +.edit-user-name > input[type='text'] { + margin: 0; +} .popover { z-index: 2; } diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html index fe35f072..b493f997 100644 --- a/data/interfaces/default/users.html +++ b/data/interfaces/default/users.html @@ -16,7 +16,7 @@   - +
@@ -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'); + }); } }); }); From 36ee5234b12771f3c916c6bda26550642b5abb8f Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 6 Sep 2015 11:54:31 -0700 Subject: [PATCH 03/15] Revert overflow: hidden * Accidentally hid top stats slider. --- data/interfaces/default/css/plexpy.css | 1 - 1 file changed, 1 deletion(-) diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index 3ccc11be..01b864fc 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -1542,7 +1542,6 @@ a .season-episodes-card-overlay:hover { -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; - overflow: hidden; } .home-platforms-instance li { position: relative; From df290d995b2f3072b9ba32a613ff8176e270ca0b Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 6 Sep 2015 12:17:55 -0700 Subject: [PATCH 04/15] Make video preview thumbnails wording clearer. --- data/interfaces/default/settings.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 797097a2..a498399d 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -321,7 +321,7 @@ available_notification_agents = notifiers.available_notification_agents()

If you have media indexing enabled on your server, use these on the activity pane.

From 2d7585d64bcca2b49127dfa6b8667d709ff2ab79 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 6 Sep 2015 12:31:50 -0700 Subject: [PATCH 05/15] Add tagline to movie info metadata --- data/interfaces/default/info.html | 5 +++++ plexpy/__init__.py | 17 +++++++++++++---- plexpy/datafactory.py | 5 +++-- plexpy/pmsconnect.py | 1 + 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index 08c5005b..203a049c 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -144,6 +144,11 @@ DOCUMENTATION :: END % endif
+ % if data['tagline']: +
+

${data['tagline']}

+
+ % endif

${data['summary']}

diff --git a/plexpy/__init__.py b/plexpy/__init__.py index 44cd2b3c..ad02333c 100644 --- a/plexpy/__init__.py +++ b/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, ' diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index fb587228..549612e4 100644 --- a/plexpy/datafactory.py +++ b/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, ' \ - 'duration, guid, directors, writers, actors, genres, studio ' \ + 'year, originally_available_at, added_at, updated_at, last_viewed_at, content_rating, summary, tagline, ' \ + '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'], diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index d25e783e..48f0fa4a 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -422,6 +422,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'), From e44a0fed22c4a45321b9f36e192ba042f8d67924 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 6 Sep 2015 12:46:46 -0700 Subject: [PATCH 06/15] Fix tagline only if type is movie --- data/interfaces/default/info.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index 203a049c..9fe80327 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -144,7 +144,7 @@ DOCUMENTATION :: END % endif
- % if data['tagline']: + % if data['type'] == 'movie' and data['tagline']:

${data['tagline']}

From 0a2ebb88152a83bc0abe86112d4f4fe389380021 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 6 Sep 2015 12:57:51 -0700 Subject: [PATCH 07/15] Add tagline for newly watched items --- plexpy/monitor.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plexpy/monitor.py b/plexpy/monitor.py index 74695bb8..eca48e2f 100644 --- a/plexpy/monitor.py +++ b/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,7 +343,7 @@ 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(), ' \ '?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)' @@ -352,8 +352,8 @@ class MonitorProcessing(object): 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['duration'], metadata['guid'], directors, writers, actors, genres, metadata['studio']] + metadata['last_viewed_at'], metadata['content_rating'], metadata['summary'], metadata['tagline'], + 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) From e6383d52ad0daab8eaa5e4ef449efd82b52b0bf7 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 6 Sep 2015 13:21:08 -0700 Subject: [PATCH 08/15] Fix adding tagline to session_history_metadata table --- plexpy/monitor.py | 2 +- plexpy/pmsconnect.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plexpy/monitor.py b/plexpy/monitor.py index eca48e2f..c6d52936 100644 --- a/plexpy/monitor.py +++ b/plexpy/monitor.py @@ -345,7 +345,7 @@ class MonitorProcessing(object): 'originally_available_at, added_at, updated_at, last_viewed_at, content_rating, summary, ' \ '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, diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 48f0fa4a..5daf1914 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -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'), @@ -393,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'), @@ -455,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'), @@ -484,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'), From b7dc28c3fb7b3b7f17a046a0c0d03e10058fe58c Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 6 Sep 2015 13:33:35 -0700 Subject: [PATCH 09/15] Remove unnecessary console.log --- data/interfaces/default/current_activity.html | 1 - 1 file changed, 1 deletion(-) diff --git a/data/interfaces/default/current_activity.html b/data/interfaces/default/current_activity.html index d166683d..0981d8bf 100644 --- a/data/interfaces/default/current_activity.html +++ b/data/interfaces/default/current_activity.html @@ -68,7 +68,6 @@ DOCUMENTATION :: END % endif
- % if a['type'] == 'movie' and not a['indexes']:
% elif a['type'] == 'episode' and not a['indexes']: From 3867dd7bdd397c8198d5b574e33682577afe3220 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 6 Sep 2015 15:51:46 -0700 Subject: [PATCH 10/15] Add throttled indicator to dashboard activity --- data/interfaces/default/current_activity.html | 13 +++++++++++-- plexpy/pmsconnect.py | 6 ++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/data/interfaces/default/current_activity.html b/data/interfaces/default/current_activity.html index 0981d8bf..6c393266 100644 --- a/data/interfaces/default/current_activity.html +++ b/data/interfaces/default/current_activity.html @@ -34,6 +34,7 @@ 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. 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. @@ -115,7 +116,11 @@ DOCUMENTATION :: END % if a['audio_decision'] == 'direct play': Stream  Direct Play % else: - Stream  Transcoding + Stream  Transcoding + % if a['throttled'] == 1: + (Throttled) + % endif + % endif
% if a['audio_decision'] == 'direct play': @@ -129,7 +134,11 @@ DOCUMENTATION :: END % if a['video_decision'] == 'direct play': Stream  Direct Play % else: - Stream  Transcoding + Stream  Transcoding + % if a['throttled']: + (Throttled) + % endif + % endif
% if a['video_decision'] == 'direct play': diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 5daf1914..41256e2d 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -578,6 +578,7 @@ class PmsConnect(object): if session.getElementsByTagName('TranscodeSession'): transcode_session = session.getElementsByTagName('TranscodeSession')[0] + throttled = helpers.get_xml_attr(transcode_session, 'throttled') 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') @@ -620,6 +621,7 @@ 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, 'audio_decision': audio_decision, 'audio_channels': audio_channels, 'audio_codec': audio_codec, @@ -664,6 +666,7 @@ class PmsConnect(object): if session.getElementsByTagName('TranscodeSession'): transcode_session = session.getElementsByTagName('TranscodeSession')[0] + throttled = helpers.get_xml_attr(transcode_session, 'throttled') 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') @@ -731,6 +734,7 @@ 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, 'audio_decision': audio_decision, 'audio_channels': audio_channels, 'audio_codec': audio_codec, @@ -784,6 +788,7 @@ 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, 'audio_decision': audio_decision, 'audio_channels': audio_channels, 'audio_codec': audio_codec, @@ -837,6 +842,7 @@ 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, 'audio_decision': audio_decision, 'audio_channels': audio_channels, 'audio_codec': audio_codec, From 56f601e2a55e149af6dbaa8786d4ccd71f304c73 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 6 Sep 2015 15:52:47 -0700 Subject: [PATCH 11/15] Add icon for play/pause/buffer state in dashboard activity --- data/interfaces/default/current_activity.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/interfaces/default/current_activity.html b/data/interfaces/default/current_activity.html index 6c393266..d437c6ca 100644 --- a/data/interfaces/default/current_activity.html +++ b/data/interfaces/default/current_activity.html @@ -179,6 +179,13 @@ DOCUMENTATION :: END
+ % if a['state'] == 'playing': +   + % elif a['state'] == 'paused': +   + % elif a['state'] == 'buffering': +   + % endif % if a['type'] == 'episode': ${a['grandparent_title']} - ${a['title']} % elif a['type'] == 'movie': From 56b717b1a1fd84d5559a676a60c92130ab9003b6 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 6 Sep 2015 21:10:47 -0700 Subject: [PATCH 12/15] Add transcode progress and speed to dashboard activity --- data/interfaces/default/css/plexpy.css | 10 ++++++++++ data/interfaces/default/current_activity.html | 7 +++++-- plexpy/pmsconnect.py | 18 ++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index 01b864fc..6ad3da79 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/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; diff --git a/data/interfaces/default/current_activity.html b/data/interfaces/default/current_activity.html index d437c6ca..f0ebcc66 100644 --- a/data/interfaces/default/current_activity.html +++ b/data/interfaces/default/current_activity.html @@ -117,7 +117,8 @@ DOCUMENTATION :: END Stream  Direct Play % else: Stream  Transcoding - % if a['throttled'] == 1: + (Speed: ${a['transcode_speed']}) + % if a['throttled'] == '1': (Throttled) % endif @@ -135,7 +136,8 @@ DOCUMENTATION :: END Stream  Direct Play % else: Stream  Transcoding - % if a['throttled']: + (Speed: ${a['transcode_speed']}) + % if a['throttled'] == '1': (Throttled) % endif @@ -171,6 +173,7 @@ DOCUMENTATION :: END % endif
+
${a['transcode_progress']}%
${a['progress_percent']}%
diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 41256e2d..ab311a87 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -579,6 +579,8 @@ 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') @@ -586,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 = '' @@ -622,6 +627,8 @@ class PmsConnect(object): '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, @@ -667,6 +674,8 @@ 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') @@ -677,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 = '' @@ -735,6 +747,8 @@ class PmsConnect(object): '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, @@ -789,6 +803,8 @@ class PmsConnect(object): '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, @@ -843,6 +859,8 @@ class PmsConnect(object): '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, From 2c835546311fd42fcb6eb904ea4befb276e6085f Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 6 Sep 2015 21:13:56 -0700 Subject: [PATCH 13/15] Update documentation --- data/interfaces/default/current_activity.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/interfaces/default/current_activity.html b/data/interfaces/default/current_activity.html index f0ebcc66..da9a0c0d 100644 --- a/data/interfaces/default/current_activity.html +++ b/data/interfaces/default/current_activity.html @@ -35,6 +35,8 @@ 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. From ebd0276eae00e6afd34a82e331ee373e1336f66d Mon Sep 17 00:00:00 2001 From: Tim Date: Mon, 7 Sep 2015 20:43:15 +0200 Subject: [PATCH 14/15] Fix bug when parsing custom notification strings with unicode characters. --- plexpy/notification_handler.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index 5330b7e5..1e751bac 100644 --- a/plexpy/notification_handler.py +++ b/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: From fcc4575a860334cb226062f7c22d4aa62170eb02 Mon Sep 17 00:00:00 2001 From: Tim Date: Mon, 7 Sep 2015 21:15:52 +0200 Subject: [PATCH 15/15] v1.1.7 --- CHANGELOG.md | 11 +++++++++++ plexpy/version.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a749bf1c..438c5d5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## 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. diff --git a/plexpy/version.py b/plexpy/version.py index 9fbd0cc4..fccdc84b 100644 --- a/plexpy/version.py +++ b/plexpy/version.py @@ -1,2 +1,2 @@ PLEXPY_VERSION = "master" -PLEXPY_RELEASE_VERSION = "1.1.6" +PLEXPY_RELEASE_VERSION = "1.1.7"