From e6c92c05ec79bded250abb4d56dcf98ee08d5f61 Mon Sep 17 00:00:00 2001 From: Qstick Date: Fri, 31 Jul 2020 23:34:19 -0400 Subject: [PATCH] Improved some log messages Fixes #4693 Co-Authored-By: Mark McDowall --- .../Specifications/AcceptableSizeSpecification.cs | 13 +++++++++---- src/NzbDrone.Core/Movies/RefreshMovieService.cs | 6 +++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs index f7a50c41c..87b171fb3 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs @@ -28,7 +28,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications if (subject.Release.Size == 0) { - _logger.Debug("Release has unknown size, skipping size check."); + _logger.Debug("Release has unknown size, skipping size check"); return Decision.Accept(); } @@ -59,7 +59,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications if (!qualityDefinition.MaxSize.HasValue || qualityDefinition.MaxSize.Value == 0) { - _logger.Debug("Max size is unlimited - skipping check."); + _logger.Debug("Max size is unlimited, skipping check"); + } + else if (subject.Movie.Runtime == 0) + { + _logger.Debug("Movie runtime is 0, unable to validate size until it is available, rejecting"); + return Decision.Reject("Movie runtime is 0, unable to validate size until it is available"); } else { @@ -71,12 +76,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications //If the parsed size is greater than maxSize we don't want it if (subject.Release.Size > maxSize) { - _logger.Debug("Item: {0}, Size: {1} is greater than maximum allowed size ({2} for {3}), rejecting.", subject, subject.Release.Size, maxSize, subject.Movie.Title); + _logger.Debug("Item: {0}, Size: {1} is greater than maximum allowed size ({2} for {3}), rejecting", subject, subject.Release.Size, maxSize, subject.Movie.Title); return Decision.Reject("{0} is larger than maximum allowed {1} (for {2})", subject.Release.Size.SizeSuffix(), maxSize.SizeSuffix(), subject.Movie.Title); } } - _logger.Debug("Item: {0}, meets size constraints.", subject); + _logger.Debug("Item: {0}, meets size constraints", subject); return Decision.Accept(); } } diff --git a/src/NzbDrone.Core/Movies/RefreshMovieService.cs b/src/NzbDrone.Core/Movies/RefreshMovieService.cs index f0ed8365d..7f2c6782e 100644 --- a/src/NzbDrone.Core/Movies/RefreshMovieService.cs +++ b/src/NzbDrone.Core/Movies/RefreshMovieService.cs @@ -143,17 +143,17 @@ namespace NzbDrone.Core.Movies if (isNew) { - _logger.Trace("Forcing refresh of {0}. Reason: New movie", movie); + _logger.Trace("Forcing rescan of {0}. Reason: New movie", movie); shouldRescan = true; } else if (rescanAfterRefresh == RescanAfterRefreshType.Never) { - _logger.Trace("Skipping refresh of {0}. Reason: never rescan after refresh", movie); + _logger.Trace("Skipping rescan of {0}. Reason: never rescan after refresh", movie); shouldRescan = false; } else if (rescanAfterRefresh == RescanAfterRefreshType.AfterManual && trigger != CommandTrigger.Manual) { - _logger.Trace("Skipping refresh of {0}. Reason: not after automatic scans", movie); + _logger.Trace("Skipping rescan of {0}. Reason: not after automatic scans", movie); shouldRescan = false; }