From b4bb8875d3bc90d51a1a7933bf0c48820a565e7f Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Sat, 8 Apr 2017 13:50:18 +0200 Subject: [PATCH] Catching HTTP Errors when adding movies from a list. --- .../MetadataSource/SkyHook/SkyHookProxy.cs | 74 ++++++++++--------- 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs index 2dd45a69b..02736d214 100644 --- a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs +++ b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs @@ -729,39 +729,47 @@ namespace NzbDrone.Core.MetadataSource.SkyHook public Movie MapMovieToTmdbMovie(Movie movie) { - Movie newMovie = movie; - if (movie.TmdbId > 0) - { - newMovie = GetMovieInfo(movie.TmdbId); - } - else if (movie.ImdbId.IsNotNullOrWhiteSpace()) - { - newMovie = GetMovieInfo(movie.ImdbId); - } - else - { - var yearStr = ""; - if (movie.Year > 1900) - { - yearStr = $" {movie.Year}"; - } - newMovie = SearchForNewMovie(movie.Title + yearStr).FirstOrDefault(); - } - - if (newMovie == null) - { - _logger.Warn("Couldn't map movie {0} to a movie on The Movie DB. It will not be added :(", movie.Title); - return null; - } - - newMovie.Path = movie.Path; - newMovie.RootFolderPath = movie.RootFolderPath; - newMovie.ProfileId = movie.ProfileId; - newMovie.Monitored = movie.Monitored; - newMovie.MovieFile = movie.MovieFile; - newMovie.MinimumAvailability = movie.MinimumAvailability; - - return newMovie; + try + { + Movie newMovie = movie; + if (movie.TmdbId > 0) + { + newMovie = GetMovieInfo(movie.TmdbId); + } + else if (movie.ImdbId.IsNotNullOrWhiteSpace()) + { + newMovie = GetMovieInfo(movie.ImdbId); + } + else + { + var yearStr = ""; + if (movie.Year > 1900) + { + yearStr = $" {movie.Year}"; + } + newMovie = SearchForNewMovie(movie.Title + yearStr).FirstOrDefault(); + } + + if (newMovie == null) + { + _logger.Warn("Couldn't map movie {0} to a movie on The Movie DB. It will not be added :(", movie.Title); + return null; + } + + newMovie.Path = movie.Path; + newMovie.RootFolderPath = movie.RootFolderPath; + newMovie.ProfileId = movie.ProfileId; + newMovie.Monitored = movie.Monitored; + newMovie.MovieFile = movie.MovieFile; + newMovie.MinimumAvailability = movie.MinimumAvailability; + + return newMovie; + } + catch (Exception ex) + { + _logger.Warn(ex, "Couldn't map movie {0} to a movie on The Movie DB. It will not be added :(", movie.Title); + return null; + } } } }