From c2e55e60fd49e14f407290677ce3595b92e6b562 Mon Sep 17 00:00:00 2001 From: Ivan Sanz Carasa Date: Wed, 24 Apr 2024 19:17:17 +0200 Subject: [PATCH 1/3] New: add EnglishTitle to the /movie API endpoint --- src/Radarr.Api.V3/Movies/MovieResource.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Radarr.Api.V3/Movies/MovieResource.cs b/src/Radarr.Api.V3/Movies/MovieResource.cs index 44e0bf03f..b32f24fb6 100644 --- a/src/Radarr.Api.V3/Movies/MovieResource.cs +++ b/src/Radarr.Api.V3/Movies/MovieResource.cs @@ -28,6 +28,7 @@ namespace Radarr.Api.V3.Movies // View Only public string Title { get; set; } + public string EnglishTitle { get; set; } public string OriginalTitle { get; set; } public Language OriginalLanguage { get; set; } public List AlternateTitles { get; set; } @@ -103,6 +104,7 @@ namespace Radarr.Api.V3.Movies Id = model.Id, TmdbId = model.TmdbId, Title = translatedTitle, + EnglishTitle = model.MovieMetadata.Value.Title, OriginalTitle = model.MovieMetadata.Value.OriginalTitle, OriginalLanguage = model.MovieMetadata.Value.OriginalLanguage, SortTitle = translatedTitle.NormalizeTitle(), From 1b7211214fa0da7e31589dafab3187a2b970885c Mon Sep 17 00:00:00 2001 From: Ivan Sanz Carasa Date: Wed, 24 Apr 2024 19:38:22 +0200 Subject: [PATCH 2/3] use QSP `language` instead --- src/Radarr.Api.V3/Movies/MovieController.cs | 10 ++++++---- src/Radarr.Api.V3/Movies/MovieResource.cs | 2 -- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Radarr.Api.V3/Movies/MovieController.cs b/src/Radarr.Api.V3/Movies/MovieController.cs index 165182794..5cbad0081 100644 --- a/src/Radarr.Api.V3/Movies/MovieController.cs +++ b/src/Radarr.Api.V3/Movies/MovieController.cs @@ -112,7 +112,7 @@ namespace Radarr.Api.V3.Movies } [HttpGet] - public List AllMovie(int? tmdbId, bool excludeLocalCovers = false) + public List AllMovie(int? tmdbId, string language, bool excludeLocalCovers = false) { var moviesResources = new List(); @@ -130,13 +130,15 @@ namespace Radarr.Api.V3.Movies else { var movieStats = _movieStatisticsService.MovieStatistics(); - var configLanguage = (Language)_configService.MovieInfoLanguage; + var translationLanguage = language != null + ? Language.All.Single(l => l.Name.Equals(language, StringComparison.InvariantCultureIgnoreCase)) + : (Language)_configService.MovieInfoLanguage; var availDelay = _configService.AvailabilityDelay; var movieTask = Task.Run(() => _moviesService.GetAllMovies()); var translations = _movieTranslationService - .GetAllTranslationsForLanguage(configLanguage); + .GetAllTranslationsForLanguage(translationLanguage); var tdict = translations.ToDictionary(x => x.MovieMetadataId); var sdict = movieStats.ToDictionary(x => x.MovieId); @@ -152,7 +154,7 @@ namespace Radarr.Api.V3.Movies foreach (var movie in movies) { - var translation = GetTranslationFromDict(tdict, movie.MovieMetadata, configLanguage); + var translation = GetTranslationFromDict(tdict, movie.MovieMetadata, translationLanguage); moviesResources.Add(movie.ToResource(availDelay, translation, _qualityUpgradableSpecification)); } diff --git a/src/Radarr.Api.V3/Movies/MovieResource.cs b/src/Radarr.Api.V3/Movies/MovieResource.cs index b32f24fb6..44e0bf03f 100644 --- a/src/Radarr.Api.V3/Movies/MovieResource.cs +++ b/src/Radarr.Api.V3/Movies/MovieResource.cs @@ -28,7 +28,6 @@ namespace Radarr.Api.V3.Movies // View Only public string Title { get; set; } - public string EnglishTitle { get; set; } public string OriginalTitle { get; set; } public Language OriginalLanguage { get; set; } public List AlternateTitles { get; set; } @@ -104,7 +103,6 @@ namespace Radarr.Api.V3.Movies Id = model.Id, TmdbId = model.TmdbId, Title = translatedTitle, - EnglishTitle = model.MovieMetadata.Value.Title, OriginalTitle = model.MovieMetadata.Value.OriginalTitle, OriginalLanguage = model.MovieMetadata.Value.OriginalLanguage, SortTitle = translatedTitle.NormalizeTitle(), From 0bccddbf7d637d8f867748a3a15d461e5da2586d Mon Sep 17 00:00:00 2001 From: Ivan Sanz Carasa Date: Sat, 27 Apr 2024 12:41:49 +0200 Subject: [PATCH 3/3] Exclude meta languages --- src/Radarr.Api.V3/Movies/MovieController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Radarr.Api.V3/Movies/MovieController.cs b/src/Radarr.Api.V3/Movies/MovieController.cs index 5cbad0081..2a8583351 100644 --- a/src/Radarr.Api.V3/Movies/MovieController.cs +++ b/src/Radarr.Api.V3/Movies/MovieController.cs @@ -131,7 +131,7 @@ namespace Radarr.Api.V3.Movies { var movieStats = _movieStatisticsService.MovieStatistics(); var translationLanguage = language != null - ? Language.All.Single(l => l.Name.Equals(language, StringComparison.InvariantCultureIgnoreCase)) + ? Language.All.Single(l => l.Id > 0 && l.Name.Equals(language, StringComparison.InvariantCultureIgnoreCase)) : (Language)_configService.MovieInfoLanguage; var availDelay = _configService.AvailabilityDelay;