EpisodeFile cleanup and deletion fixes

Upgraded episodes will no longer be auto unmonitored
EpsiodeFiles will be removed from db if parsing rules have changed
EpisodeFiles will be removed from db if they are not in their series' folder (or subfolder)
This commit is contained in:
Mark McDowall 2013-07-22 17:50:37 -07:00
parent 19fc3bad6c
commit 4c1e6e14aa
11 changed files with 145 additions and 49 deletions

View file

@ -4,6 +4,7 @@ using NLog;
using NzbDrone.Common;
using NzbDrone.Common.Messaging;
using NzbDrone.Core.MediaFiles.Commands;
using NzbDrone.Core.Parser;
using NzbDrone.Core.Tv;
namespace NzbDrone.Core.MediaFiles
@ -14,19 +15,29 @@ namespace NzbDrone.Core.MediaFiles
private readonly IMediaFileService _mediaFileService;
private readonly IDiskProvider _diskProvider;
private readonly IEpisodeService _episodeService;
private readonly ISeriesService _seriesService;
private readonly IParsingService _parsingService;
private readonly Logger _logger;
public MediaFileTableCleanupService(IMediaFileService mediaFileService, IDiskProvider diskProvider, IEpisodeService episodeService, Logger logger)
public MediaFileTableCleanupService(IMediaFileService mediaFileService,
IDiskProvider diskProvider,
IEpisodeService episodeService,
ISeriesService seriesService,
IParsingService parsingService,
Logger logger)
{
_mediaFileService = mediaFileService;
_diskProvider = diskProvider;
_episodeService = episodeService;
_seriesService = seriesService;
_parsingService = parsingService;
_logger = logger;
}
public void Execute(CleanMediaFileDb message)
{
var seriesFile = _mediaFileService.GetFilesBySeries(message.SeriesId);
var series = _seriesService.GetSeries(message.SeriesId);
foreach (var episodeFile in seriesFile)
{
@ -34,14 +45,34 @@ namespace NzbDrone.Core.MediaFiles
{
if (!_diskProvider.FileExists(episodeFile.Path))
{
_logger.Trace("File [{0}] no longer exists on disk. removing from db", episodeFile.Path);
_logger.Trace("File [{0}] no longer exists on disk, removing from db", episodeFile.Path);
_mediaFileService.Delete(episodeFile);
continue;
}
if (!_episodeService.GetEpisodesByFileId(episodeFile.Id).Any())
if (!_diskProvider.IsParent(series.Path, episodeFile.Path))
{
_logger.Trace("File [{0}] is not assigned to any episodes. removing from db", episodeFile.Path);
_logger.Trace("File [{0}] does not belong to this series, removing from db", episodeFile.Path);
_mediaFileService.Delete(episodeFile);
continue;
}
var episodes = _episodeService.GetEpisodesByFileId(episodeFile.Id);
if (!episodes.Any())
{
_logger.Trace("File [{0}] is not assigned to any episodes, removing from db", episodeFile.Path);
_mediaFileService.Delete(episodeFile);
continue;
}
var localEpsiode = _parsingService.GetEpisodes(episodeFile.Path, series);
if (localEpsiode == null || episodes.Count != localEpsiode.Episodes.Count)
{
_logger.Trace("File [{0}] parsed episodes has changed, removing from db", episodeFile.Path);
_mediaFileService.Delete(episodeFile);
continue;
}
}
catch (Exception ex)