From c3810def36f6ccc0d43b3fcbf492a390e7e487ee Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 18 Feb 2021 22:55:39 +0000 Subject: [PATCH] Fixed build and added some nice little things --- src/Ombi/ClientApp/angular.json | 5 +++- src/Ombi/ClientApp/src/index.html | 25 ++++++++++++++++--- .../V1/External/TesterController.cs | 2 +- src/Ombi/Controllers/V1/ImagesController.cs | 4 +-- src/Ombi/appsettings.json | 16 ++++++++++++ 5 files changed, 44 insertions(+), 8 deletions(-) diff --git a/src/Ombi/ClientApp/angular.json b/src/Ombi/ClientApp/angular.json index 2e3ff44e5..41030a25a 100644 --- a/src/Ombi/ClientApp/angular.json +++ b/src/Ombi/ClientApp/angular.json @@ -124,5 +124,8 @@ } } }, - "defaultProject": "ombi" + "defaultProject": "ombi", + "cli": { + "analytics": false + } } \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/index.html b/src/Ombi/ClientApp/src/index.html index 5659be377..3c0ac4956 100644 --- a/src/Ombi/ClientApp/src/index.html +++ b/src/Ombi/ClientApp/src/index.html @@ -35,6 +35,11 @@ console.log(window["baseHref"]); + @@ -61,8 +66,20 @@ diff --git a/src/Ombi/Controllers/V1/External/TesterController.cs b/src/Ombi/Controllers/V1/External/TesterController.cs index 7b9540a55..df6491578 100644 --- a/src/Ombi/Controllers/V1/External/TesterController.cs +++ b/src/Ombi/Controllers/V1/External/TesterController.cs @@ -513,7 +513,7 @@ namespace Ombi.Controllers.V1.External var status = await LidarrApi.Status(settings.ApiKey, settings.FullUri); return new TesterResultModel { - IsValid = status?.urlBase == settings.SubDir || string.IsNullOrEmpty(result.urlBase) && string.IsNullOrEmpty(settings.SubDir), + IsValid = status?.urlBase == settings.SubDir || string.IsNullOrEmpty(status.urlBase) && string.IsNullOrEmpty(settings.SubDir), ExpectedSubDir = status?.urlBase }; } diff --git a/src/Ombi/Controllers/V1/ImagesController.cs b/src/Ombi/Controllers/V1/ImagesController.cs index 249a6e9bd..c119efe70 100644 --- a/src/Ombi/Controllers/V1/ImagesController.cs +++ b/src/Ombi/Controllers/V1/ImagesController.cs @@ -203,7 +203,7 @@ namespace Ombi.Controllers.V1 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)); - while (!result.moviebackground.Any()) + while (!result.moviebackground?.Any() ?? true) { 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)); @@ -220,7 +220,7 @@ namespace Ombi.Controllers.V1 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)); - while (!result.showbackground.Any()) + while (!result.showbackground?.Any() ?? true) { 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)); diff --git a/src/Ombi/appsettings.json b/src/Ombi/appsettings.json index 9dcf5523a..8f1f3848d 100644 --- a/src/Ombi/appsettings.json +++ b/src/Ombi/appsettings.json @@ -25,24 +25,40 @@ 399106, 351286, 348350, + 539885, + 508442, + 664767, 260513, 372058, 299536, + 581389, + 577922, 383498, 330457, + 755812, + 495764, + 14160, 429617, 475557, 420818, + 775996, 283995 ], "TvShows": [ 121361, + 361753, + 295685, 74205, + 362392, 81189, 79126, + 332858, + 73762, 79349, + 349309, 275274, 305288, + 260449, 296762, 280619, 305074,