From 481345226a68da7707710fd858259a72c4cb11a1 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 11 Apr 2022 18:18:02 -0700 Subject: [PATCH] Fixed: Skip extras in 'Extras' subfolder Closes #4980 --- src/NzbDrone.Core/Extras/ExistingExtraFileService.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/NzbDrone.Core/Extras/ExistingExtraFileService.cs b/src/NzbDrone.Core/Extras/ExistingExtraFileService.cs index 70b4b4cfe..0bb4a4a4b 100644 --- a/src/NzbDrone.Core/Extras/ExistingExtraFileService.cs +++ b/src/NzbDrone.Core/Extras/ExistingExtraFileService.cs @@ -31,7 +31,6 @@ namespace NzbDrone.Core.Extras public void Handle(SeriesScannedEvent message) { var series = message.Series; - var extraFiles = new List(); if (!_diskProvider.FolderExists(series.Path)) { @@ -41,19 +40,18 @@ namespace NzbDrone.Core.Extras _logger.Debug("Looking for existing extra files in {0}", series.Path); var filesOnDisk = _diskScanService.GetNonVideoFiles(series.Path); - var possibleExtraFiles = _diskScanService.FilterPaths(series.Path, filesOnDisk, false); + var possibleExtraFiles = _diskScanService.FilterPaths(series.Path, filesOnDisk); - var filteredFiles = possibleExtraFiles; var importedFiles = new List(); foreach (var existingExtraFileImporter in _existingExtraFileImporters) { - var imported = existingExtraFileImporter.ProcessFiles(series, filteredFiles, importedFiles); + var imported = existingExtraFileImporter.ProcessFiles(series, possibleExtraFiles, importedFiles); importedFiles.AddRange(imported.Select(f => Path.Combine(series.Path, f.RelativePath))); } - _logger.Info("Found {0} extra files", extraFiles.Count); + _logger.Info("Found {0} possible extra files, imported {1} files.", possibleExtraFiles.Count, importedFiles.Count); } } }