From 6c2bf860feb7ed01ec53f1af4d501cdd01d9f9ac Mon Sep 17 00:00:00 2001 From: James Hughes Date: Wed, 8 Jun 2022 22:10:23 +0100 Subject: [PATCH] Fixed: Improved empty root folder failsafe logging (#7341) Co-authored-by: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> --- src/NzbDrone.Core/MediaFiles/DiskScanService.cs | 2 +- src/NzbDrone.Core/MediaFiles/MediaFileDeletionService.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs index 263066d3a..20473422d 100644 --- a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs +++ b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs @@ -91,7 +91,7 @@ public void Scan(Movie movie) if (_diskProvider.FolderEmpty(rootFolder)) { - _logger.Warn("Movie's root folder ({0}) is empty.", rootFolder); + _logger.Warn("Movie's root folder ({0}) is empty. Rescan will not update movies as a failsafe.", rootFolder); _eventAggregator.PublishEvent(new MovieScanSkippedEvent(movie, MovieScanSkippedReason.RootFolderIsEmpty)); return; } diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileDeletionService.cs b/src/NzbDrone.Core/MediaFiles/MediaFileDeletionService.cs index 32f5cdd77..84b0ce61e 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaFileDeletionService.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaFileDeletionService.cs @@ -61,8 +61,8 @@ public void DeleteMovieFile(Movie movie, MovieFile movieFile) if (_diskProvider.GetDirectories(rootFolder).Empty()) { - _logger.Warn("Movie's root folder ({0}) is empty.", rootFolder); - throw new NzbDroneClientException(HttpStatusCode.Conflict, "Movie's root folder ({0}) is empty.", rootFolder); + _logger.Warn("Movie's root folder ({0}) is empty. Rescan will not update movies as a failsafe.", rootFolder); + throw new NzbDroneClientException(HttpStatusCode.Conflict, "Movie's root folder ({0}) is empty. Rescan will not update movies as a failsafe.", rootFolder); } if (_diskProvider.FolderExists(movie.Path) && _diskProvider.FileExists(fullPath))