diff --git a/src/NzbDrone.Core/Movies/MovieRepository.cs b/src/NzbDrone.Core/Movies/MovieRepository.cs index 247bd9e25..5a904f2df 100644 --- a/src/NzbDrone.Core/Movies/MovieRepository.cs +++ b/src/NzbDrone.Core/Movies/MovieRepository.cs @@ -23,7 +23,6 @@ namespace NzbDrone.Core.Movies PagingSpec MoviesWithoutFiles(PagingSpec pagingSpec); List GetMoviesByFileId(int fileId); List GetMoviesByCollectionTmdbId(int collectionId); - void SetFileId(int fileId, int movieId); PagingSpec MoviesWhereCutoffUnmet(PagingSpec pagingSpec, List qualitiesBelowCutoff); Movie FindByPath(string path); Dictionary AllMoviePaths(); @@ -226,11 +225,6 @@ namespace NzbDrone.Core.Movies return Query(x => x.MovieMetadata.Value.CollectionTmdbId == collectionId); } - public void SetFileId(int fileId, int movieId) - { - SetFields(new Movie { Id = movieId, MovieFileId = fileId }, movie => movie.MovieFileId); - } - public List MoviesBetweenDates(DateTime start, DateTime end, bool includeUnmonitored) { var builder = Builder() diff --git a/src/NzbDrone.Core/Movies/MovieService.cs b/src/NzbDrone.Core/Movies/MovieService.cs index b322f265e..c7007ff6e 100644 --- a/src/NzbDrone.Core/Movies/MovieService.cs +++ b/src/NzbDrone.Core/Movies/MovieService.cs @@ -23,7 +23,6 @@ namespace NzbDrone.Core.Movies List AddMovies(List newMovies); Movie FindByImdbId(string imdbid); Movie FindByTmdbId(int tmdbid); - List FindByTmdbId(List tmdbids); Movie FindByTitle(string title); Movie FindByTitle(string title, int year); Movie FindByTitle(List titles, int? year, List otherTitles, List candidates); @@ -36,14 +35,12 @@ namespace NzbDrone.Core.Movies List GetMoviesByCollectionTmdbId(int collectionId); List GetMoviesBetweenDates(DateTime start, DateTime end, bool includeUnmonitored); PagingSpec MoviesWithoutFiles(PagingSpec pagingSpec); - void SetFileId(Movie movie, MovieFile movieFile); void DeleteMovie(int movieId, bool deleteFiles, bool addExclusion = false); void DeleteMovies(List movieIds, bool deleteFiles, bool addExclusion = false); List GetAllMovies(); Dictionary> AllMovieTags(); Movie UpdateMovie(Movie movie); List UpdateMovie(List movie, bool useExistingRelativeFolder); - List FilterExistingMovies(List movies); List GetRecommendedTmdbIds(); bool MoviePathExists(string folder); void RemoveAddOptions(Movie movie); @@ -192,11 +189,6 @@ namespace NzbDrone.Core.Movies return _movieRepository.FindByTmdbId(tmdbid); } - public List FindByTmdbId(List tmdbids) - { - return _movieRepository.FindByTmdbId(tmdbids); - } - public Movie FindByPath(string path) { return _movieRepository.FindByPath(path); @@ -290,12 +282,6 @@ namespace NzbDrone.Core.Movies _movieRepository.SetFields(movie, s => s.AddOptions); } - public void SetFileId(Movie movie, MovieFile movieFile) - { - _movieRepository.SetFileId(movieFile.Id, movie.Id); - _logger.Info("Assigning file [{0}] to movie [{1}]", movieFile.RelativePath, movie); - } - public List GetMoviesByFileId(int fileId) { return _movieRepository.GetMoviesByFileId(fileId); @@ -365,22 +351,6 @@ namespace NzbDrone.Core.Movies return false; } - public List FilterExistingMovies(List movies) - { - var allMovies = GetAllMovies(); - - var withTmdbid = movies.Where(m => m.TmdbId != 0).ToList(); - var withoutTmdbid = movies.Where(m => m.TmdbId == 0).ToList(); - var withImdbid = withoutTmdbid.Where(m => m.ImdbId.IsNotNullOrWhiteSpace()); - var rest = withoutTmdbid.Where(m => m.ImdbId.IsNullOrWhiteSpace()); - - var ret = withTmdbid.ExceptBy(m => m.TmdbId, allMovies, m => m.TmdbId, EqualityComparer.Default) - .Union(withImdbid.ExceptBy(m => m.ImdbId, allMovies, m => m.ImdbId, EqualityComparer.Default)) - .Union(rest.ExceptBy(m => m.Title.CleanMovieTitle(), allMovies, m => m.MovieMetadata.Value.CleanTitle, EqualityComparer.Default)).ToList(); - - return ret; - } - public List GetRecommendedTmdbIds() { return _movieRepository.GetRecommendations();