move logic to controller

edwinbernadus · Feb 29, 2024 · a1816c6 · a1816c6
1 parent 123d90c
commit a1816c6
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 10 deletions.
diff --git a/src/NzbDrone.Core/MetadataSource/ISearchForNewMovie.cs b/src/NzbDrone.Core/MetadataSource/ISearchForNewMovie.cs
@@ -8,5 +8,7 @@ public interface ISearchForNewMovie
         List<Movie> SearchForNewMovie(string title);
 
         MovieMetadata MapMovieToTmdbMovie(MovieMetadata movie);
+
+        MovieMetadata GetMovieByImdbId(string imdbId);
     }
 }
diff --git a/src/Radarr.Api.V3/Movies/MovieLookupController.cs b/src/Radarr.Api.V3/Movies/MovieLookupController.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.Mvc;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Exceptions;
 using NzbDrone.Core.Languages;
 using NzbDrone.Core.MediaCover;
 using NzbDrone.Core.MetadataSource;
@@ -24,11 +26,11 @@ public class MovieLookupController : RestController<MovieResource>
         private readonly IConfigService _configService;
 
         public MovieLookupController(ISearchForNewMovie searchProxy,
-                                 IProvideMovieInfo movieInfo,
-                                 IBuildFileNames fileNameBuilder,
-                                 INamingConfigService namingService,
-                                 IMapCoversToLocal coverMapper,
-                                 IConfigService configService)
+            IProvideMovieInfo movieInfo,
+            IBuildFileNames fileNameBuilder,
+            INamingConfigService namingService,
+            IMapCoversToLocal coverMapper,
+            IConfigService configService)
         {
             _movieInfo = movieInfo;
             _searchProxy = searchProxy;
@@ -49,7 +51,9 @@ public object SearchByTmdbId(int tmdbId)
         {
             var availDelay = _configService.AvailabilityDelay;
             var result = new Movie { MovieMetadata = _movieInfo.GetMovieInfo(tmdbId).Item1 };
-            var translation = result.MovieMetadata.Value.Translations.FirstOrDefault(t => t.Language == (Language)_configService.MovieInfoLanguage);
+            var translation =
+                result.MovieMetadata.Value.Translations.FirstOrDefault(t =>
+                    t.Language == (Language)_configService.MovieInfoLanguage);
             return result.ToResource(availDelay, translation);
         }
 
@@ -59,18 +63,40 @@ public object SearchByImdbId(string imdbId)
             var result = new Movie { MovieMetadata = _movieInfo.GetMovieByImdbId(imdbId) };
 
             var availDelay = _configService.AvailabilityDelay;
-            var translation = result.MovieMetadata.Value.Translations.FirstOrDefault(t => t.Language == (Language)_configService.MovieInfoLanguage);
+            var translation =
+                result.MovieMetadata.Value.Translations.FirstOrDefault(t =>
+                    t.Language == (Language)_configService.MovieInfoLanguage);
             return result.ToResource(availDelay, translation);
         }
 
         [HttpGet]
         public object Search([FromQuery] string term)
         {
             var searchResults = _searchProxy.SearchForNewMovie(term);
-
+            searchResults = PopulateFromImdbIfEmpty(searchResults, term);
             return MapToResource(searchResults);
         }
 
+        private List<Movie> PopulateFromImdbIfEmpty(List<Movie> searchResults, string imdbid)
+        {
+            var regex = new Regex(@"^tt\d{7,8}$");
+            if (searchResults.Count == 0 && imdbid.StartsWith("tt") && regex.IsMatch(imdbid))
+            {
+                try
+                {
+                    var movieLookup = _searchProxy.GetMovieByImdbId(imdbid);
+                    var movies = new List<Movie> { new Movie { MovieMetadata = movieLookup } };
+                    return movies;
+                }
+                catch (MovieNotFoundException)
+                {
+                    return new List<Movie>();
+                }
+            }
+
+            return new List<Movie>();
+        }
+
         private IEnumerable<MovieResource> MapToResource(IEnumerable<Movie> movies)
         {
             var movieInfoLanguage = (Language)_configService.MovieInfoLanguage;
@@ -79,12 +105,14 @@ private IEnumerable<MovieResource> MapToResource(IEnumerable<Movie> movies)
 
             foreach (var currentMovie in movies)
             {
-                var translation = currentMovie.MovieMetadata.Value.Translations.FirstOrDefault(t => t.Language == movieInfoLanguage);
+                var translation =
+                    currentMovie.MovieMetadata.Value.Translations.FirstOrDefault(t => t.Language == movieInfoLanguage);
                 var resource = currentMovie.ToResource(availDelay, translation);
 
                 _coverMapper.ConvertToLocalUrls(resource.Id, resource.Images);
 
-                var poster = currentMovie.MovieMetadata.Value.Images.FirstOrDefault(c => c.CoverType == MediaCoverTypes.Poster);
+                var poster =
+                    currentMovie.MovieMetadata.Value.Images.FirstOrDefault(c => c.CoverType == MediaCoverTypes.Poster);
                 if (poster != null)
                 {
                     resource.RemotePoster = poster.RemoteUrl;