github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-20 13:23:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Conflict resolving and adopting Jamie's new method

Browse source
This commit is contained in:
Anojh 2018-03-23 15:46:30 -07:00
commit 505dc32f69
2 changed files with 106 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Ombi/ClientApp/app/services/image.service.ts
View file

@ -29,11 +29,11 @@ export class ImageService extends ServiceHelpers {
return this.http.get<string>(`${this.url}poster/tv/${tvdbid}`, { headers: this.headers }); return this.http.get<string>(`${this.url}poster/tv/${tvdbid}`, { headers: this.headers });
} }
public getMovieBackground(themoviedb: number): Observable<string> { public getMovieBackground(movieDbId: number): Observable<string> {
return this.http.get<string>(`${this.url}movies/${themoviedb}`, { headers: this.headers }); return this.http.get<string>(`${this.url}background/movie/${movieDbId}`, { headers: this.headers });
} }
public getMoviePoster(themoviedb: number): Observable<string> { public getMoviePoster(movieDbId: number): Observable<string> {
return this.http.get<string>(`${this.url}poster/movies/${themoviedb}`, { headers: this.headers }); return this.http.get<string>(`${this.url}poster/movie/${movieDbId}`, { headers: this.headers });
} }
} }

127
src/Ombi/Controllers/ImagesController.cs
View file

@ -8,6 +8,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Ombi.Api.TheMovieDb;
using Ombi.Config; using Ombi.Config;
using Ombi.Helpers; using Ombi.Helpers;
@ -17,16 +18,16 @@ namespace Ombi.Controllers
[Produces("application/json")] [Produces("application/json")]
public class ImagesController : Controller public class ImagesController : Controller
{ {
public ImagesController(IFanartTvApi api, IApplicationConfigRepository config, public ImagesController(IFanartTvApi fanartTvApi, IApplicationConfigRepository config,
IOptions<LandingPageBackground> options, ICacheService c) IOptions<LandingPageBackground> options, ICacheService c)
{ {
Api = api; FanartTvApi = fanartTvApi;
Config = config; Config = config;
Options = options.Value; Options = options.Value;
_cache = c; _cache = c;
} }
private IFanartTvApi Api { get; } private IFanartTvApi FanartTvApi { get; }
private IApplicationConfigRepository Config { get; } private IApplicationConfigRepository Config { get; }
private LandingPageBackground Options { get; } private LandingPageBackground Options { get; }
private readonly ICacheService _cache; private readonly ICacheService _cache;
@ -36,24 +37,53 @@ namespace Ombi.Controllers
{ {
var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.Get(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1)); 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;
}
if (images.tvbanner != null) if (images.tvbanner != null)
{ {
return images.tvbanner.FirstOrDefault()?.url ?? string.Empty; var enImage = images.tvbanner.Where(x => x.lang == "en").OrderByDescending(x => x.likes).Select(x => x.url).FirstOrDefault();
if (enImage == null)
{
return images.tvbanner.OrderByDescending(x => x.likes).Select(x => x.url).FirstOrDefault();
}
}
if (images.seasonposter != null)
{
return images.seasonposter.FirstOrDefault()?.url ?? string.Empty;
} }
return string.Empty; return string.Empty;
} }
[HttpGet("background/tv/{tvdbid}")] [HttpGet("poster/movie/{movieDbId}")]
public async Task<string> GetTvBackground(int tvdbid) public async Task<string> GetMoviePoster(int movieDbId)
{ {
var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.Get(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1)); 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.GetMovieImages(movieDbId, key.Value);
if (images.showbackground != null)
if (images == null)
{ {
return images.showbackground.FirstOrDefault()?.url ?? string.Empty; return string.Empty;
} }
if (images.movieposter?.Any() ?? false)
{
var enImage = images.movieposter.Where(x => x.lang == "en").OrderByDescending(x => x.likes).Select(x => x.url).FirstOrDefault();
if (enImage == null)
{
return images.movieposter.OrderByDescending(x => x.likes).Select(x => x.url).FirstOrDefault();
}
return enImage;
}
if (images.moviethumb?.Any() ?? false)
{
return images.moviethumb.OrderBy(x => x.likes).Select(x => x.url).FirstOrDefault();
}
return string.Empty; return string.Empty;
} }
@ -62,37 +92,78 @@ namespace Ombi.Controllers
{ {
var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.Get(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1)); 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.tvposter != null)
if (images == null)
{ {
return images.tvposter.FirstOrDefault()?.url ?? string.Empty; return string.Empty;
} }
if (images.tvposter?.Any() ?? false)
{
var enImage = images.tvposter.Where(x => x.lang == "en").OrderByDescending(x => x.likes).Select(x => x.url).FirstOrDefault();
if (enImage == null)
{
return images.tvposter.OrderByDescending(x => x.likes).Select(x => x.url).FirstOrDefault();
}
return enImage;
}
if (images.tvthumb?.Any() ?? false)
{
return images.tvthumb.OrderBy(x => x.likes).Select(x => x.url).FirstOrDefault();
}
return string.Empty; return string.Empty;
} }
[HttpGet("movies/{themoviedb}")] [HttpGet("background/movie/{movieDbId}")]
public async Task<string> GetMovieBackground(int themoviedb) public async Task<string> GetMovieBackground(int movieDbId)
{ {
var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.Get(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1)); var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.Get(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1));
var images = await Api.GetMovieImages(themoviedb, key.Value); var images = await FanartTvApi.GetMovieImages(movieDbId, key.Value);
if (images.moviebackground != null)
if (images == null)
{ {
return images.moviebackground.FirstOrDefault()?.url ?? string.Empty; return string.Empty;
} }
if (images.moviebackground?.Any() ?? false)
{
var enImage = images.moviebackground.Where(x => x.lang == "en").OrderByDescending(x => x.likes).Select(x => x.url).FirstOrDefault();
if (enImage == null)
{
return images.moviebackground.OrderByDescending(x => x.likes).Select(x => x.url).FirstOrDefault();
}
return enImage;
}
return string.Empty; return string.Empty;
} }
[HttpGet("poster/movies/{themoviedb}")] [HttpGet("background/tv/{tvdbid}")]
public async Task<string> GetMoviePoster(int themoviedb) public async Task<string> GetTvBackground(int tvdbid)
{ {
var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.Get(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1)); var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.Get(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1));
var images = await Api.GetMovieImages(themoviedb, key.Value); var images = await FanartTvApi.GetTvImages(tvdbid, key.Value);
if (images.movieposter != null)
if (images == null)
{ {
return images.movieposter.FirstOrDefault()?.url ?? string.Empty; return string.Empty;
} }
if (images.showbackground?.Any() ?? false)
{
var enImage = images.showbackground.Where(x => x.lang == "en").OrderByDescending(x => x.likes).Select(x => x.url).FirstOrDefault();
if (enImage == null)
{
return images.showbackground.OrderByDescending(x => x.likes).Select(x => x.url).FirstOrDefault();
}
return enImage;
}
return string.Empty; return string.Empty;
} }
@ -111,23 +182,23 @@ namespace Ombi.Controllers
if (moviesArray.Any()) if (moviesArray.Any())
{ {
var item = rand.Next(moviesArray.Length); var item = rand.Next(moviesArray.Length);
var result = await Api.GetMovieImages(moviesArray[item], key.Value); var result = await FanartTvApi.GetMovieImages(moviesArray[item], key.Value);
while (!result.moviebackground.Any()) while (!result.moviebackground.Any())
{ {
result = await Api.GetMovieImages(moviesArray[item], key.Value); result = await FanartTvApi.GetMovieImages(moviesArray[item], key.Value);
} }
movieUrl = result.moviebackground[0].url; movieUrl = result.moviebackground[0].url;
} }
if(tvArray.Any()) if (tvArray.Any())
{ {
var item = rand.Next(tvArray.Length); 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()) 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; tvUrl = result.showbackground[0].url;