diff --git a/src/NzbDrone.Core/Movies/MovieRepository.cs b/src/NzbDrone.Core/Movies/MovieRepository.cs index 3c2d2927ad..af1e171030 100644 --- a/src/NzbDrone.Core/Movies/MovieRepository.cs +++ b/src/NzbDrone.Core/Movies/MovieRepository.cs @@ -313,19 +313,18 @@ public Dictionary> AllMovieTags() public List GetRecommendations() { - var recommendations = new List>(); - var tmdbIds = AllMovieTmdbIds(); + var recommendations = new List(); using (var conn = _database.OpenConnection()) { - recommendations = conn.Query>("SELECT Recommendations FROM Movies ORDER BY id DESC LIMIT 100").ToList(); + recommendations = conn.Query(@" + SELECT Rec FROM + (SELECT CAST(j.value AS INT) AS Rec FROM Movies CROSS JOIN json_each(Movies.Recommendations) AS j + WHERE Rec NOT IN (SELECT TmdbId FROM Movies)) + GROUP BY Rec ORDER BY count(*) DESC LIMIT 100;").ToList(); } - return recommendations.SelectMany(x => x) - .Where(r => !tmdbIds.Any(m => m == r)) - .Distinct() - .Take(100) - .ToList(); + return recommendations; } } } diff --git a/src/NzbDrone.Core/Movies/MovieService.cs b/src/NzbDrone.Core/Movies/MovieService.cs index 9dfedaaa12..07d5d5fca5 100644 --- a/src/NzbDrone.Core/Movies/MovieService.cs +++ b/src/NzbDrone.Core/Movies/MovieService.cs @@ -286,7 +286,7 @@ public void RemoveAddOptions(Movie movie) public void SetFileId(Movie movie, MovieFile movieFile) { _movieRepository.SetFileId(movieFile.Id, movie.Id); - _logger.Info("Linking [{0}] > [{1}]", movieFile.RelativePath, movie); + _logger.Info("Assigning file [{0}] to movie [{1}]", movieFile.RelativePath, movie); } public List GetMoviesByFileId(int fileId) @@ -386,7 +386,7 @@ public void Handle(MovieFileAddedEvent message) _movieRepository.Update(movie); //_movieRepository.SetFileId(message.MovieFile.Id, message.MovieFile.Movie.Value.Id); - _logger.Info("Linking [{0}] > [{1}]", message.MovieFile.RelativePath, message.MovieFile.Movie); + _logger.Info("Assigning file [{0}] to movie [{1}]", message.MovieFile.RelativePath, message.MovieFile.Movie); } public void Handle(MovieFileDeletedEvent message)