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,40 +134,100 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
||||||
newsletter.MovieCount = info.Count;
|
newsletter.MovieCount = info.Count;
|
||||||
|
|
||||||
info.Clear();
|
info.Clear();
|
||||||
foreach (var t in filteredSeries)
|
|
||||||
|
// Check if there are any epiosdes, then get the series info.
|
||||||
|
// Otherwise then just add the series to the newsletter
|
||||||
|
if (filteredEp.Any())
|
||||||
{
|
{
|
||||||
var i = Api.GetInformation(t.EmbyId, Ombi.Api.Models.Emby.EmbyMediaType.Series,
|
var recentlyAddedModel = new List<EmbyRecentlyAddedModel>();
|
||||||
embySettings.ApiKey, embySettings.AdministratorId, embySettings.FullUri);
|
foreach (var embyEpisodes in filteredEp)
|
||||||
var ep = filteredEp.Where(x => x.ParentId == t.EmbyId).ToList();
|
|
||||||
var item = new EmbyRecentlyAddedModel
|
|
||||||
{
|
|
||||||
EmbyContent = t,
|
|
||||||
EmbyInformation = i,
|
|
||||||
};
|
|
||||||
if (ep.Any() && embySettings.EnableEpisodeSearching)
|
|
||||||
{
|
{
|
||||||
|
// Let's sleep, Emby can't keep up with us.
|
||||||
|
Thread.Sleep(1000);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var episodeList = new List<EmbyEpisodeInformation>();
|
|
||||||
foreach (var embyEpisodese in ep)
|
// Find related series item
|
||||||
|
var relatedSeries = series.FirstOrDefault(x => x.EmbyId == embyEpisodes.ParentId);
|
||||||
|
|
||||||
|
if (relatedSeries == null)
|
||||||
{
|
{
|
||||||
var epInfo = Api.GetInformation(embyEpisodese.EmbyId,
|
continue;
|
||||||
Ombi.Api.Models.Emby.EmbyMediaType.Episode,
|
|
||||||
embySettings.ApiKey, embySettings.AdministratorId, embySettings.FullUri);
|
|
||||||
episodeList.Add(epInfo.EpisodeInformation);
|
|
||||||
Thread.Sleep(600); // Let's not try and overload the server
|
|
||||||
}
|
}
|
||||||
item.EpisodeInformation = episodeList;
|
|
||||||
|
// 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)
|
catch (JsonReaderException)
|
||||||
{
|
{
|
||||||
Log.Error(
|
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");
|
||||||
"Failed getting episode information, we may have overloaded Emby's api... Waiting and we will skip this one and go to the next");
|
|
||||||
Thread.Sleep(1000);
|
Thread.Sleep(1000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
info.Add(item);
|
info.AddRange(recentlyAddedModel);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
foreach (var t in filteredSeries)
|
||||||
|
{
|
||||||
|
var i = Api.GetInformation(t.EmbyId, Ombi.Api.Models.Emby.EmbyMediaType.Series,
|
||||||
|
embySettings.ApiKey, embySettings.AdministratorId, embySettings.FullUri);
|
||||||
|
var ep = filteredEp.Where(x => x.ParentId == t.EmbyId).ToList();
|
||||||
|
var item = new EmbyRecentlyAddedModel
|
||||||
|
{
|
||||||
|
EmbyContent = t,
|
||||||
|
EmbyInformation = i,
|
||||||
|
};
|
||||||
|
if (ep.Any() && embySettings.EnableEpisodeSearching)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
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);
|
||||||
|
Thread.Sleep(600); // Let's not try and overload the server
|
||||||
|
}
|
||||||
|
item.EpisodeInformation = episodeList;
|
||||||
|
}
|
||||||
|
catch (JsonReaderException)
|
||||||
|
{
|
||||||
|
Log.Error(
|
||||||
|
"Failed getting episode information, we may have overloaded Emby's api... Waiting and we will skip this one and go to the next");
|
||||||
|
Thread.Sleep(1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
info.Add(item);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
GenerateTvHtml(info, sb);
|
GenerateTvHtml(info, sb);
|
||||||
newsletter.TvCount = info.Count;
|
newsletter.TvCount = info.Count;
|
||||||
|
|
@ -297,7 +357,7 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var info = TvApi.ShowLookupByTheTvDbId(int.Parse(seriesItem.ProviderIds.Tvdb));
|
var info = TvApi.ShowLookupByTheTvDbId(int.Parse(seriesItem.ProviderIds.Tvdb));
|
||||||
if(info == null)continue;
|
if (info == null) continue;
|
||||||
|
|
||||||
var banner = info.image?.original;
|
var banner = info.image?.original;
|
||||||
if (!string.IsNullOrEmpty(banner))
|
if (!string.IsNullOrEmpty(banner))
|
||||||
|
|
@ -329,16 +389,17 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
||||||
foreach (var embyEpisodeInformation in results.OrderBy(x => x.ParentIndexNumber))
|
foreach (var embyEpisodeInformation in results.OrderBy(x => x.ParentIndexNumber))
|
||||||
{
|
{
|
||||||
var epSb = new StringBuilder();
|
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];
|
var ep = orderedEpisodes[i];
|
||||||
if (i < embyEpisodeInformation.IndexNumber.Count)
|
if (i < embyEpisodeInformation.IndexNumber.Count - 1)
|
||||||
{
|
{
|
||||||
epSb.Append($"{ep.IndexNumber},");
|
epSb.Append($"{ep.IndexNumber},");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
epSb.Append(ep);
|
epSb.Append(ep.IndexNumber);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
AddParagraph(sb, $"Season: {embyEpisodeInformation.ParentIndexNumber}, Episode: {epSb}");
|
AddParagraph(sb, $"Season: {embyEpisodeInformation.ParentIndexNumber}, Episode: {epSb}");
|
||||||
|
|
@ -359,7 +420,7 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
if(endLoop)
|
if (endLoop)
|
||||||
EndLoopHtml(sb);
|
EndLoopHtml(sb);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -97,6 +97,7 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
||||||
{
|
{
|
||||||
public PlexMetadata Metadata { get; set; }
|
public PlexMetadata Metadata { get; set; }
|
||||||
public PlexContent Content { get; set; }
|
public PlexContent Content { get; set; }
|
||||||
|
public List<PlexEpisodeMetadata> EpisodeMetadata { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
private Newsletter GetHtml(bool test)
|
private Newsletter GetHtml(bool test)
|
||||||
|
|
@ -137,36 +138,82 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
||||||
newsletter.MovieCount = info.Count;
|
newsletter.MovieCount = info.Count;
|
||||||
|
|
||||||
info.Clear();
|
info.Clear();
|
||||||
foreach (var t in filteredSeries)
|
if (filteredEp.Any())
|
||||||
{
|
{
|
||||||
var i = Api.GetMetadata(plexSettings.PlexAuthToken, plexSettings.FullUri, t.ItemId);
|
var recentlyAddedModel = new List<PlexRecentlyAddedModel>();
|
||||||
if (i.Directory == null)
|
foreach (var plexEpisodes in filteredEp)
|
||||||
{
|
{
|
||||||
continue;
|
// 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
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
//var ep = filteredEp.Where(x => x.ShowTitle == t.Title);
|
|
||||||
info.Add(new PlexRecentlyAddedModel
|
info.AddRange(recentlyAddedModel);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
foreach (var t in filteredSeries)
|
||||||
{
|
{
|
||||||
Metadata = i,
|
var i = Api.GetMetadata(plexSettings.PlexAuthToken, plexSettings.FullUri, t.ItemId);
|
||||||
Content = t
|
if (i.Directory == null)
|
||||||
});
|
{
|
||||||
//if (ep.Any())
|
continue;
|
||||||
//{
|
|
||||||
// var episodeList = new List<EmbyEpisodeInformation>();
|
}
|
||||||
// foreach (var embyEpisodese in ep)
|
//var ep = filteredEp.Where(x => x.ShowTitle == t.Title);
|
||||||
// {
|
|
||||||
// var epInfo = Api.GetInformation(embyEpisodese.EmbyId, Ombi.Api.Models.Emby.EmbyMediaType.Episode,
|
if (filteredEp.Any())
|
||||||
// embySettings.ApiKey, embySettings.AdministratorId, embySettings.FullUri);
|
{
|
||||||
// episodeList.Add(epInfo.EpisodeInformation);
|
var episodeList = new List<PlexEpisodeMetadata>();
|
||||||
// }
|
foreach (var ep in filteredEp)
|
||||||
// info.Add(new EmbyRecentlyAddedModel
|
{
|
||||||
// {
|
var epInfo = Api.GetEpisodeMetaData(plexSettings.PlexAuthToken, plexSettings.FullUri,
|
||||||
// EmbyContent = t,
|
ep.RatingKey);
|
||||||
// EmbyInformation = i,
|
episodeList.Add(epInfo);
|
||||||
// EpisodeInformation = episodeList
|
}
|
||||||
// });
|
|
||||||
//}
|
info.Add(new PlexRecentlyAddedModel
|
||||||
|
{
|
||||||
|
Metadata = i,
|
||||||
|
Content = t,
|
||||||
|
EpisodeMetadata = episodeList
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
info.Add(new PlexRecentlyAddedModel
|
||||||
|
{
|
||||||
|
Metadata = i,
|
||||||
|
Content = t
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
GenerateTvHtml(info, sb);
|
GenerateTvHtml(info, sb);
|
||||||
newsletter.TvCount = info.Count;
|
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%\">");
|
"<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)
|
foreach (var t in orderedTv)
|
||||||
{
|
{
|
||||||
//var seriesItem = t.EmbyInformation.SeriesInformation;
|
var relatedEpisodes = t.EpisodeMetadata ?? new List<PlexEpisodeMetadata>();
|
||||||
//var relatedEpisodes = t.EpisodeInformation;
|
|
||||||
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
@ -319,31 +364,34 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
||||||
Header(sb, 3, title);
|
Header(sb, 3, title);
|
||||||
EndTag(sb, "a");
|
EndTag(sb, "a");
|
||||||
|
|
||||||
//var results = relatedEpisodes.GroupBy(p => p.ParentIndexNumber,
|
// Group by the ParentIndex (season number)
|
||||||
// (key, g) => new
|
var results = relatedEpisodes.GroupBy(p => p.Video.FirstOrDefault()?.ParentIndex,
|
||||||
// {
|
(key, g) => new
|
||||||
// ParentIndexNumber = key,
|
{
|
||||||
// IndexNumber = g.ToList()
|
ParentIndexNumber = key,
|
||||||
// }
|
IndexNumber = g.ToList()
|
||||||
//);
|
}
|
||||||
|
);
|
||||||
// Group the episodes
|
// Group the episodes
|
||||||
//foreach (var embyEpisodeInformation in results.OrderBy(x => x.ParentIndexNumber))
|
foreach (var epInformation in results.OrderBy(x => x.ParentIndexNumber))
|
||||||
//{
|
{
|
||||||
// var epSb = new StringBuilder();
|
var orderedEpisodes = epInformation.IndexNumber.OrderBy(x => Convert.ToInt32(x.Video.FirstOrDefault().Index)).ToList();
|
||||||
// for (var i = 0; i < embyEpisodeInformation.IndexNumber.Count; i++)
|
var epSb = new StringBuilder();
|
||||||
// {
|
for (var i = 0; i < orderedEpisodes.Count; i++)
|
||||||
// var ep = embyEpisodeInformation.IndexNumber[i];
|
{
|
||||||
// if (i < embyEpisodeInformation.IndexNumber.Count)
|
var ep = orderedEpisodes[i];
|
||||||
// {
|
if (i <= orderedEpisodes.Count - 1)
|
||||||
// epSb.Append($"{ep.IndexNumber},");
|
{
|
||||||
// }
|
epSb.Append($"{ep.Video.FirstOrDefault().Index},");
|
||||||
// else
|
}
|
||||||
// {
|
else
|
||||||
// epSb.Append(ep);
|
{
|
||||||
// }
|
epSb.Append($"{ep.Video.FirstOrDefault().Index}");
|
||||||
// }
|
}
|
||||||
// AddParagraph(sb, $"Season: {embyEpisodeInformation.ParentIndexNumber}, Episode: {epSb}");
|
|
||||||
//}
|
}
|
||||||
|
AddParagraph(sb, $"Season: {epInformation.ParentIndexNumber}, Episode: {epSb}");
|
||||||
|
}
|
||||||
|
|
||||||
if (info.genres.Any())
|
if (info.genres.Any())
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue