github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-11 07:46:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added the Digital Release Date back in.

Browse source 
Improved performance and system load when loading content #4082
This commit is contained in:
tidusjar 2021-07-07 11:59:27 +01:00
parent 4082f6ad41
commit 0c4bd10b0f
25 changed files with 320 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ombi.Core/Engine/BaseMediaEngine.cs
View file

@ -127,7 +127,7 @@ namespace Ombi.Core.Engine
UserId = user.Id UserId = user.Id
}; };
} }
var settings = await Cache.GetOrAdd(CacheKeys.OmbiSettings, async () => await OmbiSettings.GetSettingsAsync()); var settings = await Cache.GetOrAddAsync(CacheKeys.OmbiSettings, () => OmbiSettings.GetSettingsAsync());
var result = new HideResult var result = new HideResult
{ {
Hide = settings.HideRequestsUsers, Hide = settings.HideRequestsUsers,

18
src/Ombi.Core/Engine/MovieRequestEngine.cs
View file

@ -30,7 +30,7 @@ namespace Ombi.Core.Engine
public MovieRequestEngine(IMovieDbApi movieApi, IRequestServiceMain requestService, IPrincipal user, public MovieRequestEngine(IMovieDbApi movieApi, IRequestServiceMain requestService, IPrincipal user,
INotificationHelper helper, IRuleEvaluator r, IMovieSender sender, ILogger<MovieRequestEngine> log, INotificationHelper helper, IRuleEvaluator r, IMovieSender sender, ILogger<MovieRequestEngine> log,
OmbiUserManager manager, IRepository<RequestLog> rl, ICacheService cache, OmbiUserManager manager, IRepository<RequestLog> rl, ICacheService cache,
ISettingsService<OmbiSettings> ombiSettings, IRepository<RequestSubscription> sub) ISettingsService<OmbiSettings> ombiSettings, IRepository<RequestSubscription> sub, IMediaCacheService mediaCacheService)
: base(user, requestService, r, manager, cache, ombiSettings, sub) : base(user, requestService, r, manager, cache, ombiSettings, sub)
{ {
MovieApi = movieApi; MovieApi = movieApi;
@ -38,6 +38,7 @@ namespace Ombi.Core.Engine
Sender = sender; Sender = sender;
Logger = log; Logger = log;
_requestLog = rl; _requestLog = rl;
_mediaCacheService = mediaCacheService;
} }
private IMovieDbApi MovieApi { get; } private IMovieDbApi MovieApi { get; }
@ -45,6 +46,7 @@ namespace Ombi.Core.Engine
private IMovieSender Sender { get; } private IMovieSender Sender { get; }
private ILogger<MovieRequestEngine> Logger { get; } private ILogger<MovieRequestEngine> Logger { get; }
private readonly IRepository<RequestLog> _requestLog; private readonly IRepository<RequestLog> _requestLog;
private readonly IMediaCacheService _mediaCacheService;
/// <summary> /// <summary>
/// Requests the movie. /// Requests the movie.
@ -371,7 +373,6 @@ namespace Ombi.Core.Engine
}; };
} }
public async Task<RequestEngineResult> UpdateAdvancedOptions(MediaAdvancedOptions options) public async Task<RequestEngineResult> UpdateAdvancedOptions(MediaAdvancedOptions options)
{ {
var request = await MovieRepository.Find(options.RequestId); var request = await MovieRepository.Find(options.RequestId);
@ -527,6 +528,7 @@ namespace Ombi.Core.Engine
// We are denying a request // We are denying a request
await NotificationHelper.Notify(request, NotificationType.RequestDeclined); await NotificationHelper.Notify(request, NotificationType.RequestDeclined);
await MovieRepository.Update(request); await MovieRepository.Update(request);
await _mediaCacheService.Purge();
return new RequestEngineResult return new RequestEngineResult
{ {
@ -555,6 +557,7 @@ namespace Ombi.Core.Engine
{ {
await NotificationHelper.Notify(request, NotificationType.RequestApproved); await NotificationHelper.Notify(request, NotificationType.RequestApproved);
} }
await _mediaCacheService.Purge();
return await ProcessSendingMovie(request); return await ProcessSendingMovie(request);
} }
@ -562,8 +565,8 @@ namespace Ombi.Core.Engine
public async Task<RequestEngineResult> RequestCollection(int collectionId, CancellationToken cancellationToken) public async Task<RequestEngineResult> RequestCollection(int collectionId, CancellationToken cancellationToken)
{ {
var langCode = await DefaultLanguageCode(null); var langCode = await DefaultLanguageCode(null);
var collections = await Cache.GetOrAdd($"GetCollection{collectionId}{langCode}", var collections = await Cache.GetOrAddAsync($"GetCollection{collectionId}{langCode}",
async () => await MovieApi.GetCollection(langCode, collectionId, cancellationToken), DateTime.Now.AddDays(1), cancellationToken); () => MovieApi.GetCollection(langCode, collectionId, cancellationToken), DateTimeOffset.Now.AddDays(1));
var results = new List<RequestEngineResult>(); var results = new List<RequestEngineResult>();
foreach (var collection in collections.parts) foreach (var collection in collections.parts)
@ -639,6 +642,7 @@ namespace Ombi.Core.Engine
results.RootPathOverride = request.RootPathOverride; results.RootPathOverride = request.RootPathOverride;
await MovieRepository.Update(results); await MovieRepository.Update(results);
await _mediaCacheService.Purge();
return results; return results;
} }
@ -651,12 +655,14 @@ namespace Ombi.Core.Engine
{ {
var request = await MovieRepository.GetAll().FirstOrDefaultAsync(x => x.Id == requestId); var request = await MovieRepository.GetAll().FirstOrDefaultAsync(x => x.Id == requestId);
await MovieRepository.Delete(request); await MovieRepository.Delete(request);
await _mediaCacheService.Purge();
} }
public async Task RemoveAllMovieRequests() public async Task RemoveAllMovieRequests()
{ {
var request = MovieRepository.GetAll(); var request = MovieRepository.GetAll();
await MovieRepository.DeleteRange(request); await MovieRepository.DeleteRange(request);
await _mediaCacheService.Purge();
} }
public async Task<bool> UserHasRequest(string userId) public async Task<bool> UserHasRequest(string userId)
@ -692,6 +698,7 @@ namespace Ombi.Core.Engine
request.Available = false; request.Available = false;
await MovieRepository.Update(request); await MovieRepository.Update(request);
await _mediaCacheService.Purge();
return new RequestEngineResult return new RequestEngineResult
{ {
@ -715,6 +722,7 @@ namespace Ombi.Core.Engine
request.MarkedAsAvailable = DateTime.Now; request.MarkedAsAvailable = DateTime.Now;
await NotificationHelper.Notify(request, NotificationType.RequestAvailable); await NotificationHelper.Notify(request, NotificationType.RequestAvailable);
await MovieRepository.Update(request); await MovieRepository.Update(request);
await _mediaCacheService.Purge();
return new RequestEngineResult return new RequestEngineResult
{ {
@ -733,6 +741,8 @@ namespace Ombi.Core.Engine
await NotificationHelper.NewRequest(model); await NotificationHelper.NewRequest(model);
} }
await _mediaCacheService.Purge();
await _requestLog.Add(new RequestLog await _requestLog.Add(new RequestLog
{ {
UserId = requestOnBehalf.HasValue() ? requestOnBehalf : (await GetUser()).Id, UserId = requestOnBehalf.HasValue() ? requestOnBehalf : (await GetUser()).Id,

22
src/Ombi.Core/Engine/MovieSearchEngine.cs
View file

@ -45,9 +45,9 @@ namespace Ombi.Core.Engine
public async Task<SearchMovieViewModel> LookupImdbInformation(int theMovieDbId, string langCode = null) public async Task<SearchMovieViewModel> LookupImdbInformation(int theMovieDbId, string langCode = null)
{ {
langCode = await DefaultLanguageCode(langCode); langCode = await DefaultLanguageCode(langCode);
var movieInfo = await Cache.GetOrAdd(nameof(LookupImdbInformation) + langCode + theMovieDbId, var movieInfo = await Cache.GetOrAddAsync(nameof(LookupImdbInformation) + langCode + theMovieDbId,
async () => await MovieApi.GetMovieInformationWithExtraInfo(theMovieDbId, langCode), () => MovieApi.GetMovieInformationWithExtraInfo(theMovieDbId, langCode),
DateTime.Now.AddHours(12)); DateTimeOffset.Now.AddHours(12));
var viewMovie = Mapper.Map<SearchMovieViewModel>(movieInfo); var viewMovie = Mapper.Map<SearchMovieViewModel>(movieInfo);
return await ProcessSingleMovie(viewMovie, true); return await ProcessSingleMovie(viewMovie, true);
@ -121,11 +121,11 @@ namespace Ombi.Core.Engine
public async Task<IEnumerable<SearchMovieViewModel>> PopularMovies() public async Task<IEnumerable<SearchMovieViewModel>> PopularMovies()
{ {
var result = await Cache.GetOrAdd(CacheKeys.PopularMovies, async () => var result = await Cache.GetOrAddAsync(CacheKeys.PopularMovies, async () =>
{ {
var langCode = await DefaultLanguageCode(null); var langCode = await DefaultLanguageCode(null);
return await MovieApi.PopularMovies(langCode); return await MovieApi.PopularMovies(langCode);
}, DateTime.Now.AddHours(12)); }, DateTimeOffset.Now.AddHours(12));
if (result != null) if (result != null)
{ {
return await TransformMovieResultsToResponse(result.Take(ResultLimit)); // Take x to stop us overloading the API return await TransformMovieResultsToResponse(result.Take(ResultLimit)); // Take x to stop us overloading the API
@ -139,11 +139,11 @@ namespace Ombi.Core.Engine
/// <returns></returns> /// <returns></returns>
public async Task<IEnumerable<SearchMovieViewModel>> TopRatedMovies() public async Task<IEnumerable<SearchMovieViewModel>> TopRatedMovies()
{ {
var result = await Cache.GetOrAdd(CacheKeys.TopRatedMovies, async () => var result = await Cache.GetOrAddAsync(CacheKeys.TopRatedMovies, async () =>
{ {
var langCode = await DefaultLanguageCode(null); var langCode = await DefaultLanguageCode(null);
return await MovieApi.TopRated(langCode); return await MovieApi.TopRated(langCode);
}, DateTime.Now.AddHours(12)); }, DateTimeOffset.Now.AddHours(12));
if (result != null) if (result != null)
{ {
return await TransformMovieResultsToResponse(result.Take(ResultLimit)); // Take x to stop us overloading the API return await TransformMovieResultsToResponse(result.Take(ResultLimit)); // Take x to stop us overloading the API
@ -157,11 +157,11 @@ namespace Ombi.Core.Engine
/// <returns></returns> /// <returns></returns>
public async Task<IEnumerable<SearchMovieViewModel>> UpcomingMovies() public async Task<IEnumerable<SearchMovieViewModel>> UpcomingMovies()
{ {
var result = await Cache.GetOrAdd(CacheKeys.UpcomingMovies, async () => var result = await Cache.GetOrAddAsync(CacheKeys.UpcomingMovies, async () =>
{ {
var langCode = await DefaultLanguageCode(null); var langCode = await DefaultLanguageCode(null);
return await MovieApi.Upcoming(langCode); return await MovieApi.Upcoming(langCode);
}, DateTime.Now.AddHours(12)); }, DateTimeOffset.Now.AddHours(12));
if (result != null) if (result != null)
{ {
Logger.LogDebug("Search Result: {result}", result); Logger.LogDebug("Search Result: {result}", result);
@ -176,11 +176,11 @@ namespace Ombi.Core.Engine
/// <returns></returns> /// <returns></returns>
public async Task<IEnumerable<SearchMovieViewModel>> NowPlayingMovies() public async Task<IEnumerable<SearchMovieViewModel>> NowPlayingMovies()
{ {
var result = await Cache.GetOrAdd(CacheKeys.NowPlayingMovies, async () => var result = await Cache.GetOrAddAsync(CacheKeys.NowPlayingMovies, async () =>
{ {
var langCode = await DefaultLanguageCode(null); var langCode = await DefaultLanguageCode(null);
return await MovieApi.NowPlaying(langCode); return await MovieApi.NowPlaying(langCode);
}, DateTime.Now.AddHours(12)); }, DateTimeOffset.Now.AddHours(12));
if (result != null) if (result != null)
{ {
return await TransformMovieResultsToResponse(result.Take(ResultLimit)); // Take x to stop us overloading the API return await TransformMovieResultsToResponse(result.Take(ResultLimit)); // Take x to stop us overloading the API

29
src/Ombi.Core/Engine/TvRequestEngine.cs
View file

@ -35,7 +35,7 @@ namespace Ombi.Core.Engine
public TvRequestEngine(ITvMazeApi tvApi, IMovieDbApi movApi, IRequestServiceMain requestService, IPrincipal user, public TvRequestEngine(ITvMazeApi tvApi, IMovieDbApi movApi, IRequestServiceMain requestService, IPrincipal user,
INotificationHelper helper, IRuleEvaluator rule, OmbiUserManager manager, ILogger<TvRequestEngine> logger, INotificationHelper helper, IRuleEvaluator rule, OmbiUserManager manager, ILogger<TvRequestEngine> logger,
ITvSender sender, IRepository<RequestLog> rl, ISettingsService<OmbiSettings> settings, ICacheService cache, ITvSender sender, IRepository<RequestLog> rl, ISettingsService<OmbiSettings> settings, ICacheService cache,
IRepository<RequestSubscription> sub) : base(user, requestService, rule, manager, cache, settings, sub) IRepository<RequestSubscription> sub, IMediaCacheService mediaCacheService) : base(user, requestService, rule, manager, cache, settings, sub)
{ {
TvApi = tvApi; TvApi = tvApi;
MovieDbApi = movApi; MovieDbApi = movApi;
@ -43,6 +43,7 @@ namespace Ombi.Core.Engine
_logger = logger; _logger = logger;
TvSender = sender; TvSender = sender;
_requestLog = rl; _requestLog = rl;
_mediaCacheService = mediaCacheService;
} }
private INotificationHelper NotificationHelper { get; } private INotificationHelper NotificationHelper { get; }
@ -52,6 +53,7 @@ namespace Ombi.Core.Engine
private readonly ILogger<TvRequestEngine> _logger; private readonly ILogger<TvRequestEngine> _logger;
private readonly IRepository<RequestLog> _requestLog; private readonly IRepository<RequestLog> _requestLog;
private readonly IMediaCacheService _mediaCacheService;
public async Task<RequestEngineResult> RequestTvShow(TvRequestViewModel tv) public async Task<RequestEngineResult> RequestTvShow(TvRequestViewModel tv)
{ {
@ -329,6 +331,7 @@ namespace Ombi.Core.Engine
Collection = allRequests Collection = allRequests
}; };
} }
public async Task<IEnumerable<TvRequests>> GetRequests() public async Task<IEnumerable<TvRequests>> GetRequests()
{ {
var shouldHide = await HideFromOtherUsers(); var shouldHide = await HideFromOtherUsers();
@ -348,7 +351,6 @@ namespace Ombi.Core.Engine
return allRequests; return allRequests;
} }
public async Task<RequestsViewModel<ChildRequests>> GetRequests(int count, int position, string sortProperty, string sortOrder) public async Task<RequestsViewModel<ChildRequests>> GetRequests(int count, int position, string sortProperty, string sortOrder)
{ {
var shouldHide = await HideFromOtherUsers(); var shouldHide = await HideFromOtherUsers();
@ -476,6 +478,7 @@ namespace Ombi.Core.Engine
Total = total, Total = total,
}; };
} }
public async Task<RequestsViewModel<ChildRequests>> GetUnavailableRequests(int count, int position, string sortProperty, string sortOrder) public async Task<RequestsViewModel<ChildRequests>> GetUnavailableRequests(int count, int position, string sortProperty, string sortOrder)
{ {
var shouldHide = await HideFromOtherUsers(); var shouldHide = await HideFromOtherUsers();
@ -529,7 +532,6 @@ namespace Ombi.Core.Engine
}; };
} }
public async Task<IEnumerable<TvRequests>> GetRequestsLite() public async Task<IEnumerable<TvRequests>> GetRequestsLite()
{ {
var shouldHide = await HideFromOtherUsers(); var shouldHide = await HideFromOtherUsers();
@ -699,6 +701,7 @@ namespace Ombi.Core.Engine
} }
await TvRepository.UpdateChild(request); await TvRepository.UpdateChild(request);
await _mediaCacheService.Purge();
if (request.Approved) if (request.Approved)
{ {
@ -725,6 +728,7 @@ namespace Ombi.Core.Engine
request.Denied = true; request.Denied = true;
request.DeniedReason = reason; request.DeniedReason = reason;
await TvRepository.UpdateChild(request); await TvRepository.UpdateChild(request);
await _mediaCacheService.Purge();
await NotificationHelper.Notify(request, NotificationType.RequestDeclined); await NotificationHelper.Notify(request, NotificationType.RequestDeclined);
return new RequestEngineResult return new RequestEngineResult
{ {
@ -735,6 +739,7 @@ namespace Ombi.Core.Engine
public async Task<ChildRequests> UpdateChildRequest(ChildRequests request) public async Task<ChildRequests> UpdateChildRequest(ChildRequests request)
{ {
await TvRepository.UpdateChild(request); await TvRepository.UpdateChild(request);
await _mediaCacheService.Purge();
return request; return request;
} }
@ -754,12 +759,14 @@ namespace Ombi.Core.Engine
} }
await TvRepository.Db.SaveChangesAsync(); await TvRepository.Db.SaveChangesAsync();
await _mediaCacheService.Purge();
} }
public async Task RemoveTvRequest(int requestId) public async Task RemoveTvRequest(int requestId)
{ {
var request = await TvRepository.Get().FirstOrDefaultAsync(x => x.Id == requestId); var request = await TvRepository.Get().FirstOrDefaultAsync(x => x.Id == requestId);
await TvRepository.Delete(request); await TvRepository.Delete(request);
await _mediaCacheService.Purge();
} }
public async Task<bool> UserHasRequest(string userId) public async Task<bool> UserHasRequest(string userId)
@ -786,6 +793,7 @@ namespace Ombi.Core.Engine
} }
} }
await TvRepository.UpdateChild(request); await TvRepository.UpdateChild(request);
await _mediaCacheService.Purge();
return new RequestEngineResult return new RequestEngineResult
{ {
Result = true, Result = true,
@ -814,6 +822,7 @@ namespace Ombi.Core.Engine
} }
await TvRepository.UpdateChild(request); await TvRepository.UpdateChild(request);
await NotificationHelper.Notify(request, NotificationType.RequestAvailable); await NotificationHelper.Notify(request, NotificationType.RequestAvailable);
await _mediaCacheService.Purge();
return new RequestEngineResult return new RequestEngineResult
{ {
Result = true, Result = true,
@ -888,19 +897,6 @@ namespace Ombi.Core.Engine
return await AfterRequest(model.ChildRequests.FirstOrDefault(), requestOnBehalf); return await AfterRequest(model.ChildRequests.FirstOrDefault(), requestOnBehalf);
} }
private static List<ChildRequests> SortEpisodes(List<ChildRequests> items)
{
foreach (var value in items)
{
foreach (var requests in value.SeasonRequests)
{
requests.Episodes = requests.Episodes.OrderBy(x => x.EpisodeNumber).ToList();
}
}
return items;
}
public async Task<RequestEngineResult> ReProcessRequest(int requestId, CancellationToken cancellationToken) public async Task<RequestEngineResult> ReProcessRequest(int requestId, CancellationToken cancellationToken)
{ {
var request = await TvRepository.GetChild().FirstOrDefaultAsync(x => x.Id == requestId, cancellationToken); var request = await TvRepository.GetChild().FirstOrDefaultAsync(x => x.Id == requestId, cancellationToken);
@ -933,6 +929,7 @@ namespace Ombi.Core.Engine
RequestType = RequestType.TvShow, RequestType = RequestType.TvShow,
EpisodeCount = model.SeasonRequests.Select(m => m.Episodes.Count).Sum(), EpisodeCount = model.SeasonRequests.Select(m => m.Episodes.Count).Sum(),
}); });
await _mediaCacheService.Purge();
return await ProcessSendingShow(model); return await ProcessSendingShow(model);
} }

26
src/Ombi.Core/Engine/TvSearchEngine.cs
View file

@ -77,16 +77,16 @@ namespace Ombi.Core.Engine
public async Task<SearchTvShowViewModel> GetShowInformation(string tvdbid, CancellationToken token) public async Task<SearchTvShowViewModel> GetShowInformation(string tvdbid, CancellationToken token)
{ {
var show = await Cache.GetOrAdd(nameof(GetShowInformation) + tvdbid, var show = await Cache.GetOrAddAsync(nameof(GetShowInformation) + tvdbid,
async () => await TvMazeApi.ShowLookupByTheTvDbId(int.Parse(tvdbid)), DateTime.Now.AddHours(12)); () => TvMazeApi.ShowLookupByTheTvDbId(int.Parse(tvdbid)), DateTimeOffset.Now.AddHours(12));
if (show == null) if (show == null)
{ {
// We don't have enough information // We don't have enough information
return null; return null;
} }
var episodes = await Cache.GetOrAdd("TvMazeEpisodeLookup" + show.id, var episodes = await Cache.GetOrAddAsync("TvMazeEpisodeLookup" + show.id,
async () => await TvMazeApi.EpisodeLookup(show.id), DateTime.Now.AddHours(12)); () => TvMazeApi.EpisodeLookup(show.id), DateTimeOffset.Now.AddHours(12));
if (episodes == null || !episodes.Any()) if (episodes == null || !episodes.Any())
{ {
// We don't have enough information // We don't have enough information
@ -133,7 +133,7 @@ namespace Ombi.Core.Engine
public async Task<IEnumerable<SearchTvShowViewModel>> Popular() public async Task<IEnumerable<SearchTvShowViewModel>> Popular()
{ {
var result = await Cache.GetOrAdd(CacheKeys.PopularTv, async () => await TraktApi.GetPopularShows(null, ResultLimit), DateTime.Now.AddHours(12)); var result = await Cache.GetOrAddAsync(CacheKeys.PopularTv, () => TraktApi.GetPopularShows(null, ResultLimit), DateTimeOffset.Now.AddHours(12));
var processed = ProcessResults(result); var processed = ProcessResults(result);
return await processed; return await processed;
} }
@ -146,8 +146,8 @@ namespace Ombi.Core.Engine
var results = new List<TraktShow>(); var results = new List<TraktShow>();
foreach (var pagesToLoad in pages) foreach (var pagesToLoad in pages)
{ {
var apiResult = await Cache.GetOrAdd(nameof(Popular) + langCode + pagesToLoad.Page, var apiResult = await Cache.GetOrAddAsync(nameof(Popular) + langCode + pagesToLoad.Page,
async () => await TraktApi.GetPopularShows(pagesToLoad.Page, ResultLimit), DateTime.Now.AddHours(12)); () => TraktApi.GetPopularShows(pagesToLoad.Page, ResultLimit), DateTimeOffset.Now.AddHours(12));
results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take)); results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take));
} }
@ -158,7 +158,7 @@ namespace Ombi.Core.Engine
public async Task<IEnumerable<SearchTvShowViewModel>> Anticipated() public async Task<IEnumerable<SearchTvShowViewModel>> Anticipated()
{ {
var result = await Cache.GetOrAdd(CacheKeys.AnticipatedTv, async () => await TraktApi.GetAnticipatedShows(null, ResultLimit), DateTime.Now.AddHours(12)); var result = await Cache.GetOrAddAsync(CacheKeys.AnticipatedTv, () => TraktApi.GetAnticipatedShows(null, ResultLimit), DateTimeOffset.Now.AddHours(12));
var processed = ProcessResults(result); var processed = ProcessResults(result);
return await processed; return await processed;
} }
@ -171,8 +171,8 @@ namespace Ombi.Core.Engine
var results = new List<TraktShow>(); var results = new List<TraktShow>();
foreach (var pagesToLoad in pages) foreach (var pagesToLoad in pages)
{ {
var apiResult = await Cache.GetOrAdd(nameof(Anticipated) + langCode + pagesToLoad.Page, var apiResult = await Cache.GetOrAddAsync(nameof(Anticipated) + langCode + pagesToLoad.Page,
async () => await TraktApi.GetAnticipatedShows(pagesToLoad.Page, ResultLimit), DateTime.Now.AddHours(12)); () => TraktApi.GetAnticipatedShows(pagesToLoad.Page, ResultLimit), DateTimeOffset.Now.AddHours(12));
results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take)); results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take));
} }
var processed = ProcessResults(results); var processed = ProcessResults(results);
@ -181,7 +181,7 @@ namespace Ombi.Core.Engine
public async Task<IEnumerable<SearchTvShowViewModel>> Trending() public async Task<IEnumerable<SearchTvShowViewModel>> Trending()
{ {
var result = await Cache.GetOrAdd(CacheKeys.TrendingTv, async () => await TraktApi.GetTrendingShows(null, ResultLimit), DateTime.Now.AddHours(12)); var result = await Cache.GetOrAddAsync(CacheKeys.TrendingTv, () => TraktApi.GetTrendingShows(null, ResultLimit), DateTimeOffset.Now.AddHours(12));
var processed = ProcessResults(result); var processed = ProcessResults(result);
return await processed; return await processed;
} }
@ -195,8 +195,8 @@ namespace Ombi.Core.Engine
var results = new List<TraktShow>(); var results = new List<TraktShow>();
foreach (var pagesToLoad in pages) foreach (var pagesToLoad in pages)
{ {
var apiResult = await Cache.GetOrAdd(nameof(Trending) + langCode + pagesToLoad.Page, var apiResult = await Cache.GetOrAddAsync(nameof(Trending) + langCode + pagesToLoad.Page,
async () => await TraktApi.GetTrendingShows(pagesToLoad.Page, ResultLimit), DateTime.Now.AddHours(12)); () => TraktApi.GetTrendingShows(pagesToLoad.Page, ResultLimit), DateTimeOffset.Now.AddHours(12));
results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take)); results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take));
} }
var processed = ProcessResults(results); var processed = ProcessResults(results);

90
src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs
View file

@ -51,8 +51,8 @@ namespace Ombi.Core.Engine.V2
public async Task<MovieFullInfoViewModel> GetFullMovieInformation(int theMovieDbId, CancellationToken cancellationToken, string langCode = null) public async Task<MovieFullInfoViewModel> GetFullMovieInformation(int theMovieDbId, CancellationToken cancellationToken, string langCode = null)
{ {
langCode = await DefaultLanguageCode(langCode); langCode = await DefaultLanguageCode(langCode);
var movieInfo = await Cache.GetOrAdd(nameof(GetFullMovieInformation) + theMovieDbId + langCode, var movieInfo = await Cache.GetOrAddAsync(nameof(GetFullMovieInformation) + theMovieDbId + langCode,
async () => await MovieApi.GetFullMovieInfo(theMovieDbId, cancellationToken, langCode), DateTime.Now.AddHours(12), cancellationToken); () => MovieApi.GetFullMovieInfo(theMovieDbId, cancellationToken, langCode), DateTimeOffset.Now.AddHours(12));
return await ProcessSingleMovie(movieInfo); return await ProcessSingleMovie(movieInfo);
} }
@ -61,8 +61,8 @@ namespace Ombi.Core.Engine.V2
{ {
langCode = await DefaultLanguageCode(langCode); langCode = await DefaultLanguageCode(langCode);
var request = await RequestService.MovieRequestService.Find(requestId); var request = await RequestService.MovieRequestService.Find(requestId);
var movieInfo = await Cache.GetOrAdd(nameof(GetFullMovieInformation) + request.TheMovieDbId + langCode, var movieInfo = await Cache.GetOrAddAsync(nameof(GetFullMovieInformation) + request.TheMovieDbId + langCode,
async () => await MovieApi.GetFullMovieInfo(request.TheMovieDbId, cancellationToken, langCode), DateTime.Now.AddHours(12), cancellationToken); () => MovieApi.GetFullMovieInfo(request.TheMovieDbId, cancellationToken, langCode), DateTimeOffset.Now.AddHours(12));
return await ProcessSingleMovie(movieInfo); return await ProcessSingleMovie(movieInfo);
} }
@ -70,8 +70,8 @@ namespace Ombi.Core.Engine.V2
public async Task<MovieCollectionsViewModel> GetCollection(int collectionId, CancellationToken cancellationToken, string langCode = null) public async Task<MovieCollectionsViewModel> GetCollection(int collectionId, CancellationToken cancellationToken, string langCode = null)
{ {
langCode = await DefaultLanguageCode(langCode); langCode = await DefaultLanguageCode(langCode);
var collections = await Cache.GetOrAdd(nameof(GetCollection) + collectionId + langCode, var collections = await Cache.GetOrAddAsync(nameof(GetCollection) + collectionId + langCode,
async () => await MovieApi.GetCollection(langCode, collectionId, cancellationToken), DateTime.Now.AddDays(1), cancellationToken); () => MovieApi.GetCollection(langCode, collectionId, cancellationToken), DateTimeOffset.Now.AddDays(1));
var c = await ProcessCollection(collections); var c = await ProcessCollection(collections);
c.Collection = c.Collection.OrderBy(x => x.ReleaseDate).ToList(); c.Collection = c.Collection.OrderBy(x => x.ReleaseDate).ToList();
@ -108,11 +108,11 @@ namespace Ombi.Core.Engine.V2
public async Task<IEnumerable<SearchMovieViewModel>> PopularMovies() public async Task<IEnumerable<SearchMovieViewModel>> PopularMovies()
{ {
var result = await Cache.GetOrAdd(CacheKeys.PopularMovies, async () => var result = await Cache.GetOrAddAsync(CacheKeys.PopularMovies, async () =>
{ {
var langCode = await DefaultLanguageCode(null); var langCode = await DefaultLanguageCode(null);
return await MovieApi.PopularMovies(langCode); return await MovieApi.PopularMovies(langCode);
}, DateTime.Now.AddHours(12)); }, DateTimeOffset.Now.AddHours(12));
if (result != null) if (result != null)
{ {
return await TransformMovieResultsToResponse(result.Shuffle().Take(ResultLimit)); // Take x to stop us overloading the API return await TransformMovieResultsToResponse(result.Shuffle().Take(ResultLimit)); // Take x to stop us overloading the API
@ -136,8 +136,8 @@ namespace Ombi.Core.Engine.V2
var results = new List<MovieDbSearchResult>(); var results = new List<MovieDbSearchResult>();
foreach (var pagesToLoad in pages) foreach (var pagesToLoad in pages)
{ {
var apiResult = await Cache.GetOrAdd(nameof(PopularMovies) + pagesToLoad.Page + langCode, var apiResult = await Cache.GetOrAddAsync(nameof(PopularMovies) + pagesToLoad.Page + langCode,
async () => await MovieApi.PopularMovies(langCode, pagesToLoad.Page, cancellationToken), DateTime.Now.AddHours(12), cancellationToken); () => MovieApi.PopularMovies(langCode, pagesToLoad.Page, cancellationToken), DateTimeOffset.Now.AddHours(12));
results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take)); results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take));
} }
return await TransformMovieResultsToResponse(results); return await TransformMovieResultsToResponse(results);
@ -149,11 +149,11 @@ namespace Ombi.Core.Engine.V2
/// <returns></returns> /// <returns></returns>
public async Task<IEnumerable<SearchMovieViewModel>> TopRatedMovies() public async Task<IEnumerable<SearchMovieViewModel>> TopRatedMovies()
{ {
var result = await Cache.GetOrAdd(CacheKeys.TopRatedMovies, async () => var result = await Cache.GetOrAddAsync(CacheKeys.TopRatedMovies, async () =>
{ {
var langCode = await DefaultLanguageCode(null); var langCode = await DefaultLanguageCode(null);
return await MovieApi.TopRated(langCode); return await MovieApi.TopRated(langCode);
}, DateTime.Now.AddHours(12)); }, DateTimeOffset.Now.AddHours(12));
if (result != null) if (result != null)
{ {
return await TransformMovieResultsToResponse(result.Shuffle().Take(ResultLimit)); // Take x to stop us overloading the API return await TransformMovieResultsToResponse(result.Shuffle().Take(ResultLimit)); // Take x to stop us overloading the API
@ -170,8 +170,8 @@ namespace Ombi.Core.Engine.V2
var results = new List<MovieDbSearchResult>(); var results = new List<MovieDbSearchResult>();
foreach (var pagesToLoad in pages) foreach (var pagesToLoad in pages)
{ {
var apiResult = await Cache.GetOrAdd(nameof(TopRatedMovies) + pagesToLoad.Page + langCode, var apiResult = await Cache.GetOrAddAsync(nameof(TopRatedMovies) + pagesToLoad.Page + langCode,
async () => await MovieApi.TopRated(langCode, pagesToLoad.Page), DateTime.Now.AddHours(12)); () => MovieApi.TopRated(langCode, pagesToLoad.Page), DateTimeOffset.Now.AddHours(12));
results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take)); results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take));
} }
return await TransformMovieResultsToResponse(results); return await TransformMovieResultsToResponse(results);
@ -186,8 +186,8 @@ namespace Ombi.Core.Engine.V2
var results = new List<MovieDbSearchResult>(); var results = new List<MovieDbSearchResult>();
foreach (var pagesToLoad in pages) foreach (var pagesToLoad in pages)
{ {
var apiResult = await Cache.GetOrAdd(nameof(NowPlayingMovies) + pagesToLoad.Page + langCode, var apiResult = await Cache.GetOrAddAsync(nameof(NowPlayingMovies) + pagesToLoad.Page + langCode,
async () => await MovieApi.NowPlaying(langCode, pagesToLoad.Page), DateTime.Now.AddHours(12)); () => MovieApi.NowPlaying(langCode, pagesToLoad.Page), DateTimeOffset.Now.AddHours(12));
results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take)); results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take));
} }
return await TransformMovieResultsToResponse(results); return await TransformMovieResultsToResponse(results);
@ -210,8 +210,8 @@ namespace Ombi.Core.Engine.V2
var results = new List<MovieDbSearchResult>(); var results = new List<MovieDbSearchResult>();
foreach (var pagesToLoad in pages) foreach (var pagesToLoad in pages)
{ {
var apiResult = await Cache.GetOrAdd(nameof(SeasonalList) + pagesToLoad.Page + langCode + keyWordIds, var apiResult = await Cache.GetOrAddAsync(nameof(SeasonalList) + pagesToLoad.Page + langCode + keyWordIds,
async () => await MovieApi.GetMoviesViaKeywords(keyWordIds, langCode, cancellationToken, pagesToLoad.Page), DateTime.Now.AddHours(12)); () => MovieApi.GetMoviesViaKeywords(keyWordIds, langCode, cancellationToken, pagesToLoad.Page), DateTimeOffset.Now.AddHours(12));
results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take)); results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take));
} }
return await TransformMovieResultsToResponse(results); return await TransformMovieResultsToResponse(results);
@ -227,16 +227,16 @@ namespace Ombi.Core.Engine.V2
var results = new List<MovieResponseDto>(); var results = new List<MovieResponseDto>();
var requestResult = await Cache.GetOrAdd(nameof(RecentlyRequestedMovies) + "Requests" + toLoad + langCode, var requestResult = await Cache.GetOrAddAsync(nameof(RecentlyRequestedMovies) + "Requests" + toLoad + langCode,
async () => async () =>
{ {
return await _movieRequestEngine.GetRequests(toLoad, currentlyLoaded, new Models.UI.OrderFilterModel return await _movieRequestEngine.GetRequests(toLoad, currentlyLoaded, new Models.UI.OrderFilterModel
{ {
OrderType = OrderType.RequestedDateDesc OrderType = OrderType.RequestedDateDesc
}); });
}, DateTime.Now.AddMinutes(15), cancellationToken); }, DateTimeOffset.Now.AddMinutes(15));
var movieDBResults = await Cache.GetOrAdd(nameof(RecentlyRequestedMovies) + toLoad + langCode, var movieDBResults = await Cache.GetOrAddAsync(nameof(RecentlyRequestedMovies) + toLoad + langCode,
async () => async () =>
{ {
var responses = new List<MovieResponseDto>(); var responses = new List<MovieResponseDto>();
@ -245,7 +245,7 @@ namespace Ombi.Core.Engine.V2
responses.Add(await MovieApi.GetMovieInformation(movie.TheMovieDbId)); responses.Add(await MovieApi.GetMovieInformation(movie.TheMovieDbId));
} }
return responses; return responses;
}, DateTime.Now.AddHours(12), cancellationToken); }, DateTimeOffset.Now.AddHours(12));
results.AddRange(movieDBResults); results.AddRange(movieDBResults);
@ -259,11 +259,11 @@ namespace Ombi.Core.Engine.V2
/// <returns></returns> /// <returns></returns>
public async Task<IEnumerable<SearchMovieViewModel>> UpcomingMovies() public async Task<IEnumerable<SearchMovieViewModel>> UpcomingMovies()
{ {
var result = await Cache.GetOrAdd(CacheKeys.UpcomingMovies, async () => var result = await Cache.GetOrAddAsync(CacheKeys.UpcomingMovies, async () =>
{ {
var langCode = await DefaultLanguageCode(null); var langCode = await DefaultLanguageCode(null);
return await MovieApi.Upcoming(langCode); return await MovieApi.Upcoming(langCode);
}, DateTime.Now.AddHours(12)); }, DateTimeOffset.Now.AddHours(12));
if (result != null) if (result != null)
{ {
Logger.LogDebug("Search Result: {result}", result); Logger.LogDebug("Search Result: {result}", result);
@ -281,8 +281,8 @@ namespace Ombi.Core.Engine.V2
var results = new List<MovieDbSearchResult>(); var results = new List<MovieDbSearchResult>();
foreach (var pagesToLoad in pages) foreach (var pagesToLoad in pages)
{ {
var apiResult = await Cache.GetOrAdd(nameof(UpcomingMovies) + pagesToLoad.Page + langCode, var apiResult = await Cache.GetOrAddAsync(nameof(UpcomingMovies) + pagesToLoad.Page + langCode,
async () => await MovieApi.Upcoming(langCode, pagesToLoad.Page), DateTime.Now.AddHours(12)); () => MovieApi.Upcoming(langCode, pagesToLoad.Page), DateTimeOffset.Now.AddHours(12));
results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take)); results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take));
} }
return await TransformMovieResultsToResponse(results); return await TransformMovieResultsToResponse(results);
@ -294,11 +294,11 @@ namespace Ombi.Core.Engine.V2
/// <returns></returns> /// <returns></returns>
public async Task<IEnumerable<SearchMovieViewModel>> NowPlayingMovies() public async Task<IEnumerable<SearchMovieViewModel>> NowPlayingMovies()
{ {
var result = await Cache.GetOrAdd(CacheKeys.NowPlayingMovies, async () => var result = await Cache.GetOrAddAsync(CacheKeys.NowPlayingMovies, async () =>
{ {
var langCode = await DefaultLanguageCode(null); var langCode = await DefaultLanguageCode(null);
return await MovieApi.NowPlaying(langCode); return await MovieApi.NowPlaying(langCode);
}, DateTime.Now.AddHours(12)); }, DateTimeOffset.Now.AddHours(12));
if (result != null) if (result != null)
{ {
return await TransformMovieResultsToResponse(result.Shuffle().Take(ResultLimit)); // Take x to stop us overloading the API return await TransformMovieResultsToResponse(result.Shuffle().Take(ResultLimit)); // Take x to stop us overloading the API
@ -308,8 +308,8 @@ namespace Ombi.Core.Engine.V2
public async Task<ActorCredits> GetMoviesByActor(int actorId, string langCode) public async Task<ActorCredits> GetMoviesByActor(int actorId, string langCode)
{ {
var result = await Cache.GetOrAdd(nameof(GetMoviesByActor) + actorId + langCode, var result = await Cache.GetOrAddAsync(nameof(GetMoviesByActor) + actorId + langCode,
async () => await MovieApi.GetActorMovieCredits(actorId, langCode)); () => MovieApi.GetActorMovieCredits(actorId, langCode), DateTimeOffset.Now.AddHours(12));
// Later we run this through the rules engine // Later we run this through the rules engine
return result; return result;
} }
@ -366,6 +366,14 @@ namespace Ombi.Core.Engine.V2
private async Task<MovieFullInfoViewModel> ProcessSingleMovie(FullMovieInfo movie) private async Task<MovieFullInfoViewModel> ProcessSingleMovie(FullMovieInfo movie)
{ {
var viewMovie = Mapper.Map<SearchMovieViewModel>(movie); var viewMovie = Mapper.Map<SearchMovieViewModel>(movie);
var user = await GetUser();
var digitalReleaseDate = viewMovie.ReleaseDates?.Results?.FirstOrDefault(x => x.IsoCode == user.StreamingCountry);
if (digitalReleaseDate == null)
{
digitalReleaseDate = viewMovie.ReleaseDates?.Results?.FirstOrDefault(x => x.IsoCode == "US");
}
viewMovie.DigitalReleaseDate = digitalReleaseDate?.ReleaseDate?.FirstOrDefault(x => x.Type == ReleaseDateType.Digital)?.ReleaseDate;
await RunSearchRules(viewMovie); await RunSearchRules(viewMovie);
// This requires the rules to be run first to populate the RequestId property // This requires the rules to be run first to populate the RequestId property
@ -381,6 +389,7 @@ namespace Ombi.Core.Engine.V2
mapped.JellyfinUrl = viewMovie.JellyfinUrl; mapped.JellyfinUrl = viewMovie.JellyfinUrl;
mapped.Subscribed = viewMovie.Subscribed; mapped.Subscribed = viewMovie.Subscribed;
mapped.ShowSubscribe = viewMovie.ShowSubscribe; mapped.ShowSubscribe = viewMovie.ShowSubscribe;
mapped.DigitalReleaseDate = viewMovie.DigitalReleaseDate;
return mapped; return mapped;
} }
@ -416,12 +425,21 @@ namespace Ombi.Core.Engine.V2
{ {
if (viewMovie.ImdbId.IsNullOrEmpty()) if (viewMovie.ImdbId.IsNullOrEmpty())
{ {
var showInfo = await Cache.GetOrAdd("GetMovieInformationWIthImdbId" + viewMovie.Id, var showInfo = await Cache.GetOrAddAsync("GetMovieInformationWIthImdbId" + viewMovie.Id,
async () => await MovieApi.GetMovieInformation(viewMovie.Id), DateTime.Now.AddHours(12)); () => MovieApi.GetMovieInformation(viewMovie.Id), DateTimeOffset.Now.AddHours(12));
viewMovie.Id = showInfo.Id; // TheMovieDbId viewMovie.Id = showInfo.Id; // TheMovieDbId
viewMovie.ImdbId = showInfo.ImdbId; viewMovie.ImdbId = showInfo.ImdbId;
} }
var user = await GetUser();
var digitalReleaseDate = viewMovie.ReleaseDates?.Results?.FirstOrDefault(x => x.IsoCode == user.StreamingCountry);
if (digitalReleaseDate == null)
{
digitalReleaseDate = viewMovie.ReleaseDates?.Results?.FirstOrDefault(x => x.IsoCode == "US");
}
viewMovie.DigitalReleaseDate = digitalReleaseDate?.ReleaseDate?.FirstOrDefault(x => x.Type == ReleaseDateType.Digital)?.ReleaseDate;
viewMovie.TheMovieDbId = viewMovie.Id.ToString(); viewMovie.TheMovieDbId = viewMovie.Id.ToString();
await RunSearchRules(viewMovie); await RunSearchRules(viewMovie);
@ -458,12 +476,12 @@ namespace Ombi.Core.Engine.V2
public async Task<MovieFullInfoViewModel> GetMovieInfoByImdbId(string imdbId, CancellationToken cancellationToken) public async Task<MovieFullInfoViewModel> GetMovieInfoByImdbId(string imdbId, CancellationToken cancellationToken)
{ {
var langCode = await DefaultLanguageCode(null); var langCode = await DefaultLanguageCode(null);
var findResult = await Cache.GetOrAdd(nameof(GetMovieInfoByImdbId) + imdbId + langCode, var findResult = await Cache.GetOrAddAsync(nameof(GetMovieInfoByImdbId) + imdbId + langCode,
async () => await MovieApi.Find(imdbId, ExternalSource.imdb_id), DateTime.Now.AddHours(12), cancellationToken); () => MovieApi.Find(imdbId, ExternalSource.imdb_id), DateTimeOffset.Now.AddHours(12));
var movie = findResult.movie_results.FirstOrDefault(); var movie = findResult.movie_results.FirstOrDefault();
var movieInfo = await Cache.GetOrAdd(nameof(GetMovieInfoByImdbId) + movie.id + langCode, var movieInfo = await Cache.GetOrAddAsync(nameof(GetMovieInfoByImdbId) + movie.id + langCode,
async () => await MovieApi.GetFullMovieInfo(movie.id, cancellationToken, langCode), DateTime.Now.AddHours(12), cancellationToken); () => MovieApi.GetFullMovieInfo(movie.id, cancellationToken, langCode), DateTimeOffset.Now.AddHours(12));
return await ProcessSingleMovie(movieInfo); return await ProcessSingleMovie(movieInfo);
} }

34
src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
View file

@ -60,8 +60,8 @@ namespace Ombi.Core.Engine.V2
public async Task<SearchFullInfoTvShowViewModel> GetShowInformation(string tvdbid, CancellationToken token) public async Task<SearchFullInfoTvShowViewModel> GetShowInformation(string tvdbid, CancellationToken token)
{ {
var langCode = await DefaultLanguageCode(null); var langCode = await DefaultLanguageCode(null);
var show = await Cache.GetOrAdd(nameof(GetShowInformation) + langCode + tvdbid, var show = await Cache.GetOrAddAsync(nameof(GetShowInformation) + langCode + tvdbid,
async () => await _movieApi.GetTVInfo(tvdbid, langCode), DateTime.Now.AddHours(12)); async () => await _movieApi.GetTVInfo(tvdbid, langCode), DateTimeOffset.Now.AddHours(12));
if (show == null || show.name == null) if (show == null || show.name == null)
{ {
// We don't have enough information // We don't have enough information
@ -72,8 +72,8 @@ namespace Ombi.Core.Engine.V2
{ {
// There's no regional assets for this, so // There's no regional assets for this, so
// lookup the en-us version to get them // lookup the en-us version to get them
var enShow = await Cache.GetOrAdd(nameof(GetShowInformation) + "en" + tvdbid, var enShow = await Cache.GetOrAddAsync(nameof(GetShowInformation) + "en" + tvdbid,
async () => await _movieApi.GetTVInfo(tvdbid, "en"), DateTime.Now.AddHours(12)); async () => await _movieApi.GetTVInfo(tvdbid, "en"), DateTimeOffset.Now.AddHours(12));
// For some of the more obsecure cases // For some of the more obsecure cases
if (!show.overview.HasValue()) if (!show.overview.HasValue())
@ -105,8 +105,8 @@ namespace Ombi.Core.Engine.V2
var results = new List<MovieDbSearchResult>(); var results = new List<MovieDbSearchResult>();
foreach (var pagesToLoad in pages) foreach (var pagesToLoad in pages)
{ {
var apiResult = await Cache.GetOrAdd(nameof(Popular) + langCode + pagesToLoad.Page, var apiResult = await Cache.GetOrAddAsync(nameof(Popular) + langCode + pagesToLoad.Page,
async () => await _movieApi.PopularTv(langCode, pagesToLoad.Page), DateTime.Now.AddHours(12)); async () => await _movieApi.PopularTv(langCode, pagesToLoad.Page), DateTimeOffset.Now.AddHours(12));
results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take)); results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take));
} }
@ -122,8 +122,8 @@ namespace Ombi.Core.Engine.V2
var results = new List<MovieDbSearchResult>(); var results = new List<MovieDbSearchResult>();
foreach (var pagesToLoad in pages) foreach (var pagesToLoad in pages)
{ {
var apiResult = await Cache.GetOrAdd(nameof(Anticipated) + langCode + pagesToLoad.Page, var apiResult = await Cache.GetOrAddAsync(nameof(Anticipated) + langCode + pagesToLoad.Page,
async () => await _movieApi.UpcomingTv(langCode, pagesToLoad.Page), DateTime.Now.AddHours(12)); async () => await _movieApi.UpcomingTv(langCode, pagesToLoad.Page), DateTimeOffset.Now.AddHours(12));
results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take)); results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take));
} }
var processed = ProcessResults(results); var processed = ProcessResults(results);
@ -138,8 +138,8 @@ namespace Ombi.Core.Engine.V2
var results = new List<MovieDbSearchResult>(); var results = new List<MovieDbSearchResult>();
foreach (var pagesToLoad in pages) foreach (var pagesToLoad in pages)
{ {
var apiResult = await Cache.GetOrAdd(nameof(Trending) + langCode + pagesToLoad.Page, var apiResult = await Cache.GetOrAddAsync(nameof(Trending) + langCode + pagesToLoad.Page,
async () => await _movieApi.TopRatedTv(langCode, pagesToLoad.Page), DateTime.Now.AddHours(12)); async () => await _movieApi.TopRatedTv(langCode, pagesToLoad.Page), DateTimeOffset.Now.AddHours(12));
results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take)); results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take));
} }
@ -175,16 +175,16 @@ namespace Ombi.Core.Engine.V2
var results = new List<SearchFullInfoTvShowViewModel>(); var results = new List<SearchFullInfoTvShowViewModel>();
var requestResult = await Cache.GetOrAdd(nameof(RecentlyRequestedShows) + "Requests" + toLoad + langCode, var requestResult = await Cache.GetOrAddAsync(nameof(RecentlyRequestedShows) + "Requests" + toLoad + langCode,
async () => async () =>
{ {
return await _requestEngine.GetRequests(toLoad, currentlyLoaded, new Models.UI.OrderFilterModel return await _requestEngine.GetRequests(toLoad, currentlyLoaded, new Models.UI.OrderFilterModel
{ {
OrderType = OrderType.RequestedDateDesc OrderType = OrderType.RequestedDateDesc
}); });
}, DateTime.Now.AddMinutes(15), cancellationToken); }, DateTimeOffset.Now.AddMinutes(15));
var movieDBResults = await Cache.GetOrAdd(nameof(RecentlyRequestedShows) + toLoad + langCode, var movieDBResults = await Cache.GetOrAddAsync(nameof(RecentlyRequestedShows) + toLoad + langCode,
async () => async () =>
{ {
var responses = new List<TvInfo>(); var responses = new List<TvInfo>();
@ -193,7 +193,7 @@ namespace Ombi.Core.Engine.V2
responses.Add(await _movieApi.GetTVInfo(movie.ExternalProviderId.ToString())); responses.Add(await _movieApi.GetTVInfo(movie.ExternalProviderId.ToString()));
} }
return responses; return responses;
}, DateTime.Now.AddHours(12), cancellationToken); }, DateTimeOffset.Now.AddHours(12));
var mapped = _mapper.Map<List<SearchFullInfoTvShowViewModel>>(movieDBResults); var mapped = _mapper.Map<List<SearchFullInfoTvShowViewModel>>(movieDBResults);
@ -219,14 +219,14 @@ namespace Ombi.Core.Engine.V2
if (settings.HideAvailableFromDiscover) if (settings.HideAvailableFromDiscover)
{ {
// To hide, we need to know if it's fully available, the only way to do this is to lookup it's episodes to check if we have every episode // To hide, we need to know if it's fully available, the only way to do this is to lookup it's episodes to check if we have every episode
var show = await Cache.GetOrAdd(nameof(GetShowInformation) + tvMazeSearch.Id.ToString(), var show = await Cache.GetOrAddAsync(nameof(GetShowInformation) + tvMazeSearch.Id.ToString(),
async () => await _movieApi.GetTVInfo(tvMazeSearch.Id.ToString()), DateTime.Now.AddHours(12)); async () => await _movieApi.GetTVInfo(tvMazeSearch.Id.ToString()), DateTime.Now.AddHours(12));
foreach (var tvSeason in show.seasons.Where(x => x.season_number != 0)) // skip the first season foreach (var tvSeason in show.seasons.Where(x => x.season_number != 0)) // skip the first season
{ {
var seasonEpisodes = await Cache.GetOrAdd("SeasonEpisodes" + show.id + tvSeason.season_number, async () => var seasonEpisodes = await Cache.GetOrAddAsync("SeasonEpisodes" + show.id + tvSeason.season_number, async () =>
{ {
return await _movieApi.GetSeasonEpisodes(show.id, tvSeason.season_number, CancellationToken.None); return await _movieApi.GetSeasonEpisodes(show.id, tvSeason.season_number, CancellationToken.None);
}, DateTime.Now.AddHours(12)); }, DateTimeOffset.Now.AddHours(12));
MapSeasons(tvMazeSearch.SeasonRequests, tvSeason, seasonEpisodes); MapSeasons(tvMazeSearch.SeasonRequests, tvSeason, seasonEpisodes);
} }

4
src/Ombi.Core/ImageService.cs
View file

@ -23,8 +23,8 @@ namespace Ombi.Core
public async Task<string> GetTvBackground(string tvdbId) public async Task<string> GetTvBackground(string tvdbId)
{ {
var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await _configRepository.GetAsync(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1)); var key = await _cache.GetOrAddAsync(CacheKeys.FanartTv, () => _configRepository.GetAsync(Store.Entities.ConfigurationTypes.FanartTv), DateTimeOffset.Now.AddDays(1));
var images = await _cache.GetOrAdd($"{CacheKeys.FanartTv}tv{tvdbId}", async () => await _fanartTvApi.GetTvImages(int.Parse(tvdbId), key.Value), DateTime.Now.AddDays(1)); var images = await _cache.GetOrAddAsync($"{CacheKeys.FanartTv}tv{tvdbId}", () => _fanartTvApi.GetTvImages(int.Parse(tvdbId), key.Value), DateTimeOffset.Now.AddDays(1));
if (images == null) if (images == null)
{ {

1
src/Ombi.DependencyInjection/IocExtensions.cs
View file

@ -206,6 +206,7 @@ namespace Ombi.DependencyInjection
services.AddTransient<IEmailProvider, GenericEmailProvider>(); services.AddTransient<IEmailProvider, GenericEmailProvider>();
services.AddTransient<INotificationHelper, NotificationHelper>(); services.AddTransient<INotificationHelper, NotificationHelper>();
services.AddSingleton<ICacheService, CacheService>(); services.AddSingleton<ICacheService, CacheService>();
services.AddSingleton<IMediaCacheService, MediaCacheService>();
services.AddScoped<IImageService, ImageService>(); services.AddScoped<IImageService, ImageService>();
services.AddTransient<IDiscordNotification, DiscordNotification>(); services.AddTransient<IDiscordNotification, DiscordNotification>();

60
src/Ombi.Helpers/CacheService.cs
View file

@ -1,48 +1,26 @@
using System; using System;
using System.Collections.Generic;
using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.Caching.Memory; using LazyCache;
using Nito.AsyncEx;
namespace Ombi.Helpers namespace Ombi.Helpers
{ {
public class CacheService : ICacheService public class CacheService : ICacheService
{ {
private readonly IMemoryCache _memoryCache; protected readonly IAppCache _memoryCache;
private readonly AsyncLock _mutex = new AsyncLock(); public CacheService(IAppCache memoryCache)
public CacheService(IMemoryCache memoryCache)
{ {
_memoryCache = memoryCache ?? throw new ArgumentNullException(nameof(memoryCache)); _memoryCache = memoryCache;
} }
public async Task<T> GetOrAdd<T>(string cacheKey, Func<Task<T>> factory, DateTime absoluteExpiration = default(DateTime), CancellationToken cancellationToken = default(CancellationToken)) public virtual async Task<T> GetOrAddAsync<T>(string cacheKey, Func<Task<T>> factory, DateTimeOffset absoluteExpiration = default)
{ {
if (absoluteExpiration == default(DateTime)) if (absoluteExpiration == default)
{ {
absoluteExpiration = DateTime.Now.AddHours(1); absoluteExpiration = DateTimeOffset.Now.AddHours(1);
}
// locks get and set internally
if (_memoryCache.TryGetValue<T>(cacheKey, out var result))
{
return result;
} }
if (_memoryCache.TryGetValue(cacheKey, out result)) return await _memoryCache.GetOrAddAsync<T>(cacheKey, () => factory(), absoluteExpiration);
{
return result;
}
if (cancellationToken.CanBeCanceled)
{
cancellationToken.ThrowIfCancellationRequested();
}
result = await factory();
_memoryCache.Set(cacheKey, result, absoluteExpiration);
return result;
} }
public void Remove(string key) public void Remove(string key)
@ -50,28 +28,10 @@ namespace Ombi.Helpers
_memoryCache.Remove(key); _memoryCache.Remove(key);
} }
public T GetOrAdd<T>(string cacheKey, Func<T> factory, DateTimeOffset absoluteExpiration)
public T GetOrAdd<T>(string cacheKey, Func<T> factory, DateTime absoluteExpiration)
{ {
// locks get and set internally // locks get and set internally
if (_memoryCache.TryGetValue<T>(cacheKey, out var result)) return _memoryCache.GetOrAdd<T>(cacheKey, () => factory(), absoluteExpiration);
{
return result;
}
lock (TypeLock<T>.Lock)
{
if (_memoryCache.TryGetValue(cacheKey, out result))
{
return result;
}
result = factory();
_memoryCache.Set(cacheKey, result, absoluteExpiration);
return result;
}
} }
private static class TypeLock<T> private static class TypeLock<T>

4
src/Ombi.Helpers/ICacheService.cs
View file

@ -6,8 +6,8 @@ namespace Ombi.Helpers
{ {
public interface ICacheService public interface ICacheService
{ {
Task<T> GetOrAdd<T>(string cacheKey, Func<Task<T>> factory, DateTime absoluteExpiration = default(DateTime), CancellationToken cancellationToken = default(CancellationToken)); Task<T> GetOrAddAsync<T>(string cacheKey, Func<Task<T>> factory, DateTimeOffset absoluteExpiration = default);
T GetOrAdd<T>(string cacheKey, Func<T> factory, DateTime absoluteExpiration); T GetOrAdd<T>(string cacheKey, Func<T> factory, DateTimeOffset absoluteExpiration);
void Remove(string key); void Remove(string key);
} }
} }

61
src/Ombi.Helpers/MediaCacheService.cs Normal file
View file

@ -0,0 +1,61 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using LazyCache;
namespace Ombi.Helpers
{
public interface IMediaCacheService
{
Task<T> GetOrAddAsync<T>(string cacheKey, System.Func<Task<T>> factory, DateTimeOffset absoluteExpiration = default);
Task Purge();
}
public class MediaCacheService : CacheService, IMediaCacheService
{
private const string CacheKey = "MediaCacheServiceKeys";
public MediaCacheService(IAppCache memoryCache) : base(memoryCache)
{
}
public async override Task<T> GetOrAddAsync<T>(string cacheKey, System.Func<Task<T>> factory, DateTimeOffset absoluteExpiration = default)
{
if (absoluteExpiration == default)
{
absoluteExpiration = DateTimeOffset.Now.AddHours(1);
}
if (_memoryCache.TryGetValue<T>($"MediaCacheService_{cacheKey}", out var result))
{
return (T)result;
}
// Not in the cache, so add this Key into our MediaServiceCache
await UpdateLocalCache(cacheKey);
return await _memoryCache.GetOrAddAsync<T>(cacheKey, () => factory(), absoluteExpiration);
}
private async Task UpdateLocalCache(string cacheKey)
{
var mediaServiceCache = await _memoryCache.GetAsync<List<string>>(CacheKey);
if (mediaServiceCache == null)
{
mediaServiceCache = new List<string>();
}
mediaServiceCache.Add(cacheKey);
_memoryCache.Remove(CacheKey);
_memoryCache.Add(CacheKey, mediaServiceCache);
}
public async Task Purge()
{
var keys = await _memoryCache.GetAsync<List<string>>(CacheKey);
foreach (var key in keys)
{
base.Remove(key);
}
}
}
}

1
src/Ombi.Helpers/Ombi.Helpers.csproj
View file

@ -11,6 +11,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="EasyCrypto" Version="3.3.2" /> <PackageReference Include="EasyCrypto" Version="3.3.2" />
<PackageReference Include="LazyCache.AspNetCore" Version="2.1.3" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />

6
src/Ombi.Settings/Settings/SettingsService.cs
View file

@ -41,12 +41,12 @@ namespace Ombi.Settings.Settings
var model = obj; var model = obj;
return model; return model;
}, DateTime.Now.AddHours(2)); }, DateTimeOffset.Now.AddHours(2));
} }
public async Task<T> GetSettingsAsync() public async Task<T> GetSettingsAsync()
{ {
return await _cache.GetOrAdd(CacheName, async () => return await _cache.GetOrAddAsync(CacheName, async () =>
{ {
var result = await Repo.GetAsync(EntityName); var result = await Repo.GetAsync(EntityName);
if (result == null) if (result == null)
@ -61,7 +61,7 @@ namespace Ombi.Settings.Settings
var model = obj; var model = obj;
return model; return model;
}, DateTime.Now.AddHours(5)); }, DateTimeOffset.Now.AddHours(5));
} }
public bool SaveSettings(T model) public bool SaveSettings(T model)

8
src/Ombi/Controllers/V1/External/LidarrController.cs vendored
View file

@ -69,7 +69,7 @@ namespace Ombi.Controllers.V1.External
[HttpGet("Profiles")] [HttpGet("Profiles")]
public async Task<IEnumerable<LidarrProfile>> GetProfiles() public async Task<IEnumerable<LidarrProfile>> GetProfiles()
{ {
return await Cache.GetOrAdd(CacheKeys.LidarrQualityProfiles, async () => return await Cache.GetOrAddAsync(CacheKeys.LidarrQualityProfiles, async () =>
{ {
var settings = await _lidarrSettings.GetSettingsAsync(); var settings = await _lidarrSettings.GetSettingsAsync();
if (settings.Enabled) if (settings.Enabled)
@ -77,7 +77,7 @@ namespace Ombi.Controllers.V1.External
return await _lidarrApi.GetProfiles(settings.ApiKey, settings.FullUri); return await _lidarrApi.GetProfiles(settings.ApiKey, settings.FullUri);
} }
return null; return null;
}, DateTime.Now.AddHours(1)); }, DateTimeOffset.Now.AddHours(1));
} }
/// <summary> /// <summary>
@ -88,7 +88,7 @@ namespace Ombi.Controllers.V1.External
[HttpGet("RootFolders")] [HttpGet("RootFolders")]
public async Task<IEnumerable<LidarrRootFolder>> GetRootFolders() public async Task<IEnumerable<LidarrRootFolder>> GetRootFolders()
{ {
return await Cache.GetOrAdd(CacheKeys.LidarrRootFolders, async () => return await Cache.GetOrAddAsync(CacheKeys.LidarrRootFolders, async () =>
{ {
var settings = await _lidarrSettings.GetSettingsAsync(); var settings = await _lidarrSettings.GetSettingsAsync();
if (settings.Enabled) if (settings.Enabled)
@ -96,7 +96,7 @@ namespace Ombi.Controllers.V1.External
return await _lidarrApi.GetRootFolders(settings.ApiKey, settings.FullUri); return await _lidarrApi.GetRootFolders(settings.ApiKey, settings.FullUri);
} }
return null; return null;
}, DateTime.Now.AddHours(1)); }, DateTimeOffset.Now.AddHours(1));
} }
} }
} }

4
src/Ombi/Controllers/V1/IdentityController.cs
View file

@ -293,8 +293,8 @@ namespace Ombi.Controllers.V1
[PowerUser] [PowerUser]
public async Task<IEnumerable<UserViewModelDropdown>> GetAllUsersDropdown() public async Task<IEnumerable<UserViewModelDropdown>> GetAllUsersDropdown()
{ {
var users = await _cacheService.GetOrAdd(CacheKeys.UsersDropdown, var users = await _cacheService.GetOrAddAsync(CacheKeys.UsersDropdown,
async () => await UserManager.Users.Where(x => x.UserType != UserType.SystemUser).ToListAsync()); () => UserManager.Users.Where(x => x.UserType != UserType.SystemUser).ToListAsync());
var model = new List<UserViewModelDropdown>(); var model = new List<UserViewModelDropdown>();

34
src/Ombi/Controllers/V1/ImagesController.cs
View file

@ -45,9 +45,9 @@ namespace Ombi.Controllers.V1
{ {
return string.Empty; return string.Empty;
} }
var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.GetAsync(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1)); var key = await _cache.GetOrAddAsync(CacheKeys.FanartTv, () => Config.GetAsync(Store.Entities.ConfigurationTypes.FanartTv), DateTimeOffset.Now.AddDays(1));
var images = await _cache.GetOrAdd($"{CacheKeys.FanartTv}tv{tvdbid}", async () => await FanartTvApi.GetTvImages(tvdbid, key.Value), DateTime.Now.AddDays(1)); var images = await _cache.GetOrAddAsync($"{CacheKeys.FanartTv}tv{tvdbid}", () => FanartTvApi.GetTvImages(tvdbid, key.Value), DateTimeOffset.Now.AddDays(1));
if (images == null) if (images == null)
{ {
return string.Empty; return string.Empty;
@ -70,7 +70,7 @@ namespace Ombi.Controllers.V1
[HttpGet("poster")] [HttpGet("poster")]
public async Task<string> GetRandomPoster() public async Task<string> GetRandomPoster()
{ {
var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.GetAsync(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1)); var key = await _cache.GetOrAddAsync(CacheKeys.FanartTv, () => Config.GetAsync(Store.Entities.ConfigurationTypes.FanartTv), DateTimeOffset.Now.AddDays(1));
var rand = new Random(); var rand = new Random();
var val = rand.Next(1, 3); var val = rand.Next(1, 3);
if (val == 1) if (val == 1)
@ -79,7 +79,7 @@ namespace Ombi.Controllers.V1
var selectedMovieIndex = rand.Next(movies.Count()); var selectedMovieIndex = rand.Next(movies.Count());
var movie = movies[selectedMovieIndex]; var movie = movies[selectedMovieIndex];
var images = await _cache.GetOrAdd($"{CacheKeys.FanartTv}movie{movie.Id}", async () => await FanartTvApi.GetMovieImages(movie.Id.ToString(), key.Value), DateTime.Now.AddDays(1)); var images = await _cache.GetOrAddAsync($"{CacheKeys.FanartTv}movie{movie.Id}", () => FanartTvApi.GetMovieImages(movie.Id.ToString(), key.Value), DateTimeOffset.Now.AddDays(1));
if (images == null) if (images == null)
{ {
return string.Empty; return string.Empty;
@ -114,9 +114,9 @@ namespace Ombi.Controllers.V1
[HttpGet("poster/movie/{movieDbId}")] [HttpGet("poster/movie/{movieDbId}")]
public async Task<string> GetMoviePoster(string movieDbId) public async Task<string> GetMoviePoster(string movieDbId)
{ {
var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.GetAsync(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1)); var key = await _cache.GetOrAddAsync(CacheKeys.FanartTv, () => Config.GetAsync(Store.Entities.ConfigurationTypes.FanartTv), DateTimeOffset.Now.AddDays(1));
var images = await _cache.GetOrAdd($"{CacheKeys.FanartTv}movie{movieDbId}", async () => await FanartTvApi.GetMovieImages(movieDbId, key.Value), DateTime.Now.AddDays(1)); var images = await _cache.GetOrAddAsync($"{CacheKeys.FanartTv}movie{movieDbId}", () => FanartTvApi.GetMovieImages(movieDbId, key.Value), DateTimeOffset.Now.AddDays(1));
if (images == null) if (images == null)
{ {
@ -148,9 +148,9 @@ namespace Ombi.Controllers.V1
{ {
return string.Empty; return string.Empty;
} }
var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.GetAsync(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1)); var key = await _cache.GetOrAddAsync(CacheKeys.FanartTv, () => Config.GetAsync(Store.Entities.ConfigurationTypes.FanartTv), DateTimeOffset.Now.AddDays(1));
var images = await _cache.GetOrAdd($"{CacheKeys.FanartTv}tv{tvdbid}", async () => await FanartTvApi.GetTvImages(tvdbid, key.Value), DateTime.Now.AddDays(1)); var images = await _cache.GetOrAddAsync($"{CacheKeys.FanartTv}tv{tvdbid}", () => FanartTvApi.GetTvImages(tvdbid, key.Value), DateTimeOffset.Now.AddDays(1));
if (images == null) if (images == null)
{ {
@ -178,9 +178,9 @@ namespace Ombi.Controllers.V1
[HttpGet("background/movie/{movieDbId}")] [HttpGet("background/movie/{movieDbId}")]
public async Task<string> GetMovieBackground(string movieDbId) public async Task<string> GetMovieBackground(string movieDbId)
{ {
var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.GetAsync(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1)); var key = await _cache.GetOrAddAsync(CacheKeys.FanartTv, () => Config.GetAsync(Store.Entities.ConfigurationTypes.FanartTv), DateTimeOffset.Now.AddDays(1));
var images = await _cache.GetOrAdd($"{CacheKeys.FanartTv}movie{movieDbId}", async () => await FanartTvApi.GetMovieImages(movieDbId, key.Value), DateTime.Now.AddDays(1)); var images = await _cache.GetOrAddAsync($"{CacheKeys.FanartTv}movie{movieDbId}", () => FanartTvApi.GetMovieImages(movieDbId, key.Value), DateTimeOffset.Now.AddDays(1));
if (images == null) if (images == null)
{ {
@ -203,9 +203,9 @@ namespace Ombi.Controllers.V1
[HttpGet("banner/movie/{movieDbId}")] [HttpGet("banner/movie/{movieDbId}")]
public async Task<string> GetMovieBanner(string movieDbId) public async Task<string> GetMovieBanner(string movieDbId)
{ {
var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.GetAsync(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1)); var key = await _cache.GetOrAddAsync(CacheKeys.FanartTv, () => Config.GetAsync(Store.Entities.ConfigurationTypes.FanartTv), DateTimeOffset.Now.AddDays(1));
var images = await _cache.GetOrAdd($"{CacheKeys.FanartTv}movie{movieDbId}", async () => await FanartTvApi.GetMovieImages(movieDbId, key.Value), DateTime.Now.AddDays(1)); var images = await _cache.GetOrAddAsync($"{CacheKeys.FanartTv}movie{movieDbId}", () => FanartTvApi.GetMovieImages(movieDbId, key.Value), DateTimeOffset.Now.AddDays(1));
if (images == null) if (images == null)
{ {
@ -246,17 +246,17 @@ namespace Ombi.Controllers.V1
var movieUrl = string.Empty; var movieUrl = string.Empty;
var tvUrl = string.Empty; var tvUrl = string.Empty;
var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.GetAsync(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1)); var key = await _cache.GetOrAddAsync(CacheKeys.FanartTv, () => Config.GetAsync(Store.Entities.ConfigurationTypes.FanartTv), DateTimeOffset.Now.AddDays(1));
if (moviesArray.Length > 0) if (moviesArray.Length > 0)
{ {
var item = rand.Next(moviesArray.Length); var item = rand.Next(moviesArray.Length);
var result = await _cache.GetOrAdd($"{CacheKeys.FanartTv}movie{moviesArray[item]}", async () => await FanartTvApi.GetMovieImages(moviesArray[item].ToString(), key.Value), DateTime.Now.AddDays(1)); var result = await _cache.GetOrAddAsync($"{CacheKeys.FanartTv}movie{moviesArray[item]}", () => FanartTvApi.GetMovieImages(moviesArray[item].ToString(), key.Value), DateTimeOffset.Now.AddDays(1));
while (!result.moviebackground?.Any() ?? true) while (!result.moviebackground?.Any() ?? true)
{ {
item = rand.Next(moviesArray.Length); item = rand.Next(moviesArray.Length);
result = await _cache.GetOrAdd($"{CacheKeys.FanartTv}movie{moviesArray[item]}", async () => await FanartTvApi.GetMovieImages(moviesArray[item].ToString(), key.Value), DateTime.Now.AddDays(1)); result = await _cache.GetOrAddAsync($"{CacheKeys.FanartTv}movie{moviesArray[item]}", () => FanartTvApi.GetMovieImages(moviesArray[item].ToString(), key.Value), DateTimeOffset.Now.AddDays(1));
} }
@ -268,12 +268,12 @@ namespace Ombi.Controllers.V1
if (tvArray.Length > 0) if (tvArray.Length > 0)
{ {
var item = rand.Next(tvArray.Length); var item = rand.Next(tvArray.Length);
var result = await _cache.GetOrAdd($"{CacheKeys.FanartTv}tv{tvArray[item]}", async () => await FanartTvApi.GetTvImages(tvArray[item], key.Value), DateTime.Now.AddDays(1)); var result = await _cache.GetOrAddAsync($"{CacheKeys.FanartTv}tv{tvArray[item]}", () => FanartTvApi.GetTvImages(tvArray[item], key.Value), DateTimeOffset.Now.AddDays(1));
while (!result.showbackground?.Any() ?? true) while (!result.showbackground?.Any() ?? true)
{ {
item = rand.Next(tvArray.Length); item = rand.Next(tvArray.Length);
result = await _cache.GetOrAdd($"{CacheKeys.FanartTv}tv{tvArray[item]}", async () => await FanartTvApi.GetTvImages(tvArray[item], key.Value), DateTime.Now.AddDays(1)); result = await _cache.GetOrAddAsync($"{CacheKeys.FanartTv}tv{tvArray[item]}", () => FanartTvApi.GetTvImages(tvArray[item], key.Value), DateTimeOffset.Now.AddDays(1));
} }
var otherRand = new Random(); var otherRand = new Random();
var res = otherRand.Next(result.showbackground.Length); var res = otherRand.Next(result.showbackground.Length);

2
src/Ombi/Controllers/V1/JobController.cs
View file

@ -66,7 +66,7 @@ namespace Ombi.Controllers.V1
[HttpGet("updateCached")] [HttpGet("updateCached")]
public async Task<bool> CheckForUpdateCached() public async Task<bool> CheckForUpdateCached()
{ {
var val = await _memCache.GetOrAdd(CacheKeys.Update, async () => var val = await _memCache.GetOrAddAsync(CacheKeys.Update, async () =>
{ {
var productArray = _updater.GetVersion(); var productArray = _updater.GetVersion();

4
src/Ombi/Controllers/V1/UpdateController.cs
View file

@ -21,10 +21,10 @@ namespace Ombi.Controllers.V1
private readonly ICacheService _cache; private readonly ICacheService _cache;
private readonly IChangeLogProcessor _processor; private readonly IChangeLogProcessor _processor;
[HttpGet()] [HttpGet]
public async Task<UpdateModel> UpdateAvailable() public async Task<UpdateModel> UpdateAvailable()
{ {
return await _cache.GetOrAdd("Update", async () => await _processor.Process()); return await _cache.GetOrAddAsync("Update", () => _processor.Process());
} }
} }
} }

1
src/Ombi/Controllers/V2/RequestsController.cs
View file

@ -12,6 +12,7 @@ using Ombi.Store.Entities;
using System.Linq; using System.Linq;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Ombi.Attributes; using Ombi.Attributes;
using Ombi.Helpers;
namespace Ombi.Controllers.V2 namespace Ombi.Controllers.V2
{ {

127
src/Ombi/Controllers/V2/SearchController.cs
View file

@ -1,11 +1,9 @@
using System; using System;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading;
using Ombi.Core; using Ombi.Core;
using Ombi.Api.TheMovieDb.Models; using Ombi.Api.TheMovieDb.Models;
using Ombi.Core.Engine.V2; using Ombi.Core.Engine.V2;
@ -16,14 +14,15 @@ using Ombi.Core.Models.Search.V2.Music;
using Ombi.Models; using Ombi.Models;
using Ombi.Api.RottenTomatoes.Models; using Ombi.Api.RottenTomatoes.Models;
using Ombi.Api.RottenTomatoes; using Ombi.Api.RottenTomatoes;
using Hqub.MusicBrainz.API.Entities.Collections; using Ombi.Helpers;
namespace Ombi.Controllers.V2 namespace Ombi.Controllers.V2
{ {
public class SearchController : V2Controller public class SearchController : V2Controller
{ {
public SearchController(IMultiSearchEngine multiSearchEngine, public SearchController(IMultiSearchEngine multiSearchEngine,
IMovieEngineV2 v2Movie, ITVSearchEngineV2 v2Tv, IMusicSearchEngineV2 musicEngine, IRottenTomatoesApi rottenTomatoesApi) IMovieEngineV2 v2Movie, ITVSearchEngineV2 v2Tv, IMusicSearchEngineV2 musicEngine, IRottenTomatoesApi rottenTomatoesApi,
IMediaCacheService mediaCacheService)
{ {
_multiSearchEngine = multiSearchEngine; _multiSearchEngine = multiSearchEngine;
_movieEngineV2 = v2Movie; _movieEngineV2 = v2Movie;
@ -31,6 +30,7 @@ namespace Ombi.Controllers.V2
_tvEngineV2 = v2Tv; _tvEngineV2 = v2Tv;
_musicEngine = musicEngine; _musicEngine = musicEngine;
_rottenTomatoesApi = rottenTomatoesApi; _rottenTomatoesApi = rottenTomatoesApi;
_mediaCacheService = mediaCacheService;
} }
private readonly IMultiSearchEngine _multiSearchEngine; private readonly IMultiSearchEngine _multiSearchEngine;
@ -38,6 +38,7 @@ namespace Ombi.Controllers.V2
private readonly ITVSearchEngineV2 _tvEngineV2; private readonly ITVSearchEngineV2 _tvEngineV2;
private readonly IMusicSearchEngineV2 _musicEngine; private readonly IMusicSearchEngineV2 _musicEngine;
private readonly IRottenTomatoesApi _rottenTomatoesApi; private readonly IRottenTomatoesApi _rottenTomatoesApi;
private readonly IMediaCacheService _mediaCacheService;
/// <summary> /// <summary>
/// Returns search results for both TV and Movies /// Returns search results for both TV and Movies
@ -59,24 +60,30 @@ namespace Ombi.Controllers.V2
/// </summary> /// </summary>
/// <param name="movieDbId">The MovieDB Id</param> /// <param name="movieDbId">The MovieDB Id</param>
[HttpGet("movie/{movieDbId}")] [HttpGet("movie/{movieDbId}")]
public async Task<MovieFullInfoViewModel> GetMovieInfo(int movieDbId) public Task<MovieFullInfoViewModel> GetMovieInfo(int movieDbId)
{ {
return await _movieEngineV2.GetFullMovieInformation(movieDbId, Request.HttpContext.RequestAborted); return _mediaCacheService.GetOrAddAsync(nameof(GetMovieInfo) + movieDbId,
() => _movieEngineV2.GetFullMovieInformation(movieDbId, Request.HttpContext.RequestAborted),
DateTimeOffset.Now.AddHours(12));
} }
[HttpGet("movie/imdb/{imdbid}")] [HttpGet("movie/imdb/{imdbid}")]
public async Task<MovieFullInfoViewModel> GetMovieInfoByImdbId(string imdbId) public Task<MovieFullInfoViewModel> GetMovieInfoByImdbId(string imdbId)
{ {
return await _movieEngineV2.GetMovieInfoByImdbId(imdbId, Request.HttpContext.RequestAborted); return _mediaCacheService.GetOrAddAsync(nameof(GetMovieInfoByImdbId) + imdbId,
() => _movieEngineV2.GetMovieInfoByImdbId(imdbId, Request.HttpContext.RequestAborted),
DateTimeOffset.Now.AddHours(12));
} }
/// <summary> /// <summary>
/// Returns details for a single movie /// Returns details for a single movie
/// </summary> /// </summary>
[HttpGet("movie/request/{requestId}")] [HttpGet("movie/request/{requestId}")]
public async Task<MovieFullInfoViewModel> GetMovieByRequest(int requestId) public Task<MovieFullInfoViewModel> GetMovieByRequest(int requestId)
{ {
return await _movieEngineV2.GetMovieInfoByRequestId(requestId, Request.HttpContext.RequestAborted); return _mediaCacheService.GetOrAddAsync(nameof(GetMovieByRequest) + requestId,
() => _movieEngineV2.GetMovieInfoByRequestId(requestId, Request.HttpContext.RequestAborted),
DateTimeOffset.Now.AddHours(12));
} }
/// <summary> /// <summary>
@ -85,9 +92,11 @@ namespace Ombi.Controllers.V2
/// <param name="collectionId">The collection id from TheMovieDb</param> /// <param name="collectionId">The collection id from TheMovieDb</param>
/// <returns></returns> /// <returns></returns>
[HttpGet("movie/collection/{collectionId}")] [HttpGet("movie/collection/{collectionId}")]
public async Task<MovieCollectionsViewModel> GetMovieCollections(int collectionId) public Task<MovieCollectionsViewModel> GetMovieCollections(int collectionId)
{ {
return await _movieEngineV2.GetCollection(collectionId, Request.HttpContext.RequestAborted); return _mediaCacheService.GetOrAddAsync(nameof(GetMovieCollections) + collectionId,
() => _movieEngineV2.GetCollection(collectionId, Request.HttpContext.RequestAborted),
DateTimeOffset.Now.AddHours(12));
} }
/// <summary> /// <summary>
@ -96,9 +105,11 @@ namespace Ombi.Controllers.V2
/// <remarks>TVMaze is the TV Show Provider</remarks> /// <remarks>TVMaze is the TV Show Provider</remarks>
/// <param name="tvdbid">The TVDB Id</param> /// <param name="tvdbid">The TVDB Id</param>
[HttpGet("tv/{tvdbId}")] [HttpGet("tv/{tvdbId}")]
public async Task<SearchFullInfoTvShowViewModel> GetTvInfo(string tvdbid) public Task<SearchFullInfoTvShowViewModel> GetTvInfo(string tvdbid)
{ {
return await _tvEngineV2.GetShowInformation(tvdbid, HttpContext.RequestAborted); return _mediaCacheService.GetOrAddAsync(nameof(GetTvInfo) + tvdbid,
() => _tvEngineV2.GetShowInformation(tvdbid, HttpContext.RequestAborted),
DateTimeOffset.Now.AddHours(12));
} }
/// <summary> /// <summary>
@ -107,9 +118,11 @@ namespace Ombi.Controllers.V2
/// <remarks>TVMaze is the TV Show Provider</remarks> /// <remarks>TVMaze is the TV Show Provider</remarks>
/// ///
[HttpGet("tv/request/{requestId}")] [HttpGet("tv/request/{requestId}")]
public async Task<SearchFullInfoTvShowViewModel> GetTvInfoByRequest(int requestId) public Task<SearchFullInfoTvShowViewModel> GetTvInfoByRequest(int requestId)
{ {
return await _tvEngineV2.GetShowByRequest(requestId, HttpContext.RequestAborted); return _mediaCacheService.GetOrAddAsync(nameof(GetTvInfoByRequest) + requestId,
() => _tvEngineV2.GetShowByRequest(requestId, HttpContext.RequestAborted),
DateTimeOffset.Now.AddHours(12));
} }
/// <summary> /// <summary>
@ -117,9 +130,11 @@ namespace Ombi.Controllers.V2
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("tv/moviedb/{moviedbid}")] [HttpGet("tv/moviedb/{moviedbid}")]
public async Task<SearchFullInfoTvShowViewModel> GetTvInfoByMovieId(string moviedbid) public Task<SearchFullInfoTvShowViewModel> GetTvInfoByMovieId(string moviedbid)
{ {
return await _tvEngineV2.GetShowInformation(moviedbid, HttpContext.RequestAborted); return _mediaCacheService.GetOrAddAsync(nameof(GetTvInfoByMovieId) + moviedbid,
() => _tvEngineV2.GetShowInformation(moviedbid, HttpContext.RequestAborted),
DateTimeOffset.Now.AddHours(12));
} }
/// <summary> /// <summary>
@ -131,9 +146,11 @@ namespace Ombi.Controllers.V2
[HttpPost("movie/similar")] [HttpPost("movie/similar")]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType] [ProducesDefaultResponseType]
public async Task<IEnumerable<SearchMovieViewModel>> SimilarMovies([FromBody] SimilarMoviesRefineModel model) public Task<IEnumerable<SearchMovieViewModel>> SimilarMovies([FromBody] SimilarMoviesRefineModel model)
{ {
return await _movieEngineV2.SimilarMovies(model.TheMovieDbId, model.LanguageCode); return _mediaCacheService.GetOrAddAsync(nameof(SimilarMovies) + model.TheMovieDbId + model.LanguageCode,
() => _movieEngineV2.SimilarMovies(model.TheMovieDbId, model.LanguageCode),
DateTimeOffset.Now.AddHours(12));
} }
@ -159,9 +176,11 @@ namespace Ombi.Controllers.V2
[HttpGet("movie/popular/{currentPosition}/{amountToLoad}")] [HttpGet("movie/popular/{currentPosition}/{amountToLoad}")]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType] [ProducesDefaultResponseType]
public async Task<IEnumerable<SearchMovieViewModel>> Popular(int currentPosition, int amountToLoad) public Task<IEnumerable<SearchMovieViewModel>> Popular(int currentPosition, int amountToLoad)
{ {
return await _movieEngineV2.PopularMovies(currentPosition, amountToLoad, Request.HttpContext.RequestAborted); return _mediaCacheService.GetOrAddAsync(nameof(Popular) + "Movies" + currentPosition + amountToLoad,
() => _movieEngineV2.PopularMovies(currentPosition, amountToLoad, Request.HttpContext.RequestAborted),
DateTimeOffset.Now.AddHours(12));
} }
/// <summary> /// <summary>
@ -172,9 +191,11 @@ namespace Ombi.Controllers.V2
[HttpGet("movie/seasonal/{currentPosition}/{amountToLoad}")] [HttpGet("movie/seasonal/{currentPosition}/{amountToLoad}")]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType] [ProducesDefaultResponseType]
public async Task<IEnumerable<SearchMovieViewModel>> Seasonal(int currentPosition, int amountToLoad) public Task<IEnumerable<SearchMovieViewModel>> Seasonal(int currentPosition, int amountToLoad)
{ {
return await _movieEngineV2.SeasonalList(currentPosition, amountToLoad, Request.HttpContext.RequestAborted); return _mediaCacheService.GetOrAddAsync(nameof(Seasonal) + "Movies" + currentPosition + amountToLoad,
() => _movieEngineV2.SeasonalList(currentPosition, amountToLoad, Request.HttpContext.RequestAborted),
DateTimeOffset.Now.AddHours(1));
} }
/// <summary> /// <summary>
@ -224,9 +245,11 @@ namespace Ombi.Controllers.V2
[HttpGet("movie/nowplaying/{currentPosition}/{amountToLoad}")] [HttpGet("movie/nowplaying/{currentPosition}/{amountToLoad}")]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType] [ProducesDefaultResponseType]
public async Task<IEnumerable<SearchMovieViewModel>> NowPlayingMovies(int currentPosition, int amountToLoad) public Task<IEnumerable<SearchMovieViewModel>> NowPlayingMovies(int currentPosition, int amountToLoad)
{ {
return await _movieEngineV2.NowPlayingMovies(currentPosition, amountToLoad); return _mediaCacheService.GetOrAddAsync(nameof(NowPlayingMovies) + currentPosition + amountToLoad,
() => _movieEngineV2.NowPlayingMovies(currentPosition, amountToLoad),
DateTimeOffset.Now.AddHours(12));
} }
/// <summary> /// <summary>
@ -250,9 +273,11 @@ namespace Ombi.Controllers.V2
[HttpGet("movie/toprated/{currentPosition}/{amountToLoad}")] [HttpGet("movie/toprated/{currentPosition}/{amountToLoad}")]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType] [ProducesDefaultResponseType]
public async Task<IEnumerable<SearchMovieViewModel>> TopRatedMovies(int currentPosition, int amountToLoad) public Task<IEnumerable<SearchMovieViewModel>> TopRatedMovies(int currentPosition, int amountToLoad)
{ {
return await _movieEngineV2.TopRatedMovies(currentPosition, amountToLoad); return _mediaCacheService.GetOrAddAsync(nameof(TopRatedMovies) + currentPosition + amountToLoad,
() => _movieEngineV2.TopRatedMovies(currentPosition, amountToLoad),
DateTimeOffset.Now.AddHours(12));
} }
/// <summary> /// <summary>
@ -276,9 +301,11 @@ namespace Ombi.Controllers.V2
[HttpGet("movie/upcoming/{currentPosition}/{amountToLoad}")] [HttpGet("movie/upcoming/{currentPosition}/{amountToLoad}")]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType] [ProducesDefaultResponseType]
public async Task<IEnumerable<SearchMovieViewModel>> UpcomingMovies(int currentPosition, int amountToLoad) public Task<IEnumerable<SearchMovieViewModel>> UpcomingMovies(int currentPosition, int amountToLoad)
{ {
return await _movieEngineV2.UpcomingMovies(currentPosition, amountToLoad); return _mediaCacheService.GetOrAddAsync(nameof(UpcomingMovies) + currentPosition + amountToLoad,
() => _movieEngineV2.UpcomingMovies(currentPosition, amountToLoad),
DateTimeOffset.Now.AddHours(12));
} }
/// <summary> /// <summary>
@ -289,9 +316,11 @@ namespace Ombi.Controllers.V2
[HttpGet("tv/popular/{currentPosition}/{amountToLoad}")] [HttpGet("tv/popular/{currentPosition}/{amountToLoad}")]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType] [ProducesDefaultResponseType]
public async Task<IEnumerable<SearchTvShowViewModel>> PopularTv(int currentPosition, int amountToLoad) public Task<IEnumerable<SearchTvShowViewModel>> PopularTv(int currentPosition, int amountToLoad)
{ {
return await _tvEngineV2.Popular(currentPosition, amountToLoad); return _mediaCacheService.GetOrAddAsync(nameof(PopularTv) + currentPosition + amountToLoad,
() => _tvEngineV2.Popular(currentPosition, amountToLoad),
DateTimeOffset.Now.AddHours(12));
} }
/// <summary> /// <summary>
@ -302,9 +331,11 @@ namespace Ombi.Controllers.V2
[HttpGet("tv/anticipated/{currentPosition}/{amountToLoad}")] [HttpGet("tv/anticipated/{currentPosition}/{amountToLoad}")]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType] [ProducesDefaultResponseType]
public async Task<IEnumerable<SearchTvShowViewModel>> AnticipatedTv(int currentPosition, int amountToLoad) public Task<IEnumerable<SearchTvShowViewModel>> AnticipatedTv(int currentPosition, int amountToLoad)
{ {
return await _tvEngineV2.Anticipated(currentPosition, amountToLoad); return _mediaCacheService.GetOrAddAsync(nameof(AnticipatedTv) + currentPosition + amountToLoad,
() => _tvEngineV2.Anticipated(currentPosition, amountToLoad),
DateTimeOffset.Now.AddHours(12));
} }
/// <summary> /// <summary>
@ -316,9 +347,11 @@ namespace Ombi.Controllers.V2
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType] [ProducesDefaultResponseType]
[Obsolete("This method is obsolete, Trakt API no longer supports this")] [Obsolete("This method is obsolete, Trakt API no longer supports this")]
public async Task<IEnumerable<SearchTvShowViewModel>> MostWatched(int currentPosition, int amountToLoad) public Task<IEnumerable<SearchTvShowViewModel>> MostWatched(int currentPosition, int amountToLoad)
{ {
return await _tvEngineV2.Popular(currentPosition, amountToLoad); return _mediaCacheService.GetOrAddAsync(nameof(MostWatched) + currentPosition + amountToLoad,
() => _tvEngineV2.Popular(currentPosition, amountToLoad),
DateTimeOffset.Now.AddHours(12));
} }
@ -330,9 +363,11 @@ namespace Ombi.Controllers.V2
[HttpGet("tv/trending/{currentPosition}/{amountToLoad}")] [HttpGet("tv/trending/{currentPosition}/{amountToLoad}")]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType] [ProducesDefaultResponseType]
public async Task<IEnumerable<SearchTvShowViewModel>> Trending(int currentPosition, int amountToLoad) public Task<IEnumerable<SearchTvShowViewModel>> Trending(int currentPosition, int amountToLoad)
{ {
return await _tvEngineV2.Trending(currentPosition, amountToLoad); return _mediaCacheService.GetOrAddAsync(nameof(Trending) + currentPosition + amountToLoad,
() => _tvEngineV2.Trending(currentPosition, amountToLoad),
DateTimeOffset.Now.AddHours(12));
} }
/// <summary> /// <summary>
@ -386,7 +421,9 @@ namespace Ombi.Controllers.V2
[ProducesDefaultResponseType] [ProducesDefaultResponseType]
public Task<MovieRatings> GetRottenMovieRatings(string name, int year) public Task<MovieRatings> GetRottenMovieRatings(string name, int year)
{ {
return _rottenTomatoesApi.GetMovieRatings(name, year); return _mediaCacheService.GetOrAddAsync(nameof(GetRottenMovieRatings) + name + year,
() => _rottenTomatoesApi.GetMovieRatings(name, year),
DateTimeOffset.Now.AddHours(12));
} }
[HttpGet("ratings/tv/{name}/{year}")] [HttpGet("ratings/tv/{name}/{year}")]
@ -394,7 +431,9 @@ namespace Ombi.Controllers.V2
[ProducesDefaultResponseType] [ProducesDefaultResponseType]
public Task<TvRatings> GetRottenTvRatings(string name, int year) public Task<TvRatings> GetRottenTvRatings(string name, int year)
{ {
return _rottenTomatoesApi.GetTvRatings(name, year); return _mediaCacheService.GetOrAddAsync(nameof(GetRottenTvRatings) + name + year,
() => _rottenTomatoesApi.GetTvRatings(name, year),
DateTimeOffset.Now.AddHours(12));
} }
[HttpGet("stream/movie/{movieDbId}")] [HttpGet("stream/movie/{movieDbId}")]
@ -402,7 +441,9 @@ namespace Ombi.Controllers.V2
[ProducesDefaultResponseType] [ProducesDefaultResponseType]
public Task<IEnumerable<StreamingData>> GetMovieStreams(int movieDBId) public Task<IEnumerable<StreamingData>> GetMovieStreams(int movieDBId)
{ {
return _movieEngineV2.GetStreamInformation(movieDBId, HttpContext.RequestAborted); return _mediaCacheService.GetOrAddAsync(nameof(GetMovieStreams) + movieDBId,
() => _movieEngineV2.GetStreamInformation(movieDBId, HttpContext.RequestAborted),
DateTimeOffset.Now.AddHours(12));
} }
[HttpGet("stream/tv/{movieDbId}")] [HttpGet("stream/tv/{movieDbId}")]
@ -410,7 +451,9 @@ namespace Ombi.Controllers.V2
[ProducesDefaultResponseType] [ProducesDefaultResponseType]
public Task<IEnumerable<StreamingData>> GetTvStreams(int movieDbId) public Task<IEnumerable<StreamingData>> GetTvStreams(int movieDbId)
{ {
return _tvEngineV2.GetStreamInformation(movieDbId, HttpContext.RequestAborted); return _mediaCacheService.GetOrAddAsync(nameof(GetTvStreams) + movieDbId,
() => _tvEngineV2.GetStreamInformation(movieDbId, HttpContext.RequestAborted),
DateTimeOffset.Now.AddHours(12));
} }
} }
} }

2
src/Ombi/Extensions/StartupExtensions.cs
View file

@ -116,7 +116,7 @@ namespace Ombi
{ {
var userid = context.Principal?.Claims?.Where(x => x.Type.Equals("id", StringComparison.InvariantCultureIgnoreCase)).FirstOrDefault()?.Value ?? default; var userid = context.Principal?.Claims?.Where(x => x.Type.Equals("id", StringComparison.InvariantCultureIgnoreCase)).FirstOrDefault()?.Value ?? default;
var cache = context.HttpContext.RequestServices.GetRequiredService<ICacheService>(); var cache = context.HttpContext.RequestServices.GetRequiredService<ICacheService>();
var user = await cache.GetOrAdd(userid + "token", async () => var user = await cache.GetOrAddAsync(userid + "token", async () =>
{ {
var um = context.HttpContext.RequestServices.GetRequiredService<OmbiUserManager>(); var um = context.HttpContext.RequestServices.GetRequiredService<OmbiUserManager>();
return await um.FindByIdAsync(userid); return await um.FindByIdAsync(userid);

1
src/Ombi/Ombi.csproj
View file

@ -56,6 +56,7 @@
<PackageReference Include="AspNetCore.HealthChecks.Sqlite" Version="3.0.0" /> <PackageReference Include="AspNetCore.HealthChecks.Sqlite" Version="3.0.0" />
<PackageReference Include="AutoMapper" Version="10.0.0" /> <PackageReference Include="AutoMapper" Version="10.0.0" />
<PackageReference Include="CommandLineParser" Version="2.6.0" /> <PackageReference Include="CommandLineParser" Version="2.6.0" />
<PackageReference Include="LazyCache.AspNetCore" Version="2.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.1"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

2
src/Ombi/Startup.cs
View file

@ -84,7 +84,7 @@ namespace Ombi
//{ //{
// setup.AddHealthCheckEndpoint("Ombi", "/health"); // setup.AddHealthCheckEndpoint("Ombi", "/health");
//}); //});
services.AddMemoryCache(); services.AddLazyCache();
services.AddHttpClient(); services.AddHttpClient();
services.AddJwtAuthentication(); services.AddJwtAuthentication();