mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-08-19 04:49:33 -07:00
Fixes around the newsletter. We will now correctly show newly added shows and also newly added episodes. #1163
This commit is contained in:
tidusjar
parent
20c4ce8b7d
commit
3be69cbd61
2 changed files with 188 additions and 79 deletions
|
|
@ -134,6 +134,65 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
|||
newsletter.MovieCount = info.Count;
|
||||
|
||||
info.Clear();
|
||||
|
||||
// Check if there are any epiosdes, then get the series info.
|
||||
// Otherwise then just add the series to the newsletter
|
||||
if (filteredEp.Any())
|
||||
{
|
||||
var recentlyAddedModel = new List<EmbyRecentlyAddedModel>();
|
||||
foreach (var embyEpisodes in filteredEp)
|
||||
{
|
||||
// Let's sleep, Emby can't keep up with us.
|
||||
Thread.Sleep(1000);
|
||||
try
|
||||
{
|
||||
|
||||
// Find related series item
|
||||
var relatedSeries = series.FirstOrDefault(x => x.EmbyId == embyEpisodes.ParentId);
|
||||
|
||||
if (relatedSeries == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// Get series information
|
||||
var i = Api.GetInformation(relatedSeries.EmbyId, Ombi.Api.Models.Emby.EmbyMediaType.Series,
|
||||
embySettings.ApiKey, embySettings.AdministratorId, embySettings.FullUri);
|
||||
|
||||
var episodeInfo = Api.GetInformation(embyEpisodes.EmbyId,
|
||||
Ombi.Api.Models.Emby.EmbyMediaType.Episode,
|
||||
embySettings.ApiKey, embySettings.AdministratorId, embySettings.FullUri);
|
||||
// Check if we already have this series
|
||||
var existingSeries = recentlyAddedModel.FirstOrDefault(x =>
|
||||
x.EmbyInformation.SeriesInformation.Id.Equals(i.SeriesInformation.Id,
|
||||
StringComparison.CurrentCultureIgnoreCase));
|
||||
|
||||
if (existingSeries != null)
|
||||
{
|
||||
existingSeries.EpisodeInformation.Add(episodeInfo.EpisodeInformation);
|
||||
}
|
||||
else
|
||||
{
|
||||
recentlyAddedModel.Add(new EmbyRecentlyAddedModel
|
||||
{
|
||||
EmbyInformation = i,
|
||||
EpisodeInformation = new List<EmbyEpisodeInformation>() { episodeInfo.EpisodeInformation },
|
||||
EmbyContent = relatedSeries
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
catch (JsonReaderException)
|
||||
{
|
||||
Log.Error("Failed getting information from Emby, we may have overloaded Emby's api... Waiting and we will skip this one and go to the next");
|
||||
Thread.Sleep(1000);
|
||||
}
|
||||
}
|
||||
|
||||
info.AddRange(recentlyAddedModel);
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (var t in filteredSeries)
|
||||
{
|
||||
var i = Api.GetInformation(t.EmbyId, Ombi.Api.Models.Emby.EmbyMediaType.Series,
|
||||
|
|
@ -169,6 +228,7 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
|||
|
||||
info.Add(item);
|
||||
}
|
||||
}
|
||||
GenerateTvHtml(info, sb);
|
||||
newsletter.TvCount = info.Count;
|
||||
|
||||
|
|
@ -297,7 +357,7 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
|||
try
|
||||
{
|
||||
var info = TvApi.ShowLookupByTheTvDbId(int.Parse(seriesItem.ProviderIds.Tvdb));
|
||||
if(info == null)continue;
|
||||
if (info == null) continue;
|
||||
|
||||
var banner = info.image?.original;
|
||||
if (!string.IsNullOrEmpty(banner))
|
||||
|
|
@ -329,16 +389,17 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
|||
foreach (var embyEpisodeInformation in results.OrderBy(x => x.ParentIndexNumber))
|
||||
{
|
||||
var epSb = new StringBuilder();
|
||||
for (var i = 0; i < embyEpisodeInformation.IndexNumber.Count; i++)
|
||||
var orderedEpisodes = embyEpisodeInformation.IndexNumber.OrderBy(x => x.IndexNumber).ToList();
|
||||
for (var i = 0; i < orderedEpisodes.Count; i++)
|
||||
{
|
||||
var ep = embyEpisodeInformation.IndexNumber[i];
|
||||
if (i < embyEpisodeInformation.IndexNumber.Count)
|
||||
var ep = orderedEpisodes[i];
|
||||
if (i < embyEpisodeInformation.IndexNumber.Count - 1)
|
||||
{
|
||||
epSb.Append($"{ep.IndexNumber},");
|
||||
}
|
||||
else
|
||||
{
|
||||
epSb.Append(ep);
|
||||
epSb.Append(ep.IndexNumber);
|
||||
}
|
||||
}
|
||||
AddParagraph(sb, $"Season: {embyEpisodeInformation.ParentIndexNumber}, Episode: {epSb}");
|
||||
|
|
@ -359,7 +420,7 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
|||
}
|
||||
finally
|
||||
{
|
||||
if(endLoop)
|
||||
if (endLoop)
|
||||
EndLoopHtml(sb);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -97,6 +97,7 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
|||
{
|
||||
public PlexMetadata Metadata { get; set; }
|
||||
public PlexContent Content { get; set; }
|
||||
public List<PlexEpisodeMetadata> EpisodeMetadata { get; set; }
|
||||
}
|
||||
|
||||
private Newsletter GetHtml(bool test)
|
||||
|
|
@ -137,6 +138,46 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
|||
newsletter.MovieCount = info.Count;
|
||||
|
||||
info.Clear();
|
||||
if (filteredEp.Any())
|
||||
{
|
||||
var recentlyAddedModel = new List<PlexRecentlyAddedModel>();
|
||||
foreach (var plexEpisodes in filteredEp)
|
||||
{
|
||||
// Find related series item
|
||||
var relatedSeries = series.FirstOrDefault(x => x.ProviderId == plexEpisodes.ProviderId);
|
||||
|
||||
if (relatedSeries == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// Get series information
|
||||
var i = Api.GetMetadata(plexSettings.PlexAuthToken, plexSettings.FullUri, relatedSeries.ItemId);
|
||||
|
||||
var episodeInfo = Api.GetEpisodeMetaData(plexSettings.PlexAuthToken, plexSettings.FullUri, plexEpisodes.RatingKey);
|
||||
// Check if we already have this series
|
||||
var existingSeries = recentlyAddedModel.FirstOrDefault(x =>
|
||||
x.Metadata.Directory.RatingKey == i.Directory.RatingKey);
|
||||
|
||||
if (existingSeries != null)
|
||||
{
|
||||
existingSeries.EpisodeMetadata.Add(episodeInfo);
|
||||
}
|
||||
else
|
||||
{
|
||||
recentlyAddedModel.Add(new PlexRecentlyAddedModel
|
||||
{
|
||||
Metadata = i,
|
||||
EpisodeMetadata = new List<PlexEpisodeMetadata>() {episodeInfo},
|
||||
Content = relatedSeries
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
info.AddRange(recentlyAddedModel);
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (var t in filteredSeries)
|
||||
{
|
||||
var i = Api.GetMetadata(plexSettings.PlexAuthToken, plexSettings.FullUri, t.ItemId);
|
||||
|
|
@ -146,27 +187,33 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
|||
|
||||
}
|
||||
//var ep = filteredEp.Where(x => x.ShowTitle == t.Title);
|
||||
|
||||
if (filteredEp.Any())
|
||||
{
|
||||
var episodeList = new List<PlexEpisodeMetadata>();
|
||||
foreach (var ep in filteredEp)
|
||||
{
|
||||
var epInfo = Api.GetEpisodeMetaData(plexSettings.PlexAuthToken, plexSettings.FullUri,
|
||||
ep.RatingKey);
|
||||
episodeList.Add(epInfo);
|
||||
}
|
||||
|
||||
info.Add(new PlexRecentlyAddedModel
|
||||
{
|
||||
Metadata = i,
|
||||
Content = t,
|
||||
EpisodeMetadata = episodeList
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
info.Add(new PlexRecentlyAddedModel
|
||||
{
|
||||
Metadata = i,
|
||||
Content = t
|
||||
});
|
||||
//if (ep.Any())
|
||||
//{
|
||||
// var episodeList = new List<EmbyEpisodeInformation>();
|
||||
// foreach (var embyEpisodese in ep)
|
||||
// {
|
||||
// var epInfo = Api.GetInformation(embyEpisodese.EmbyId, Ombi.Api.Models.Emby.EmbyMediaType.Episode,
|
||||
// embySettings.ApiKey, embySettings.AdministratorId, embySettings.FullUri);
|
||||
// episodeList.Add(epInfo.EpisodeInformation);
|
||||
// }
|
||||
// info.Add(new EmbyRecentlyAddedModel
|
||||
// {
|
||||
// EmbyContent = t,
|
||||
// EmbyInformation = i,
|
||||
// EpisodeInformation = episodeList
|
||||
// });
|
||||
//}
|
||||
}
|
||||
}
|
||||
}
|
||||
GenerateTvHtml(info, sb);
|
||||
newsletter.TvCount = info.Count;
|
||||
|
|
@ -294,9 +341,7 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
|||
"<table border=\"0\" cellpadding=\"0\" align=\"center\" cellspacing=\"0\" style=\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\" width=\"100%\">");
|
||||
foreach (var t in orderedTv)
|
||||
{
|
||||
//var seriesItem = t.EmbyInformation.SeriesInformation;
|
||||
//var relatedEpisodes = t.EpisodeInformation;
|
||||
|
||||
var relatedEpisodes = t.EpisodeMetadata ?? new List<PlexEpisodeMetadata>();
|
||||
|
||||
try
|
||||
{
|
||||
|
|
@ -319,31 +364,34 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
|||
Header(sb, 3, title);
|
||||
EndTag(sb, "a");
|
||||
|
||||
//var results = relatedEpisodes.GroupBy(p => p.ParentIndexNumber,
|
||||
// (key, g) => new
|
||||
// {
|
||||
// ParentIndexNumber = key,
|
||||
// IndexNumber = g.ToList()
|
||||
// }
|
||||
//);
|
||||
// Group by the ParentIndex (season number)
|
||||
var results = relatedEpisodes.GroupBy(p => p.Video.FirstOrDefault()?.ParentIndex,
|
||||
(key, g) => new
|
||||
{
|
||||
ParentIndexNumber = key,
|
||||
IndexNumber = g.ToList()
|
||||
}
|
||||
);
|
||||
// Group the episodes
|
||||
//foreach (var embyEpisodeInformation in results.OrderBy(x => x.ParentIndexNumber))
|
||||
//{
|
||||
// var epSb = new StringBuilder();
|
||||
// for (var i = 0; i < embyEpisodeInformation.IndexNumber.Count; i++)
|
||||
// {
|
||||
// var ep = embyEpisodeInformation.IndexNumber[i];
|
||||
// if (i < embyEpisodeInformation.IndexNumber.Count)
|
||||
// {
|
||||
// epSb.Append($"{ep.IndexNumber},");
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// epSb.Append(ep);
|
||||
// }
|
||||
// }
|
||||
// AddParagraph(sb, $"Season: {embyEpisodeInformation.ParentIndexNumber}, Episode: {epSb}");
|
||||
//}
|
||||
foreach (var epInformation in results.OrderBy(x => x.ParentIndexNumber))
|
||||
{
|
||||
var orderedEpisodes = epInformation.IndexNumber.OrderBy(x => Convert.ToInt32(x.Video.FirstOrDefault().Index)).ToList();
|
||||
var epSb = new StringBuilder();
|
||||
for (var i = 0; i < orderedEpisodes.Count; i++)
|
||||
{
|
||||
var ep = orderedEpisodes[i];
|
||||
if (i <= orderedEpisodes.Count - 1)
|
||||
{
|
||||
epSb.Append($"{ep.Video.FirstOrDefault().Index},");
|
||||
}
|
||||
else
|
||||
{
|
||||
epSb.Append($"{ep.Video.FirstOrDefault().Index}");
|
||||
}
|
||||
|
||||
}
|
||||
AddParagraph(sb, $"Season: {epInformation.ParentIndexNumber}, Episode: {epSb}");
|
||||
}
|
||||
|
||||
if (info.genres.Any())
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue