github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-23 06:45:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Maybe fix issue with imported files not being linked to the movie?

Browse source
This commit is contained in:
Leonardo Galli 2017-02-25 13:50:12 +01:00
commit 3a4b01cf6f
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/NzbDrone.Core/MediaFiles/MediaFileService.cs
View file

@ -39,12 +39,15 @@ namespace NzbDrone.Core.MediaFiles
private readonly IEventAggregator _eventAggregator; private readonly IEventAggregator _eventAggregator;
private readonly IMediaFileRepository _mediaFileRepository; private readonly IMediaFileRepository _mediaFileRepository;
private readonly IMovieFileRepository _movieFileRepository; private readonly IMovieFileRepository _movieFileRepository;
private readonly IMovieService _movieService;
private readonly Logger _logger; private readonly Logger _logger;
public MediaFileService(IMediaFileRepository mediaFileRepository, IMovieFileRepository movieFileRepository, IEventAggregator eventAggregator, Logger logger) public MediaFileService(IMediaFileRepository mediaFileRepository, IMovieFileRepository movieFileRepository, IMovieService movieService,
IEventAggregator eventAggregator, Logger logger)
{ {
_mediaFileRepository = mediaFileRepository; _mediaFileRepository = mediaFileRepository;
_eventAggregator = eventAggregator; _eventAggregator = eventAggregator;
_movieService = movieService;
_movieFileRepository = movieFileRepository; _movieFileRepository = movieFileRepository;
_logger = logger; _logger = logger;
} }
@ -143,7 +146,9 @@ namespace NzbDrone.Core.MediaFiles
public MovieFile Add(MovieFile episodeFile) public MovieFile Add(MovieFile episodeFile)
{ {
var addedFile = _movieFileRepository.Insert(episodeFile); var addedFile = _movieFileRepository.Insert(episodeFile);
_movieService.SetFileId(episodeFile.Movie.Value, episodeFile); //Should not be necessary, but sometimes below fails?
_eventAggregator.PublishEvent(new MovieFileAddedEvent(addedFile)); _eventAggregator.PublishEvent(new MovieFileAddedEvent(addedFile));
return addedFile; return addedFile;
} }

7
src/NzbDrone.Core/Tv/MovieService.cs
View file

@ -34,6 +34,7 @@ namespace NzbDrone.Core.Tv
List<Movie> GetMoviesBetweenDates(DateTime start, DateTime end, bool includeUnmonitored); List<Movie> GetMoviesBetweenDates(DateTime start, DateTime end, bool includeUnmonitored);
PagingSpec<Movie> MoviesWithoutFiles(PagingSpec<Movie> pagingSpec); PagingSpec<Movie> MoviesWithoutFiles(PagingSpec<Movie> pagingSpec);
void DeleteMovie(int movieId, bool deleteFiles); void DeleteMovie(int movieId, bool deleteFiles);
void SetFileId(Movie movie, MovieFile movieFile);
List<Movie> GetAllMovies(); List<Movie> GetAllMovies();
Movie UpdateMovie(Movie movie); Movie UpdateMovie(Movie movie);
List<Movie> UpdateMovie(List<Movie> movie); List<Movie> UpdateMovie(List<Movie> movie);
@ -299,6 +300,12 @@ namespace NzbDrone.Core.Tv
_logger.Debug("Linking [{0}] > [{1}]", message.MovieFile.RelativePath, message.MovieFile.Movie.Value); _logger.Debug("Linking [{0}] > [{1}]", message.MovieFile.RelativePath, message.MovieFile.Movie.Value);
} }
public void SetFileId(Movie movie, MovieFile movieFile)
{
_movieRepository.SetFileId(movieFile.Id, movie.Id);
_logger.Debug("Linking [{0}] > [{1}]", movieFile.RelativePath, movie);
}
public void Handle(MovieFileDeletedEvent message) public void Handle(MovieFileDeletedEvent message)
{ {

4
src/UI/Navbar/Search.js
View file

@ -2,7 +2,7 @@ var _ = require('underscore');
var $ = require('jquery'); var $ = require('jquery');
var vent = require('vent'); var vent = require('vent');
var Backbone = require('backbone'); var Backbone = require('backbone');
var SeriesCollection = require('../Movies/FullMovieCollection'); var FullMovieCollection = require('../Movies/FullMovieCollection');
require('typeahead'); require('typeahead');
vent.on(vent.Hotkeys.NavbarSearch, function() { vent.on(vent.Hotkeys.NavbarSearch, function() {
@ -11,7 +11,7 @@ vent.on(vent.Hotkeys.NavbarSearch, function() {
var substringMatcher = function() { var substringMatcher = function() {
return function findMatches (q, cb) { return function findMatches (q, cb) {
var matches = _.select(SeriesCollection.toJSON(), function(series) { var matches = _.select(FullMovieCollection.toJSON(), function(series) {
return series.title.toLowerCase().indexOf(q.toLowerCase()) > -1; return series.title.toLowerCase().indexOf(q.toLowerCase()) > -1;
}); });
cb(matches); cb(matches);