From d750c5f61017f2c6e4b8e9b865bc04664c6d590d Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 29 Jul 2015 01:06:21 +0200 Subject: [PATCH] Some minor styling changes. Add album_name as parameter for notifications. --- data/interfaces/default/plexwatch_import.html | 36 ++- data/interfaces/default/settings.html | 248 +++++++++--------- plexpy/config.py | 2 - plexpy/notification_handler.py | 3 +- 4 files changed, 143 insertions(+), 146 deletions(-) diff --git a/data/interfaces/default/plexwatch_import.html b/data/interfaces/default/plexwatch_import.html index a5395b87..9ce21faa 100644 --- a/data/interfaces/default/plexwatch_import.html +++ b/data/interfaces/default/plexwatch_import.html @@ -3,25 +3,23 @@

Import PlexWatch Database

-
-
- - -

Enter the path and file name for the PlexWatch database you wish to import.

-
-
- - -

The table name from which you wish to import. Only import one of these, importing both will result in duplicated data.

-
-
- - -

Enter the minimum duration (in seconds) an item must have been active for. Set to 0 to import all.

-
+
+ + +

Enter the path and file name for the PlexWatch database you wish to import.

+
+
+ + +

The table name from which you wish to import. Only import one of these, importing both will result in duplicated data.

+
+
+ + +

Enter the minimum duration (in seconds) an item must have been active for. Set to 0 to import all.

diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 21cb262d..685d50df 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -407,117 +407,115 @@

Date & Time Format Options

-
- - - - - - - - - - - - - - - - - - - - +
Day
DDNumeric, with leading zeros01 to 31
DNumeric, without leading zeros1 to 31
DoThe English suffix for the day of the monthst, nd or th in the 1st, 2nd or 15th.
+ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Day
DDNumeric, with leading zeros01 to 31
DNumeric, without leading zeros1 to 31
DoThe English suffix for the day of the monthst, nd or th in the 1st, 2nd or 15th.
Month
MMNumeric, with leading zeros01 to 31
MNumeric, without leading zeros1 to 31
MMMMTextual fullJanuary to December
MMMTextual three lettersJan to Dec
Month
MMNumeric, with leading zeros01 to 31
MNumeric, without leading zeros1 to 31
MMMMTextual fullJanuary to December
MMMTextual three lettersJan to Dec
Year
YYYYNumeric, 4 digitsEg., 1999, 2003
YYNumeric, 2 digitsEg., 99, 03
Year
YYYYNumeric, 4 digitsEg., 1999, 2003
YYNumeric, 2 digitsEg., 99, 03
Time
aam/pm Lowercaseam, pm
AAM/PM UppercaseAM, PM
hHour, 12-hour, without leading zeros1-12
hhHour, 12-hour, with leading zeros01-12
HHour, 24-hour, without leading zeros0-23
HHHour, 24-hour, with leading zeros00-23
mmMinutes, with leading zeros00-59
ssSeconds, with leading zeros00-59
zzTimezone abbreviationEg., EST, MDT ...
-
+ +
Time
+ + + a + am/pm Lowercase + am, pm + + + A + AM/PM Uppercase + AM, PM + + + h + Hour, 12-hour, without leading zeros + 1-12 + + + hh + Hour, 12-hour, with leading zeros + 01-12 + + + H + Hour, 24-hour, without leading zeros + 0-23 + + + HH + Hour, 24-hour, with leading zeros + 00-23 + + + mm + Minutes, with leading zeros + 00-59 + + + ss + Seconds, with leading zeros + 00-59 + + + zz + Timezone abbreviation + Eg., EST, MDT ... + + +
@@ -530,22 +528,20 @@
-
- - This will attempt to fetch your token for you. This will not work on Internet Explorer 9 or lower. - PlexPy does not store your username and password. - -

-
- - -

Username for Plex.tv authentication.

-
-
- - -

Password for Plex.tv authentication.

-
+ + This will attempt to fetch your token for you. This will not work on Internet Explorer 9 or lower. + PlexPy does not store your username and password. + +

+
+ + +

Username for Plex.tv authentication.

+
+
+ + +

Password for Plex.tv authentication.

@@ -604,6 +600,10 @@ {episode_name} The title of the episode being played back. + + {album_name} + The title of the album being played back if item is track. + {transcode_decision} The transcode decisions for the media item. diff --git a/plexpy/config.py b/plexpy/config.py index 96aacc3b..5875d40f 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -27,11 +27,9 @@ _CONFIG_DEFINITIONS = { 'PMS_IS_REMOTE': (int, 'PMS', 0), 'PMS_LOGS_FOLDER': (str, 'PMS', ''), 'PMS_PORT': (int, 'PMS', 32400), - 'PMS_PASSWORD': (str, 'PMS', ''), 'PMS_TOKEN': (str, 'PMS', ''), 'PMS_SSL': (int, 'General', 0), 'PMS_URL': (str, 'PMS', ''), - 'PMS_USERNAME': (str, 'PMS', ''), 'PMS_USE_BIF': (int, 'PMS', 0), 'PMS_UUID': (str, 'PMS', ''), 'TIME_FORMAT': (str, 'General', 'HH:mm'), diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index 0c6cb32f..977f1263 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -210,7 +210,7 @@ def build_notify_text(session, state): on_watched_body = strip_tag(re.sub('[^>]+.|[^>]+.', '', plexpy.CONFIG.NOTIFY_ON_WATCHED_BODY_TEXT)) else: - on_start_subject = plexpy.CONFIG.NOTIFY_ON_START_SUBJECT_TEXT + on_start_subject = plexpy.CONFIG.NOTIFY_ON_START_SUBJECT_TEXT on_start_body = plexpy.CONFIG.NOTIFY_ON_START_BODY_TEXT on_stop_subject = plexpy.CONFIG.NOTIFY_ON_STOP_SUBJECT_TEXT on_stop_body = plexpy.CONFIG.NOTIFY_ON_STOP_BODY_TEXT @@ -261,6 +261,7 @@ def build_notify_text(session, state): 'summary': item_metadata['summary'], 'season_num': item_metadata['parent_index'], 'episode_num': item_metadata['index'], + 'album_name': item_metadata['parent_title'], 'rating': item_metadata['rating'], 'duration': duration, 'progress': view_offset,