From 0e2504fc789caab07cf6ce58db2005eeccef58d8 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Tue, 1 Mar 2016 20:31:21 -0800 Subject: [PATCH] Document remaining time format options --- data/interfaces/default/css/plexpy.css | 9 + data/interfaces/default/settings.html | 241 ++++++++++++++++++++----- plexpy/notification_handler.py | 10 +- 3 files changed, 208 insertions(+), 52 deletions(-) diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index 9cb75630..6fb199ab 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -2656,6 +2656,7 @@ table[id^='media_info_child'] table[id^='media_info_child'] thead th { margin: 5px 0 0 0.5em; } .notification-params { + width: 100%; margin-top: 10px; background-color: #282828; } @@ -2670,6 +2671,14 @@ table[id^='media_info_child'] table[id^='media_info_child'] thead th { padding-left: 10px; width: 200px; } +.notification-params.time-options td:first-child { + padding-left: 10px; + width: 125px; +} +.notification-params.time-options td:nth-child(2) { + padding-left: 10px; + width: 275px; +} .notification-params td:not(:first-child) { padding-right: 10px; } diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index b6f39a54..75bbe41e 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -1031,24 +1031,45 @@ available_notification_agents = sorted(notifiers.available_notification_agents()

Date & Time Format Options

- +
+ + + + + - - - - + - + - + +
+ Year +
Year
YYYYNumeric, 4 digitsNumeric, four digits Eg., 1999, 2003
YYNumeric, 2 digitsNumeric, two digits Eg., 99, 03
+ + - + + + + + + + + + + + + + @@ -1060,23 +1081,41 @@ available_notification_agents = sorted(notifiers.available_notification_agents() + +
Month
 + Month +
MMMMTextual, fullJanuary-December
MMMTextual, three lettersJan-Dec
MMNumeric, without leading zeros 1-12
+ + - - - + + + + + + + + - - - + + + - + +
MMMMTextual fullJanuary-December + Day of the Year +
DDDDNumeric, with leading zeros001-365
MMMTextual three lettersJan-DecDDDNumeric, without leading zeros1-365
+ + - + + + - - + + @@ -1086,57 +1125,165 @@ available_notification_agents = sorted(notifiers.available_notification_agents() - - + + - + +
Day
 + Day of the Month +
DDNumeric, with leading zerosDDNumeric, with leading zeros 01-31
DoThe English suffix for the day of the monthst, nd or th in the 1st, 2nd or 15th.Numeric, with suffixEg., 1st, 2nd ... 31st.
+ + - + + + + + + + + - - - + + + - - - + + + + +
Time
 + Day of the Week +
ddddTextual, fullSunday-Saturday
aam/pm Lowercaseam, pmdddTextual, three lettersSun-Sat
AAM/PM UppercaseAM, PMdNumeric0-6
+ + - - - - - - - - - - - - - + + + - + + + + + + + + + + + + + + + + + +
hHour, 12-hour, without leading zeros1-12
hhHour, 12-hour, with leading zeros01-12
HHour, 24-hour, without leading zeros0-23 + Hour +
HHHour, 24-hour, with leading zeros24-hour, with leading zeros 00-23
H24-hour, without leading zeros0-23
hh12-hour, with leading zeros01-12
h12-hour, without leading zeros1-12
+ + + + + + + - + + + + + + + +
+ Minute +
mmMinutes, with leading zerosNumeric, with leading zeros 00-59
mNumeric, without leading zeros0-59
+ + + + + + + - + - - - + + + + + +
+ Second +
ssSeconds, with leading zerosNumeric, with leading zeros 00-59
zzTimezone abbreviationEg., EST, MDT ...sNumeric, without leading zeros0-59
+ + + + + + + + + + + + + + + + + + +
+ AM / PM +
AAM/PM uppercaseAM, PM
aam/pm lowercaseam, pm
+ + + + + + + + + + + + + + + + + + +
+ Timezone +
ZZUTC offsetEg., +0100, -0700
ZUTC offsetEg., +01:00, -07:00
+ + + + + + + + + + +
+ Timestamp +
XUnix timestampEg., 1456887825
diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index 0ceb4692..43cc71ea 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -441,9 +441,9 @@ def set_notify_state(session, notify_action, agent_info, notify_strings, metadat def build_notify_text(session=None, timeline=None, notify_action=None, agent_id=None): # Get time formats - date_format = plexpy.CONFIG.DATE_FORMAT.replace('Do','').replace('zz','') - time_format = plexpy.CONFIG.TIME_FORMAT.replace('Do','').replace('zz','') - duration_format = plexpy.CONFIG.TIME_FORMAT.replace('Do','').replace('zz','').replace('a','').replace('A','') + date_format = plexpy.CONFIG.DATE_FORMAT.replace('Do','') + time_format = plexpy.CONFIG.TIME_FORMAT.replace('Do','') + duration_format = plexpy.CONFIG.TIME_FORMAT.replace('Do','').replace('a','').replace('A','') # Get the server name server_name = plexpy.CONFIG.PMS_NAME @@ -900,8 +900,8 @@ def build_notify_text(session=None, timeline=None, notify_action=None, agent_id= def build_server_notify_text(notify_action=None, agent_id=None): # Get time formats - date_format = plexpy.CONFIG.DATE_FORMAT.replace('Do','').replace('zz','') - time_format = plexpy.CONFIG.TIME_FORMAT.replace('Do','').replace('zz','') + date_format = plexpy.CONFIG.DATE_FORMAT.replace('Do','') + time_format = plexpy.CONFIG.TIME_FORMAT.replace('Do','') # Get the server name server_name = plexpy.CONFIG.PMS_NAME