From 2d19accdd1c147bddcfa35b1ffdbde8bc8b75a0f Mon Sep 17 00:00:00 2001 From: drzoidberg33 Date: Sun, 23 Aug 2015 00:08:55 +0200 Subject: [PATCH 1/3] Revert "Info pages" --- data/interfaces/default/css/plexpy.css | 20 ++------- data/interfaces/default/info.html | 56 +++++++++++--------------- plexpy/pmsconnect.py | 5 +-- 3 files changed, 27 insertions(+), 54 deletions(-) diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index 7bbf8d46..7d715a3c 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -23,7 +23,7 @@ select { outline: none; } select.input-sm { - margin: 5px 0 5px 0; + margin: 5px 0 5px 0; border: 2px solid #444; background: #333; -webkit-border-radius: 2px; @@ -34,8 +34,8 @@ select.input-sm { } img { -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; } .navbar { background: #000; @@ -792,11 +792,6 @@ input[type="color"], width: 174px; height: 260px; } -.summary-content-poster a:hover .poster-face { - 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; -} .summary-content-poster img { bottom: 0; overflow: hidden; @@ -848,13 +843,6 @@ input[type="color"], line-height: 32px; float: left; } -.summary-content-title h1 a{ - color: #F9AA03; -} -.summary-content-title h1 a:hover{ - color: #F9AA03; - text-decoration: underline; -} .summary-content-details-wrapper { width: 100%; padding-bottom: 15px; @@ -921,8 +909,6 @@ input[type="color"], } .summary-content-people-wrapper { margin-top: 25px; - margin-right: 25px; - float: left; } .summary-content-people-wrapper hidden-phone hidden-tablet { overflow: hidden; diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index 8eba3f9b..b2ba2b98 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -54,18 +54,10 @@ DOCUMENTATION :: END
-
@@ -342,8 +332,8 @@ DOCUMENTATION :: END % endif % endif diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 7fb15618..54d2093f 100644 --- a/plexpy/pmsconnect.py +++ b/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 @@ -334,8 +334,6 @@ 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'), @@ -396,7 +394,6 @@ 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'), From 29204cb6ba5bc6cf89ab41a09b90e373f4e1988a Mon Sep 17 00:00:00 2001 From: Tim Date: Sun, 6 Sep 2015 15:33:17 +0200 Subject: [PATCH 2/3] Fix weird issue with bad merge. --- plexpy/pmsconnect.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 8bb317b0..d25e783e 100644 --- a/plexpy/pmsconnect.py +++ b/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 @@ -383,6 +383,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'), @@ -443,6 +445,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'), From 1deef5c09efe045ca2307d874db9a6d9c727421b Mon Sep 17 00:00:00 2001 From: Brian Charbonneau Date: Sat, 12 Sep 2015 21:53:32 -0700 Subject: [PATCH 3/3] Added client IP address option to notifications --- data/interfaces/default/settings.html | 3 +++ plexpy/notification_handler.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index a498399d..3e492b64 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -797,6 +797,9 @@ available_notification_agents = notifiers.available_notification_agents() The name of the device being used for playback. + {ip_address} + The IP address of the device being used for playback. + {platform} The type of client being used for playback. diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index 1e751bac..43b6b93b 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -316,6 +316,7 @@ def build_notify_text(session, state): available_params = {'server_name': server_name, 'user': session['friendly_name'], 'player': session['player'], + 'ip_address': session['ip_address'], 'title': full_title, 'show_name': item_metadata['grandparent_title'], 'episode_name': item_metadata['title'], @@ -493,4 +494,4 @@ def strip_tag(data): import re p = re.compile(r'<.*?>') - return p.sub('', data) \ No newline at end of file + return p.sub('', data)