From 859e36aa6b151366bc4a004a1f18c9c58e66eb13 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 29 Apr 2014 17:03:14 -0700 Subject: [PATCH] New: Do not import files inside the EXTRAS folder within a Series --- src/NzbDrone.Core/MediaFiles/DiskScanService.cs | 6 ++++-- src/NzbDrone.Core/Metadata/ExistingMetadataService.cs | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs index 6e86e1077..4e2801c95 100644 --- a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs +++ b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs @@ -1,4 +1,6 @@ -using System.Diagnostics; +using System; +using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.Linq; using NLog; @@ -76,7 +78,7 @@ namespace NzbDrone.Core.MediaFiles } var videoFilesStopwatch = Stopwatch.StartNew(); - var mediaFileList = GetVideoFiles(series.Path).ToList(); + var mediaFileList = GetVideoFiles(series.Path).Where(file => !file.StartsWith(Path.Combine(series.Path, "EXTRAS"))).ToList(); videoFilesStopwatch.Stop(); _logger.Trace("Finished getting episode files for: {0} [{1}]", series, videoFilesStopwatch.Elapsed); diff --git a/src/NzbDrone.Core/Metadata/ExistingMetadataService.cs b/src/NzbDrone.Core/Metadata/ExistingMetadataService.cs index cf625706f..0a4c68cdf 100644 --- a/src/NzbDrone.Core/Metadata/ExistingMetadataService.cs +++ b/src/NzbDrone.Core/Metadata/ExistingMetadataService.cs @@ -40,7 +40,10 @@ namespace NzbDrone.Core.Metadata _logger.Debug("Looking for existing metadata in {0}", message.Series.Path); var filesOnDisk = _diskProvider.GetFiles(message.Series.Path, SearchOption.AllDirectories); - var possibleMetadataFiles = filesOnDisk.Where(c => !MediaFileExtensions.Extensions.Contains(Path.GetExtension(c).ToLower())).ToList(); + + var possibleMetadataFiles = filesOnDisk.Where(c => !MediaFileExtensions.Extensions.Contains(Path.GetExtension(c).ToLower()) && + !c.StartsWith(Path.Combine(message.Series.Path, "EXTRAS"))).ToList(); + var filteredFiles = _metadataFileService.FilterExistingFiles(possibleMetadataFiles, message.Series); var metadataFiles = new List();