|
|
|
@ -45,6 +45,7 @@ using Ombi.Store.Models.Emby;
|
|
|
|
|
using Ombi.Store.Repository;
|
|
|
|
|
using TMDbLib.Objects.Exceptions;
|
|
|
|
|
using EmbyMediaType = Ombi.Store.Models.Plex.EmbyMediaType;
|
|
|
|
|
using Polly;
|
|
|
|
|
|
|
|
|
|
namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
|
|
|
|
{
|
|
|
|
@ -121,14 +122,20 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
|
|
|
|
var info = new List<EmbyRecentlyAddedModel>();
|
|
|
|
|
foreach (var m in filteredMovies)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) =>
|
|
|
|
|
Log.Error(exception, "Exception thrown when processing an emby movie for the newsletter, Retrying {0}", timespan));
|
|
|
|
|
var result = policy.Execute(() =>
|
|
|
|
|
{
|
|
|
|
|
var i = Api.GetInformation(m.EmbyId, Ombi.Api.Models.Emby.EmbyMediaType.Movie,
|
|
|
|
|
embySettings.ApiKey, embySettings.AdministratorId, embySettings.FullUri);
|
|
|
|
|
info.Add(new EmbyRecentlyAddedModel
|
|
|
|
|
|
|
|
|
|
return new EmbyRecentlyAddedModel
|
|
|
|
|
{
|
|
|
|
|
EmbyInformation = i,
|
|
|
|
|
EmbyContent = m
|
|
|
|
|
};
|
|
|
|
|
});
|
|
|
|
|
info.Add(result);
|
|
|
|
|
}
|
|
|
|
|
GenerateMovieHtml(info, sb);
|
|
|
|
|
newsletter.MovieCount = info.Count;
|
|
|
|
@ -142,17 +149,19 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
|
|
|
|
var recentlyAddedModel = new List<EmbyRecentlyAddedModel>();
|
|
|
|
|
foreach (var embyEpisodes in filteredEp)
|
|
|
|
|
{
|
|
|
|
|
// Let's sleep, Emby can't keep up with us.
|
|
|
|
|
Thread.Sleep(1000);
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) =>
|
|
|
|
|
Log.Error(exception, "Exception thrown when processing an emby episode for the newsletter, Retrying {0}", timespan));
|
|
|
|
|
|
|
|
|
|
policy.Execute(() =>
|
|
|
|
|
{
|
|
|
|
|
// Find related series item
|
|
|
|
|
var relatedSeries = series.FirstOrDefault(x => x.EmbyId == embyEpisodes.ParentId);
|
|
|
|
|
|
|
|
|
|
if (relatedSeries == null)
|
|
|
|
|
{
|
|
|
|
|
continue;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Get series information
|
|
|
|
@ -182,6 +191,7 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
|
|
|
|
EmbyContent = relatedSeries
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
catch (JsonReaderException)
|
|
|
|
@ -196,14 +206,22 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
foreach (var t in filteredSeries)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) =>
|
|
|
|
|
Log.Error(exception, "Exception thrown when processing an emby series for the newsletter, Retrying {0}", timespan));
|
|
|
|
|
var item = policy.Execute(() =>
|
|
|
|
|
{
|
|
|
|
|
var i = Api.GetInformation(t.EmbyId, Ombi.Api.Models.Emby.EmbyMediaType.Series,
|
|
|
|
|
embySettings.ApiKey, embySettings.AdministratorId, embySettings.FullUri);
|
|
|
|
|
var item = new EmbyRecentlyAddedModel
|
|
|
|
|
var model = new EmbyRecentlyAddedModel
|
|
|
|
|
{
|
|
|
|
|
EmbyContent = t,
|
|
|
|
|
EmbyInformation = i,
|
|
|
|
|
};
|
|
|
|
|
return model;
|
|
|
|
|
});
|
|
|
|
|
info.Add(item);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|