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

Fixed: Deleting empty folders on upgrade 

Fixes #4787
Fixes SENTRY RADARR-1F
This commit is contained in:
Qstick 2020-08-03 02:51:10 -04:00
parent 695297435e
commit ec15885680
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/NzbDrone.Core/MediaFiles/MediaFileDeletionService.cs
View File

@ -122,23 +122,27 @@ namespace NzbDrone.Core.MediaFiles
[EventHandleOrder(EventHandleOrder.Last)]
public void Handle(MovieFileDeletedEvent message)
{
if (message.Reason == DeleteMediaFileReason.Upgrade)
{
return;
}
if (_configService.DeleteEmptyFolders)
{
var movie = message.MovieFile.Movie;
var movieFileFolder = message.MovieFile.Path.GetParentPath();
var moviePath = movie.Path;
var folder = message.MovieFile.Path.GetParentPath();
if (_diskProvider.GetFiles(movie.Path, SearchOption.AllDirectories).Empty())
while (moviePath.IsParentPath(folder))
{
_diskProvider.DeleteFolder(movie.Path, true);
if (_diskProvider.FolderExists(folder))
{
_diskProvider.RemoveEmptySubfolders(folder);
}
folder = folder.GetParentPath();
}
else if (_diskProvider.GetFiles(movieFileFolder, SearchOption.AllDirectories).Empty())
_diskProvider.RemoveEmptySubfolders(moviePath);
if (_diskProvider.FolderEmpty(moviePath))
{
_diskProvider.RemoveEmptySubfolders(movieFileFolder);
_diskProvider.DeleteFolder(moviePath, true);
}
}
}