mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Don't delete extra files after unlinking an episode file that still exists on disk

This commit is contained in:
Mark McDowall 2016-11-23 16:38:40 -08:00
parent b093be3f4e
commit 7b09b259a8
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/NzbDrone.Core/Extras/Files/ExtraFileService.cs
View File

@ -111,23 +111,32 @@ namespace NzbDrone.Core.Extras.Files
public void HandleAsync(EpisodeFileDeletedEvent message)
{
var episodeFile = message.EpisodeFile;
var series = _seriesService.GetSeries(message.EpisodeFile.SeriesId);
foreach (var extra in _repository.GetFilesByEpisodeFile(episodeFile.Id))
if (message.Reason == DeleteMediaFileReason.NoLinkedEpisodes)
{
var path = Path.Combine(series.Path, extra.RelativePath);
_logger.Debug("Removing episode file from DB as part of cleanup routine, not deleting extra files from disk.");
}
if (_diskProvider.FileExists(path))
else
{
var series = _seriesService.GetSeries(message.EpisodeFile.SeriesId);
foreach (var extra in _repository.GetFilesByEpisodeFile(episodeFile.Id))
{
if (PermanentlyDelete)
{
_diskProvider.DeleteFile(path);
}
var path = Path.Combine(series.Path, extra.RelativePath);
else
if (_diskProvider.FileExists(path))
{
// Send extra files to the recycling bin so they can be recovered if necessary
_recycleBinProvider.DeleteFile(path);
if (PermanentlyDelete)
{
_diskProvider.DeleteFile(path);
}
else
{
// Send extra files to the recycling bin so they can be recovered if necessary
_recycleBinProvider.DeleteFile(path);
}
}
}
}

2
src/NzbDrone.Core/History/HistoryService.cs
View File

@ -236,7 +236,7 @@ namespace NzbDrone.Core.History
{
if (message.Reason == DeleteMediaFileReason.NoLinkedEpisodes)
{
_logger.Debug("Removing episode file from DB as part of cleanup routine.");
_logger.Debug("Removing episode file from DB as part of cleanup routine, not creating history event.");
return;
}