|
|
|
@ -8,6 +8,7 @@ using System.Threading.Tasks;
|
|
|
|
|
using Microsoft.AspNetCore.Authorization;
|
|
|
|
|
using Microsoft.Extensions.Caching.Memory;
|
|
|
|
|
using Microsoft.Extensions.Options;
|
|
|
|
|
using Ombi.Api.TheMovieDb;
|
|
|
|
|
using Ombi.Config;
|
|
|
|
|
using Ombi.Helpers;
|
|
|
|
|
|
|
|
|
@ -17,16 +18,16 @@ namespace Ombi.Controllers
|
|
|
|
|
[Produces("application/json")]
|
|
|
|
|
public class ImagesController : Controller
|
|
|
|
|
{
|
|
|
|
|
public ImagesController(IFanartTvApi api, IApplicationConfigRepository config,
|
|
|
|
|
public ImagesController(IFanartTvApi fanartTvApi, IApplicationConfigRepository config,
|
|
|
|
|
IOptions<LandingPageBackground> options, ICacheService c)
|
|
|
|
|
{
|
|
|
|
|
Api = api;
|
|
|
|
|
FanartTvApi = fanartTvApi;
|
|
|
|
|
Config = config;
|
|
|
|
|
Options = options.Value;
|
|
|
|
|
_cache = c;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private IFanartTvApi Api { get; }
|
|
|
|
|
private IFanartTvApi FanartTvApi { get; }
|
|
|
|
|
private IApplicationConfigRepository Config { get; }
|
|
|
|
|
private LandingPageBackground Options { get; }
|
|
|
|
|
private readonly ICacheService _cache;
|
|
|
|
@ -36,7 +37,7 @@ namespace Ombi.Controllers
|
|
|
|
|
{
|
|
|
|
|
var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.Get(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1));
|
|
|
|
|
|
|
|
|
|
var images = await Api.GetTvImages(tvdbid, key.Value);
|
|
|
|
|
var images = await FanartTvApi.GetTvImages(tvdbid, key.Value);
|
|
|
|
|
if (images == null)
|
|
|
|
|
{
|
|
|
|
|
return string.Empty;
|
|
|
|
@ -53,11 +54,11 @@ namespace Ombi.Controllers
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[HttpGet("poster/movie/{movieDbId}")]
|
|
|
|
|
public async Task<string> GetMoviePoster(int movieDbId)
|
|
|
|
|
public async Task<string> GetMoviePoster(string movieDbId)
|
|
|
|
|
{
|
|
|
|
|
var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.Get(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1));
|
|
|
|
|
|
|
|
|
|
var images = await Api.GetMovieImages(movieDbId, key.Value);
|
|
|
|
|
var images = await FanartTvApi.GetMovieImages(movieDbId, key.Value);
|
|
|
|
|
|
|
|
|
|
if (images == null)
|
|
|
|
|
{
|
|
|
|
@ -82,7 +83,7 @@ namespace Ombi.Controllers
|
|
|
|
|
{
|
|
|
|
|
var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.Get(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1));
|
|
|
|
|
|
|
|
|
|
var images = await Api.GetTvImages(tvdbid, key.Value);
|
|
|
|
|
var images = await FanartTvApi.GetTvImages(tvdbid, key.Value);
|
|
|
|
|
|
|
|
|
|
if (images == null)
|
|
|
|
|
{
|
|
|
|
@ -117,11 +118,11 @@ namespace Ombi.Controllers
|
|
|
|
|
if (moviesArray.Any())
|
|
|
|
|
{
|
|
|
|
|
var item = rand.Next(moviesArray.Length);
|
|
|
|
|
var result = await Api.GetMovieImages(moviesArray[item], key.Value);
|
|
|
|
|
var result = await FanartTvApi.GetMovieImages(moviesArray[item].ToString(), key.Value);
|
|
|
|
|
|
|
|
|
|
while (!result.moviebackground.Any())
|
|
|
|
|
{
|
|
|
|
|
result = await Api.GetMovieImages(moviesArray[item], key.Value);
|
|
|
|
|
result = await FanartTvApi.GetMovieImages(moviesArray[item].ToString(), key.Value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
movieUrl = result.moviebackground[0].url;
|
|
|
|
@ -129,11 +130,11 @@ namespace Ombi.Controllers
|
|
|
|
|
if(tvArray.Any())
|
|
|
|
|
{
|
|
|
|
|
var item = rand.Next(tvArray.Length);
|
|
|
|
|
var result = await Api.GetTvImages(tvArray[item], key.Value);
|
|
|
|
|
var result = await FanartTvApi.GetTvImages(tvArray[item], key.Value);
|
|
|
|
|
|
|
|
|
|
while (!result.showbackground.Any())
|
|
|
|
|
{
|
|
|
|
|
result = await Api.GetTvImages(tvArray[item], key.Value);
|
|
|
|
|
result = await FanartTvApi.GetTvImages(tvArray[item], key.Value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tvUrl = result.showbackground[0].url;
|
|
|
|
|