From f332f8d7cd4379504534fe03a509465e564d8e1e Mon Sep 17 00:00:00 2001 From: Qstick Date: Wed, 8 Jan 2020 22:18:26 -0500 Subject: [PATCH] New: Dont Use Profile Language for Metadata Pull --- src/NzbDrone.Api/Movies/MovieLookupModule.cs | 2 +- .../SkyHook/SkyHookProxyFixture.cs | 2 +- .../MovieTests/RefreshMovieServiceFixture.cs | 6 +++--- .../MetadataSource/IProvideMovieInfo.cs | 5 ++--- .../MetadataSource/SkyHook/SkyHookProxy.cs | 18 ++++-------------- .../Movies/RefreshMovieService.cs | 7 ++----- src/Radarr.Api.V3/Movies/MovieLookupModule.cs | 2 +- 7 files changed, 14 insertions(+), 28 deletions(-) diff --git a/src/NzbDrone.Api/Movies/MovieLookupModule.cs b/src/NzbDrone.Api/Movies/MovieLookupModule.cs index d60b5bee5..1b2fc53a4 100644 --- a/src/NzbDrone.Api/Movies/MovieLookupModule.cs +++ b/src/NzbDrone.Api/Movies/MovieLookupModule.cs @@ -28,7 +28,7 @@ namespace NzbDrone.Api.Movies int tmdbId = -1; if (int.TryParse(Request.Query.tmdbId, out tmdbId)) { - var result = _movieInfo.GetMovieInfo(tmdbId, null, true).Item1; + var result = _movieInfo.GetMovieInfo(tmdbId, true).Item1; return result.ToResource(); } diff --git a/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxyFixture.cs b/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxyFixture.cs index 724623d13..deb55d036 100644 --- a/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxyFixture.cs +++ b/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxyFixture.cs @@ -24,7 +24,7 @@ namespace NzbDrone.Core.Test.MetadataSource.SkyHook [TestCase(70981, "Prometheus")] public void should_be_able_to_get_movie_detail(int tmdbId, string title) { - var details = Subject.GetMovieInfo(tmdbId, null, false).Item1; + var details = Subject.GetMovieInfo(tmdbId, false).Item1; ValidateMovie(details); diff --git a/src/NzbDrone.Core.Test/MovieTests/RefreshMovieServiceFixture.cs b/src/NzbDrone.Core.Test/MovieTests/RefreshMovieServiceFixture.cs index adcd01c3f..696c55a22 100644 --- a/src/NzbDrone.Core.Test/MovieTests/RefreshMovieServiceFixture.cs +++ b/src/NzbDrone.Core.Test/MovieTests/RefreshMovieServiceFixture.cs @@ -33,14 +33,14 @@ namespace NzbDrone.Core.Test.MovieTests .Returns(_movie); Mocker.GetMock() - .Setup(s => s.GetMovieInfo(It.IsAny(), It.IsAny(), It.IsAny())) - .Callback((i, p, b) => { throw new MovieNotFoundException(i); }); + .Setup(s => s.GetMovieInfo(It.IsAny(), It.IsAny())) + .Callback((i, b) => { throw new MovieNotFoundException(i); }); } private void GivenNewMovieInfo(Movie movie) { Mocker.GetMock() - .Setup(s => s.GetMovieInfo(_movie.TmdbId, It.IsAny(), It.IsAny())) + .Setup(s => s.GetMovieInfo(_movie.TmdbId, It.IsAny())) .Returns(new Tuple>(movie, new List())); } diff --git a/src/NzbDrone.Core/MetadataSource/IProvideMovieInfo.cs b/src/NzbDrone.Core/MetadataSource/IProvideMovieInfo.cs index 8ef0dcaa4..275a8e51b 100644 --- a/src/NzbDrone.Core/MetadataSource/IProvideMovieInfo.cs +++ b/src/NzbDrone.Core/MetadataSource/IProvideMovieInfo.cs @@ -1,15 +1,14 @@ -using System; +using System; using System.Collections.Generic; using NzbDrone.Core.Movies; using NzbDrone.Core.Movies.Credits; -using NzbDrone.Core.Profiles; namespace NzbDrone.Core.MetadataSource { public interface IProvideMovieInfo { Movie GetMovieInfo(string imdbId); - Tuple> GetMovieInfo(int tmdbId, Profile profile, bool hasPreDBEntry); + Tuple> GetMovieInfo(int tmdbId, bool hasPreDBEntry); HashSet GetChangedMovies(DateTime startTime); } } diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs index cb25c5dd8..a25bf65d7 100644 --- a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs +++ b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs @@ -20,7 +20,6 @@ using NzbDrone.Core.Movies.AlternativeTitles; using NzbDrone.Core.Movies.Credits; using NzbDrone.Core.NetImport.ImportExclusions; using NzbDrone.Core.Parser; -using NzbDrone.Core.Profiles; namespace NzbDrone.Core.MetadataSource.SkyHook { @@ -79,9 +78,9 @@ namespace NzbDrone.Core.MetadataSource.SkyHook return new HashSet(response.Resource.results.Select(c => c.id)); } - public Tuple> GetMovieInfo(int tmdbId, Profile profile, bool hasPreDBEntry) + public Tuple> GetMovieInfo(int tmdbId, bool hasPreDBEntry) { - var langCode = profile != null ? IsoLanguages.Get(profile.Language)?.TwoLetterCode ?? "en" : "en"; + var langCode = "en"; var request = _movieBuilder.Create() .SetSegment("api", "3") @@ -143,15 +142,6 @@ namespace NzbDrone.Core.MetadataSource.SkyHook var movie = new Movie(); var altTitles = new List(); - if (langCode != "en") - { - var iso = IsoLanguages.Find(resource.original_language); - if (iso != null) - { - altTitles.Add(new AlternativeTitle(resource.original_title, SourceType.TMDB, tmdbId, iso.Language)); - } - } - foreach (var alternativeTitle in resource.alternative_titles.titles) { if (alternativeTitle.iso_3166_1.ToLower() == langCode) @@ -498,7 +488,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook try { - return new List { GetMovieInfo(tmdbid, null, false).Item1 }; + return new List { GetMovieInfo(tmdbid, false).Item1 }; } catch (MovieNotFoundException) { @@ -735,7 +725,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook Movie newMovie = movie; if (movie.TmdbId > 0) { - newMovie = GetMovieInfo(movie.TmdbId, null, false).Item1; + newMovie = GetMovieInfo(movie.TmdbId, false).Item1; } else if (movie.ImdbId.IsNotNullOrWhiteSpace()) { diff --git a/src/NzbDrone.Core/Movies/RefreshMovieService.cs b/src/NzbDrone.Core/Movies/RefreshMovieService.cs index e36e19de3..608e6e2da 100644 --- a/src/NzbDrone.Core/Movies/RefreshMovieService.cs +++ b/src/NzbDrone.Core/Movies/RefreshMovieService.cs @@ -26,7 +26,6 @@ namespace NzbDrone.Core.Movies private readonly IAlternativeTitleService _titleService; private readonly ICreditService _creditService; private readonly IEventAggregator _eventAggregator; - private readonly IManageCommandQueue _commandQueueManager; private readonly IDiskScanService _diskScanService; private readonly ICheckIfMovieShouldBeRefreshed _checkIfMovieShouldBeRefreshed; private readonly IConfigService _configService; @@ -42,7 +41,6 @@ namespace NzbDrone.Core.Movies IDiskScanService diskScanService, IRadarrAPIClient apiClient, ICheckIfMovieShouldBeRefreshed checkIfMovieShouldBeRefreshed, - IManageCommandQueue commandQueue, IConfigService configService, Logger logger) { @@ -52,7 +50,6 @@ namespace NzbDrone.Core.Movies _creditService = creditService; _eventAggregator = eventAggregator; _apiClient = apiClient; - _commandQueueManager = commandQueue; _diskScanService = diskScanService; _checkIfMovieShouldBeRefreshed = checkIfMovieShouldBeRefreshed; _configService = configService; @@ -68,7 +65,7 @@ namespace NzbDrone.Core.Movies try { - var tuple = _movieInfo.GetMovieInfo(movie.TmdbId, movie.Profile, movie.HasPreDBEntry); + var tuple = _movieInfo.GetMovieInfo(movie.TmdbId, movie.HasPreDBEntry); movieInfo = tuple.Item1; credits = tuple.Item2; } @@ -87,7 +84,7 @@ namespace NzbDrone.Core.Movies if (movie.TmdbId != movieInfo.TmdbId) { - _logger.Warn("Movie '{0}' (TmdbId {1}) was replaced with '{2}' (TmdbId {3}), because the original was a duplicate.", movie.Title, movie.TmdbId, movieInfo.Title, movieInfo.TmdbId); + _logger.Warn("Movie '{0}' (Tmdbid {1}) was replaced with '{2}' (Tmdbid {3}), because the original was a duplicate.", movie.Title, movie.TmdbId, movieInfo.Title, movieInfo.TmdbId); movie.TmdbId = movieInfo.TmdbId; } diff --git a/src/Radarr.Api.V3/Movies/MovieLookupModule.cs b/src/Radarr.Api.V3/Movies/MovieLookupModule.cs index 6dca82736..b7522f6a5 100644 --- a/src/Radarr.Api.V3/Movies/MovieLookupModule.cs +++ b/src/Radarr.Api.V3/Movies/MovieLookupModule.cs @@ -32,7 +32,7 @@ namespace Radarr.Api.V3.Movies int tmdbId = -1; if (int.TryParse(Request.Query.tmdbId, out tmdbId)) { - var result = _movieInfo.GetMovieInfo(tmdbId, null, true).Item1; + var result = _movieInfo.GetMovieInfo(tmdbId, true).Item1; return result.ToResource(); }