From 234d277eaef098a40878487b2d79cc2c0bd8e43e Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 9 Feb 2021 17:03:41 -0800 Subject: [PATCH] Fixed: Error checking if files should be deleted after import won't leave import in limbo (cherry picked from commit 88ad6f9544110a2e825ebe6b2cde17e9f05475cc) Closes #2003 --- .../MediaFiles/DownloadedTracksImportService.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core/MediaFiles/DownloadedTracksImportService.cs b/src/NzbDrone.Core/MediaFiles/DownloadedTracksImportService.cs index 29fc54e1a..bf64d64fa 100644 --- a/src/NzbDrone.Core/MediaFiles/DownloadedTracksImportService.cs +++ b/src/NzbDrone.Core/MediaFiles/DownloadedTracksImportService.cs @@ -116,7 +116,9 @@ public bool ShouldDeleteFolder(IDirectoryInfo directoryInfo, Artist artist) try { var audioFiles = _diskScanService.GetAudioFiles(directoryInfo.FullName); - var rarFiles = _diskProvider.GetFiles(directoryInfo.FullName, true).Where(f => Path.GetExtension(f).Equals(".rar", StringComparison.OrdinalIgnoreCase)); + var rarFiles = _diskProvider.GetFiles(directoryInfo.FullName, true).Where(f => + Path.GetExtension(f).Equals(".rar", + StringComparison.OrdinalIgnoreCase)); foreach (var audioFile in audioFiles) { @@ -145,6 +147,11 @@ public bool ShouldDeleteFolder(IDirectoryInfo directoryInfo, Artist artist) _logger.Debug(e, "Folder {0} has already been removed", directoryInfo.FullName); return false; } + catch (Exception e) + { + _logger.Debug(e, "Unable to determine whether folder {0} should be removed", directoryInfo.FullName); + return false; + } } private List ProcessFolder(IDirectoryInfo directoryInfo, ImportMode importMode, DownloadClientItem downloadClientItem)