From 50be87e5a4a01e06e1d3283c9ba0b01bc2c3c889 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 #824 --- .../MediaFiles/DownloadedBooksImportService.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core/MediaFiles/DownloadedBooksImportService.cs b/src/NzbDrone.Core/MediaFiles/DownloadedBooksImportService.cs index 5f003fa33..3f965841f 100644 --- a/src/NzbDrone.Core/MediaFiles/DownloadedBooksImportService.cs +++ b/src/NzbDrone.Core/MediaFiles/DownloadedBooksImportService.cs @@ -115,7 +115,9 @@ public bool ShouldDeleteFolder(IDirectoryInfo directoryInfo) try { var bookFiles = _diskScanService.GetBookFiles(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 bookFile in bookFiles) { @@ -144,6 +146,11 @@ public bool ShouldDeleteFolder(IDirectoryInfo directoryInfo) _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)