From e22dac963a4a7c8453cfa748bbcf3db9f4d25b83 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 6 Apr 2017 20:50:03 +0100 Subject: [PATCH] Also fixed the issue for the Emby Newsletter where episodes were not getting added :( --- .../EmbyRecentlyAddedNewsletter.cs | 9 +++++++-- Ombi.UI/Views/Admin/NewsletterSettings.cshtml | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Ombi.Services/Jobs/RecentlyAddedNewsletter/EmbyRecentlyAddedNewsletter.cs b/Ombi.Services/Jobs/RecentlyAddedNewsletter/EmbyRecentlyAddedNewsletter.cs index c334b17cd..a5b18f8b5 100644 --- a/Ombi.Services/Jobs/RecentlyAddedNewsletter/EmbyRecentlyAddedNewsletter.cs +++ b/Ombi.Services/Jobs/RecentlyAddedNewsletter/EmbyRecentlyAddedNewsletter.cs @@ -116,7 +116,7 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter var firstRun = !recentlyAdded.Any(); var filteredMovies = movie.Where(m => recentlyAdded.All(x => x.ProviderId != m.ProviderId)).ToList(); - var filteredEp = episodes.Where(m => recentlyAdded.All(x => x.ProviderId != m.ProviderId)).ToList(); + var filteredEp = episodes.Where(m => recentlyAdded.All(x => x.ProviderId != m.EmbyId)).ToList(); var filteredSeries = series.Where(m => recentlyAdded.All(x => x.ProviderId != m.ProviderId)).ToList(); var info = new List(); @@ -144,6 +144,11 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter // Check if there are any epiosdes, then get the series info. // Otherwise then just add the series to the newsletter + if (test && !filteredEp.Any() && episodes.Any()) + { + // if this is a test make sure we show something + filteredEp = episodes.Take(5).ToList(); + } if (filteredEp.Any()) { var recentlyAddedModel = new List(); @@ -247,7 +252,7 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter { RecentlyAddedLog.Insert(new RecentlyAddedLog { - ProviderId = a.ProviderId, + ProviderId = a.EmbyId, AddedAt = DateTime.UtcNow }); } diff --git a/Ombi.UI/Views/Admin/NewsletterSettings.cshtml b/Ombi.UI/Views/Admin/NewsletterSettings.cshtml index e69df55f5..6a96144eb 100644 --- a/Ombi.UI/Views/Admin/NewsletterSettings.cshtml +++ b/Ombi.UI/Views/Admin/NewsletterSettings.cshtml @@ -33,7 +33,7 @@
-