diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index cfbf5933..ef06c9dc 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -2520,4 +2520,29 @@ table[id^='history_child'] thead th { -ms-transition: background 0.3s; -o-transition: background 0.3s; transition: background 0.3s; +} + +.notification-params { + margin-top: 10px; + background-color: #282828; +} +.notification-params th { + padding-left: 10px; + height: 30px; +} +.notification-params td { + height: 25px; +} +.notification-params td:first-child { + padding-left: 10px; + width: 200px; +} +.notification-params td:not(:first-child) { + padding-right: 10px; +} +.notification-params tr:nth-child(odd) td { + background-color: rgba(255,255,255,0.035); +} +.notification-params tr:nth-child(even) td { + background-color: rgba(255,255,255,0.010); } \ No newline at end of file diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index e5e1cca0..b70f78b7 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -930,155 +930,248 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
-

Notification string substitutions

+

Notification String Substitutions

- If a value for a selected parameter cannot be provided nothing will be outputted for it. + If the value for a selected parameter cannot be provided, it will display as blank.

- +
+ + + + + - + - + + +
+ Server Details +
{server_name}{server_name} The name of your Plex Server.
{server_uptime}{server_uptime} The uptime (in days, hours, mins, secs) of your Plex Server.
+ + - + + + + + + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{user} + Stream Details +
{user} The username of the person streaming.
{platform}{platform} The type of client being used for playback.
{player}{player} The name of the device being used for playback.
{ip_address}{ip_address} The IP address of the device being used for playback. (PMS 0.9.14 and above)
{media_type}{media_type} The type of media being played (movie, episode, track).
{title}The full title of the item being played.
{show_name}The title of the TV series being played.
{episode_name}The title of the episode being played.
{artist_name}The name of the artist being played.
{album_name}The title of the album being played.
{track_name}The title of the track being played.
{season_num}The season number for the media item if item is episode.
{season_num00}The two digit season number.
{episode_num}The episode number for the media item if item is episode.
{episode_num00}The two digit episode number.
{video_decision}The video transcode decisions for the media item.
{audio_decision}The audio transcode decisions for the media item.
{transcode_decision}The stream transcode decisions for the media item.
{year}The release year for the media item.
{studio}The studio for the media item.
{content_rating}The content rating for the media item. (e.g. TV-MA, TV-PG, etc.)
{directors}A list of directors for the media item.
{writers}A list of writers for the media item.
{actors}A list of actors for the media item.
{genres}A list of genres for the media item.
{summary}A short plot summary for the media item.
{tagline}A tagline for the media item.
{rating}The rating (out of 10) for the item.
{duration}The duration (in minutes) for the item.
{stream_duration}{stream_duration} The stream duration (in minutes) for the item.
{remaining_duration}{remaining_duration} The remaining duration (in minutes) for the item.
{progress}{progress} The last reported offset (in minutes) for the item.
{progress_percent}{progress_percent} The last reported progress percent for the item.
{container}The media container of the original media.
{video_codec}The video codec of the original media.
{video_bitrate}The video bitrate of the original media.
{video_width}The video width of the original media.
{video_height}The video height of the original media.
{video_resolution}The video resolution of the original media.
{video_framerate}The video framerate of the original media.
{aspect_ratio}The aspect ratio of the original media.
{audio_codec}The audio codec of the original media.
{audio_channels}The audio channels of the original media.
{transcode_decision}The stream transcode decisions for the media item.
{video_decision}The video transcode decisions for the media item.
{audio_decision}The audio transcode decisions for the media item.
{transcode_container}The media container of the transcoded media.
{transcode_video_codec}The video codec of the transcoded media.
{transcode_video_width}The video width of the transcoded media.
{transcode_video_height}The video height of the transcoded media.
{transcode_audio_codec}The audio codec of the transcoded media.
{transcode_audio_channels}The audio channels of the transcoded media.
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Metadata Details +
{title}The full title of the item being played.
{show_name}The title of the TV series being played.
{episode_name}The title of the episode being played.
{artist_name}The name of the artist being played.
{album_name}The title of the album being played.
{track_name}The title of the track being played.
{season_num}The season number for the media item if item is episode.
{season_num00}The two digit season number.
{episode_num}The episode number for the media item if item is episode.
{episode_num00}The two digit episode number.
{year}The release year for the media item.
{studio}The studio for the media item.
{content_rating}The content rating for the media item. (e.g. TV-MA, TV-PG, etc.)
{directors}A list of directors for the media item.
{writers}A list of writers for the media item.
{actors}A list of actors for the media item.
{genres}A list of genres for the media item.
{summary}A short plot summary for the media item.
{tagline}A tagline for the media item.
{rating}The rating (out of 10) for the item.
{duration}The duration (in minutes) for the item.
@@ -1092,7 +1185,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
-

Notification exclusion tags

+

Notification Exclusion Tags

@@ -1101,21 +1194,24 @@ available_notification_agents = sorted(notifiers.available_notification_agents()

All text inside a movie tag will only be sent when the media item being played back is a movie.

- 
Example: {user} has started playing {title} <movie>({year})</movie>
+

Example:

+ 
{user} has started playing {title} <movie>({year})</movie>

TV Tag <tv></tv>

All text inside a tv tag will only be sent when the media item being played back is an episode.

- 
Example: {user} has started playing {title} <tv>(S{season_num}E{episode_num})</tv>
+

Example:

+ 
{user} has started playing {title} <tv>(S{season_num}E{episode_num})</tv>

Music Tag <music></music>

All text inside a music tag will only be sent when the media item being played back is a music track.

- 
Example: {user} has started playing {title} <music>(Track {episode_num})</music>
+

Example:

+ 
{user} has started playing {title} <music>(Track {episode_num})</music>
diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index fdbe3f22..b5554252 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -370,15 +370,31 @@ def build_notify_text(session=None, timeline=None, state=None): duration = helpers.convert_milliseconds_to_minutes(metadata['duration']) # Default values - video_decision = '' - audio_decision = '' - transcode_decision = '' - stream_duration = 0 - view_offset = 0 user = '' platform = '' player = '' ip_address = 'N/A' + stream_duration = 0 + view_offset = 0 + container = '' + video_codec = '' + video_bitrate = '' + video_width = '' + video_height = '' + video_resolution = '' + video_framerate = '' + aspect_ratio = '' + audio_codec = '' + audio_channels = '' + transcode_decision = '' + video_decision = '' + audio_decision = '' + transcode_container = '' + transcode_video_codec = '' + transcode_video_width = '' + transcode_video_height = '' + transcode_audio_codec = '' + transcode_audio_channels = '' # Session values if session: @@ -405,6 +421,22 @@ def build_notify_text(session=None, timeline=None, state=None): platform = session['platform'] player = session['player'] ip_address = session['ip_address'] if session['ip_address'] else 'N/A' + container = session['container'] + video_codec = session['video_codec'] + video_bitrate = session['bitrate'] + video_width = session['width'] + video_height = session['height'] + video_resolution = session['video_resolution'] + video_framerate = session['video_framerate'] + aspect_ratio = session['aspect_ratio'] + audio_codec = session['audio_codec'] + audio_channels = session['audio_channels'] + transcode_container = session['transcode_container'] + transcode_video_codec = session['transcode_video_codec'] + transcode_video_width = session['transcode_width'] + transcode_video_height = session['transcode_height'] + transcode_audio_codec = session['transcode_audio_codec'] + transcode_audio_channels = session['transcode_audio_channels'] progress_percent = helpers.get_percent(view_offset, duration) @@ -429,6 +461,29 @@ def build_notify_text(session=None, timeline=None, state=None): 'player': player, 'ip_address': ip_address, 'media_type': metadata['media_type'], + 'stream_duration': stream_duration, + 'remaining_duration': duration - view_offset, + 'progress': view_offset, + 'progress_percent': progress_percent, + 'container': container, + 'video_codec': video_codec, + 'video_bitrate': video_bitrate, + 'video_width': video_width, + 'video_height': video_height, + 'video_resolution': video_resolution, + 'video_framerate': video_framerate, + 'aspect_ratio': aspect_ratio, + 'audio_codec': audio_codec, + 'audio_channels': audio_channels, + 'transcode_decision': transcode_decision, + 'video_decision': video_decision, + 'audio_decision': audio_decision, + 'transcode_container': transcode_container, + 'transcode_video_codec': transcode_video_codec, + 'transcode_video_width': transcode_video_width, + 'transcode_video_height': transcode_video_height, + 'transcode_audio_codec': transcode_audio_codec, + 'transcode_audio_channels': transcode_audio_channels, 'title': full_title, 'show_name': show_name, 'episode_name': episode_name, @@ -439,9 +494,6 @@ def build_notify_text(session=None, timeline=None, state=None): 'season_num00': metadata['parent_index'].zfill(2), 'episode_num': metadata['index'].zfill(1), 'episode_num00': metadata['index'].zfill(2), - 'video_decision': video_decision, - 'audio_decision': audio_decision, - 'transcode_decision': transcode_decision, 'year': metadata['year'], 'studio': metadata['studio'], 'content_rating': metadata['content_rating'], @@ -452,11 +504,7 @@ def build_notify_text(session=None, timeline=None, state=None): 'summary': metadata['summary'], 'tagline': metadata['tagline'], 'rating': metadata['rating'], - 'duration': duration, - 'stream_duration': stream_duration, - 'remaining_duration': duration - view_offset, - 'progress': view_offset, - 'progress_percent': progress_percent + 'duration': duration } # Default subject text