From 6b6ed3417fc84012a77300da3641433dccde16da Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 5 Mar 2021 17:01:56 -0800
Subject: [PATCH] Update newsletters to support season titles

---
 data/interfaces/newsletters/recently_added.html          | 4 ++--
 data/interfaces/newsletters/recently_added.internal.html | 4 ++--
 plexpy/newsletters.py                                    | 8 +++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/data/interfaces/newsletters/recently_added.html b/data/interfaces/newsletters/recently_added.html
index 5f2ad6a1..1a78d059 100644
--- a/data/interfaces/newsletters/recently_added.html
+++ b/data/interfaces/newsletters/recently_added.html
@@ -754,9 +754,9 @@
                                                                             <p class="nowrap mb5" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;margin-bottom: 5px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;max-width: 325px;color: #ffffff;">
                                                                                 % for i, season in enumerate(show['season'][:8]):
                                                                                     % if season['episode_count'] == 1:
-                                                                                        Season ${season['media_index']} &middot; Episode ${season['episode'][0]['media_index']} - ${season['episode'][0]['title']}
+                                                                                        ${season['title']} &middot; Episode ${season['episode'][0]['media_index']} - ${season['episode'][0]['title']}
                                                                                     % else:
-                                                                                        Season ${season['media_index']} &middot; Episodes ${season['episode_range']}
+                                                                                        ${season['title']} &middot; Episodes ${season['episode_range']}
                                                                                     % endif
                                                                                     % if i < min(show['season_count'], 7):
                                                                                         <br>
diff --git a/data/interfaces/newsletters/recently_added.internal.html b/data/interfaces/newsletters/recently_added.internal.html
index bd0fcba7..4a9a1729 100644
--- a/data/interfaces/newsletters/recently_added.internal.html
+++ b/data/interfaces/newsletters/recently_added.internal.html
@@ -754,9 +754,9 @@
                                                                             <p class="nowrap mb5">
                                                                                 % for i, season in enumerate(show['season'][:8]):
                                                                                     % if season['episode_count'] == 1:
-                                                                                        Season ${season['media_index']} &middot; Episode ${season['episode'][0]['media_index']} - ${season['episode'][0]['title']}
+                                                                                        ${season['title']} &middot; Episode ${season['episode'][0]['media_index']} - ${season['episode'][0]['title']}
                                                                                     % else:
-                                                                                        Season ${season['media_index']} &middot; Episodes ${season['episode_range']}
+                                                                                        ${season['title']} &middot; Episodes ${season['episode_range']}
                                                                                     % endif
                                                                                     % if i < min(show['season_count'], 7):
                                                                                         <br>
diff --git a/plexpy/newsletters.py b/plexpy/newsletters.py
index c74f2a96..ef15861b 100644
--- a/plexpy/newsletters.py
+++ b/plexpy/newsletters.py
@@ -757,11 +757,13 @@ class RecentlyAdded(Newsletter):
                 filtered_children.sort(key=lambda x: int(x['parent_media_index']))
 
                 seasons = []
-                for k, v in groupby(filtered_children, key=lambda x: x['parent_media_index']):
-                    episodes = list(v)
+                for (index, title), children in groupby(filtered_children,
+                                                        key=lambda x: (x['parent_media_index'], x['parent_title'])):
+                    episodes = list(children)
                     num, num00 = format_group_index([helpers.cast_to_int(d['media_index']) for d in episodes])
 
-                    seasons.append({'media_index': k,
+                    seasons.append({'media_index': index,
+                                    'title': title,
                                     'episode_range': num00,
                                     'episode_count': len(episodes),
                                     'episode': episodes})