From 7f2bab3082e51a538de5cc54e8d9d75d450eaf9c Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Fri, 11 May 2018 18:27:31 -0700 Subject: [PATCH] Switch to header styles for newsletter template --- .../newsletters/recently_added.html | 264 +++++++++--------- ...master.html => recently_added.inline.html} | 264 +++++++++--------- plexpy/newsletters.py | 10 +- plexpy/webserve.py | 5 +- 4 files changed, 268 insertions(+), 275 deletions(-) rename data/interfaces/newsletters/{recently_added_master.html => recently_added.inline.html} (68%) diff --git a/data/interfaces/newsletters/recently_added.html b/data/interfaces/newsletters/recently_added.html index 06d3d000..135c7088 100644 --- a/data/interfaces/newsletters/recently_added.html +++ b/data/interfaces/newsletters/recently_added.html @@ -23,8 +23,8 @@ - - + + Tautulli Newsletter - ${subject} - -% if preview and service and service != 'self-hosted' : -

Note: Local preview images only - images will be uploaded to ${service.capitalize()} when the newsletter is sent.

+ +% if preview and service and service != 'self-hosted': +

Note: Local preview images only - images will be uploaded to ${service.capitalize()} when the newsletter is sent.

% elif preview and not service: -

Warning: The Image Hosting setting must be enabled for images to display on the newsletter.

+

Warning: The Image Hosting setting must be enabled for images to display on the newsletter.

% endif - +
-
-
+
+
- + Tautulli Newsletter - ${subject} % if base_url and not preview: -
- Click here to view the full newsletter. +
+ Click here to view the full newsletter.
% endif - +
- % if message: - % endif % if recently_added.get('movie'): - -
-
- +
+
+
-
${parameters['server_name']}
-
${parameters['start_date']} - ${parameters['end_date']}
+
${parameters['server_name']}
+
${parameters['start_date']} - ${parameters['end_date']}
-
-
${'
'.join(l for l in message.splitlines()) | n}
+ 		+
+
${'
'.join(l for l in message.splitlines()) | n}
-
-
- Recently Added Movies +
+
+
+ Recently Added Movies
-
- ${len(recently_added['movie'])} movie${'s' if len(recently_added['movie']) > 1 else ''} +
+ ${len(recently_added['movie'])} movie${'s' if len(recently_added['movie']) > 1 else ''}
- +
+ % for movie_a, movie_b in grouper(recently_added['movie'], 2): -
- +
+ % for movie in (movie_a, movie_b): % if movie: % if not movie_b: - + % endif -
- +
+ -
- + -
+ -
- - + + +
- +
+ - - -
- ${movie['title']} + + ${movie['title']}
+ % if movie['tagline']: -

+

${movie['tagline']}

% endif -

+

${movie['summary'][:450] + (movie['summary'][450:] and '...')}

- + % if not movie_b: - + % endif % endif % endfor @@ -788,32 +788,32 @@ % endif % if recently_added.get('show'): - -
+ - % if movie['rating']: <% rating = int(round(float(movie['rating']) / 2)) %> - % endif @@ -771,7 +771,7 @@
+ % if movie['year']: - ${movie['year']} + ${movie['year']} % endif % if movie['duration']: <% duration = int(int(movie['duration'])/60000) %> - ${duration} mins + ${duration} mins % endif % if movie['genres']: % for genre in movie['genres'][:2]: - ${genre} + ${genre} % endfor % endif + % for _ in range(rating): - ★ + ★ % endfor % for _ in range(5-rating): - ☆ + ☆ % endfor
-
-
- Recently Added TV Shows +
+
+
+ Recently Added TV Shows
-
- ${len(recently_added['show'])} show${'s' if len(recently_added['show']) > 1 else ''} / +
+ ${len(recently_added['show'])} show${'s' if len(recently_added['show']) > 1 else ''} / <% total_episodes = sum(season['episode_count'] for show in recently_added['show'] for season in show['season']) %> - ${total_episodes} episode${'s' if total > 1 else ''} + ${total_episodes} episode${'s' if total > 1 else ''}
- +
+ % for show_a, show_b in grouper(recently_added['show'], 2): -
- +
+ % for show in (show_a, show_b): % if show: % if not show_b: - + % endif <% if show['season_count'] == 1: @@ -824,41 +824,41 @@ else: link_rating_key = show['rating_key'] %> -
- +
+ -
- + -
+ -
- - + + +
- +
+ - - -
- ${show['title']} + + ${show['title']}
-

+

+

% if show['season_count'] > 1: ${show['season_count']} seasons / % endif <% total_show_episodes = sum(s['episode_count'] for s in show['season']) %> ${total_show_episodes} episode${'s' if total_show_episodes > 1 else ''}

-

+

% for i, season in enumerate(show['season'][:8]): Season ${season['media_index']} · % if season['episode_count'] == 1: @@ -873,7 +873,7 @@ % endif % endfor

-

+

% if show['season_count'] == 1 and show['season'][0]['episode_count'] == 1: ${show['season'][0]['episode'][0]['summary'][:350] + (show['season'][0]['episode'][0]['summary'][350:] and '...')} % else: @@ -886,32 +886,32 @@

- + % if not show_b: - + % endif % endif % endfor @@ -945,93 +945,93 @@ % endif % if recently_added.get('artist'): - -
+ - % if show['rating']: <% rating = int(round(float(show['rating']) / 2)) %> - % endif @@ -928,7 +928,7 @@
+ % if show['year']: - ${show['year']} + ${show['year']} % endif % if show['duration']: <% duration = int(int(show['duration'])/60000) %> - ${duration} mins + ${duration} mins % endif % if show['genres']: % for genre in show['genres'][:2]: - ${genre} + ${genre} % endfor % endif + % for _ in range(rating): - ★ + ★ % endfor % for _ in range(5-rating): - ☆ + ☆ % endfor
-
-
- Recently Added Music +
+
+
+ Recently Added Music
-
- ${len(recently_added['artist'])} artist${'s' if len(recently_added['artist']) > 1 else ''} / +
+ ${len(recently_added['artist'])} artist${'s' if len(recently_added['artist']) > 1 else ''} / <% total_albums = sum(artist['album_count'] for artist in recently_added['artist']) %> - ${total_albums} album${'s' if total > 1 else ''} + ${total_albums} album${'s' if total > 1 else ''}
- +
+ % for album_a, album_b in grouper([a for artist in recently_added['artist'] for a in artist['album']], 2): -
- +
+ % for album in (album_a, album_b): % if album: % if not album_b: - + % endif -
- +
+ -
- + -
+ -
- - + + +
- +
+ - - -
- ${album['title']} + + ${album['title']}
-

+

+

${album['parent_title']} · ${album['track_count']} track${'s' if album['track_count'] > 1 else ''}

% if artist['title'].lower() != 'various artists': -

+

${album['summary'][:200] + (album['summary'][200:] and '...')}

% endif
- + % if not album_b: - + % endif % endif % endfor @@ -1064,11 +1064,11 @@ % endif - diff --git a/data/interfaces/newsletters/recently_added_master.html b/data/interfaces/newsletters/recently_added.inline.html similarity index 68% rename from data/interfaces/newsletters/recently_added_master.html rename to data/interfaces/newsletters/recently_added.inline.html index 135c7088..06d3d000 100644 --- a/data/interfaces/newsletters/recently_added_master.html +++ b/data/interfaces/newsletters/recently_added.inline.html @@ -23,8 +23,8 @@ - - + + Tautulli Newsletter - ${subject} - -% if preview and service and service != 'self-hosted': -

Note: Local preview images only - images will be uploaded to ${service.capitalize()} when the newsletter is sent.

+ +% if preview and service and service != 'self-hosted' : +

Note: Local preview images only - images will be uploaded to ${service.capitalize()} when the newsletter is sent.

% elif preview and not service: -

Warning: The Image Hosting setting must be enabled for images to display on the newsletter.

+

Warning: The Image Hosting setting must be enabled for images to display on the newsletter.

% endif -
+ - % if album['rating']: <% rating = int(round(float(album['rating']) / 2)) %> - % endif @@ -1048,7 +1048,7 @@
+ % if album['year']: - ${album['year']} + ${album['year']} % endif % if album['genres']: % for genre in album['genres'][:2]: - ${genre} + ${genre} % endfor % endif + % for _ in range(rating): - ★ + ★ % endfor % for _ in range(5-rating): - ☆ + ☆ % endfor
+ -
-
- Newsletter generated by Tautulli. +
+
+ Newsletter generated by Tautulli.
+
-
-
+
+
- Tautulli Newsletter - ${subject} + % if base_url and not preview: -
- Click here to view the full newsletter. +
+ Click here to view the full newsletter.
% endif - +
- % if message: - % endif % if recently_added.get('movie'): - -
-
- +
+
+
-
${parameters['server_name']}
-
${parameters['start_date']} - ${parameters['end_date']}
+
${parameters['server_name']}
+
${parameters['start_date']} - ${parameters['end_date']}
-
-
${'
'.join(l for l in message.splitlines()) | n}
+ 		+
+
${'
'.join(l for l in message.splitlines()) | n}
-
-
- Recently Added Movies +
+
+
+ Recently Added Movies
-
- ${len(recently_added['movie'])} movie${'s' if len(recently_added['movie']) > 1 else ''} +
+ ${len(recently_added['movie'])} movie${'s' if len(recently_added['movie']) > 1 else ''}
- +
+ % for movie_a, movie_b in grouper(recently_added['movie'], 2): -
- +
+ % for movie in (movie_a, movie_b): % if movie: % if not movie_b: - + % endif -
- +
+ -
- + -
+ -
- - + + +
- +
+ - - -
- ${movie['title']} + + ${movie['title']}
+ % if movie['tagline']: -

+

${movie['tagline']}

% endif -

+

${movie['summary'][:450] + (movie['summary'][450:] and '...')}

- + % if not movie_b: - + % endif % endif % endfor @@ -788,32 +788,32 @@ % endif % if recently_added.get('show'): - -
+ - % if movie['rating']: <% rating = int(round(float(movie['rating']) / 2)) %> - % endif @@ -771,7 +771,7 @@
+ % if movie['year']: - ${movie['year']} + ${movie['year']} % endif % if movie['duration']: <% duration = int(int(movie['duration'])/60000) %> - ${duration} mins + ${duration} mins % endif % if movie['genres']: % for genre in movie['genres'][:2]: - ${genre} + ${genre} % endfor % endif + % for _ in range(rating): - ★ + ★ % endfor % for _ in range(5-rating): - ☆ + ☆ % endfor
-
-
- Recently Added TV Shows +
+
+
+ Recently Added TV Shows
-
- ${len(recently_added['show'])} show${'s' if len(recently_added['show']) > 1 else ''} / +
+ ${len(recently_added['show'])} show${'s' if len(recently_added['show']) > 1 else ''} / <% total_episodes = sum(season['episode_count'] for show in recently_added['show'] for season in show['season']) %> - ${total_episodes} episode${'s' if total > 1 else ''} + ${total_episodes} episode${'s' if total > 1 else ''}
- +
+ % for show_a, show_b in grouper(recently_added['show'], 2): -
- +
+ % for show in (show_a, show_b): % if show: % if not show_b: - + % endif <% if show['season_count'] == 1: @@ -824,41 +824,41 @@ else: link_rating_key = show['rating_key'] %> -
- +
+ -
- + -
+ -
- - + + +
- +
+ - - -
- ${show['title']} + + ${show['title']}
-

+

+

% if show['season_count'] > 1: ${show['season_count']} seasons / % endif <% total_show_episodes = sum(s['episode_count'] for s in show['season']) %> ${total_show_episodes} episode${'s' if total_show_episodes > 1 else ''}

-

+

% for i, season in enumerate(show['season'][:8]): Season ${season['media_index']} · % if season['episode_count'] == 1: @@ -873,7 +873,7 @@ % endif % endfor

-

+

% if show['season_count'] == 1 and show['season'][0]['episode_count'] == 1: ${show['season'][0]['episode'][0]['summary'][:350] + (show['season'][0]['episode'][0]['summary'][350:] and '...')} % else: @@ -886,32 +886,32 @@

- + % if not show_b: - + % endif % endif % endfor @@ -945,93 +945,93 @@ % endif % if recently_added.get('artist'): - -
+ - % if show['rating']: <% rating = int(round(float(show['rating']) / 2)) %> - % endif @@ -928,7 +928,7 @@
+ % if show['year']: - ${show['year']} + ${show['year']} % endif % if show['duration']: <% duration = int(int(show['duration'])/60000) %> - ${duration} mins + ${duration} mins % endif % if show['genres']: % for genre in show['genres'][:2]: - ${genre} + ${genre} % endfor % endif + % for _ in range(rating): - ★ + ★ % endfor % for _ in range(5-rating): - ☆ + ☆ % endfor
-
-
- Recently Added Music +
+
+
+ Recently Added Music
-
- ${len(recently_added['artist'])} artist${'s' if len(recently_added['artist']) > 1 else ''} / +
+ ${len(recently_added['artist'])} artist${'s' if len(recently_added['artist']) > 1 else ''} / <% total_albums = sum(artist['album_count'] for artist in recently_added['artist']) %> - ${total_albums} album${'s' if total > 1 else ''} + ${total_albums} album${'s' if total > 1 else ''}
- +
+ % for album_a, album_b in grouper([a for artist in recently_added['artist'] for a in artist['album']], 2): -
- +
+ % for album in (album_a, album_b): % if album: % if not album_b: - + % endif -
- +
+ -
- + -
+ -
- - + + +
- +
+ - - -
- ${album['title']} + + ${album['title']}
-

+

+

${album['parent_title']} · ${album['track_count']} track${'s' if album['track_count'] > 1 else ''}

% if artist['title'].lower() != 'various artists': -

+

${album['summary'][:200] + (album['summary'][200:] and '...')}

% endif
- + % if not album_b: - + % endif % endif % endfor @@ -1064,11 +1064,11 @@ % endif - diff --git a/plexpy/newsletters.py b/plexpy/newsletters.py index 12f5ecb1..e93ae078 100644 --- a/plexpy/newsletters.py +++ b/plexpy/newsletters.py @@ -319,7 +319,6 @@ class Newsletter(object): _DEFAULT_BODY = 'View the newsletter here: {newsletter_url}' _DEFAULT_MESSAGE = '' _DEFAULT_FILENAME = 'newsletter_{newsletter_uuid}.html' - _TEMPLATE_MASTER = '' _TEMPLATE = '' def __init__(self, newsletter_id=None, newsletter_id_name=None, config=None, email_config=None, @@ -412,19 +411,14 @@ class Newsletter(object): 'parameters': self.parameters, 'data': self.data} - def generate_newsletter(self, preview=False, master=False): + def generate_newsletter(self, preview=False): if preview: self.is_preview = True - if master: - template = self._TEMPLATE_MASTER - else: - template = self._TEMPLATE - self.retrieve_data() return serve_template( - templatename=template, + templatename=self._TEMPLATE, uuid=self.uuid, subject=self.subject_formatted, body=self.body_formatted, diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 86c04c6e..47a3bef2 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -5766,7 +5766,7 @@ class WebInterface(object): @cherrypy.expose @requireAuth(member_of("admin")) def real_newsletter(self, newsletter_id=None, start_date=None, end_date=None, - preview=False, master=False, raw=False, **kwargs): + preview=False, raw=False, **kwargs): if newsletter_id and newsletter_id != 'None': newsletter = newsletters.get_newsletter_config(newsletter_id=newsletter_id) @@ -5781,14 +5781,13 @@ class WebInterface(object): body=newsletter['body'], message=newsletter['message']) preview = (preview == 'true') - master = (master == 'true') raw = (raw == 'true') if raw: cherrypy.response.headers['Content-Type'] = 'application/json;charset=UTF-8' return json.dumps(newsletter_agent.raw_data(preview=preview)) - return newsletter_agent.generate_newsletter(preview=preview, master=master) + return newsletter_agent.generate_newsletter(preview=preview) logger.error(u"Failed to retrieve newsletter: Invalid newsletter_id %s" % newsletter_id) return "Failed to retrieve newsletter: invalid newsletter_id parameter"
+ - % if album['rating']: <% rating = int(round(float(album['rating']) / 2)) %> - % endif @@ -1048,7 +1048,7 @@
+ % if album['year']: - ${album['year']} + ${album['year']} % endif % if album['genres']: % for genre in album['genres'][:2]: - ${genre} + ${genre} % endfor % endif + % for _ in range(rating): - ★ + ★ % endfor % for _ in range(5-rating): - ☆ + ☆ % endfor
+ -
-
- Newsletter generated by Tautulli. +
+
+ Newsletter generated by Tautulli.