From c84a9d6612626a52902e2aa5166097ede1c5f6e6 Mon Sep 17 00:00:00 2001 From: Qstick Date: Tue, 21 Jul 2020 21:40:08 -0400 Subject: [PATCH] Fixed: Include 'Sample' Directory in Ignored --- .../MediaFiles/DiskScanServiceTests/ScanFixture.cs | 9 +++++---- src/NzbDrone.Core/MediaFiles/DiskScanService.cs | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs index c2813e344..4c7de1160 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs @@ -166,10 +166,11 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests Path.Combine(_movie.Path, "Deleted Scenes", "file2.mkv").AsOsAgnostic(), Path.Combine(_movie.Path, "Featurettes", "file3.mkv").AsOsAgnostic(), Path.Combine(_movie.Path, "Interviews", "file4.mkv").AsOsAgnostic(), - Path.Combine(_movie.Path, "Samples", "file5.mkv").AsOsAgnostic(), - Path.Combine(_movie.Path, "Scenes", "file6.mkv").AsOsAgnostic(), - Path.Combine(_movie.Path, "Shorts", "file7.mkv").AsOsAgnostic(), - Path.Combine(_movie.Path, "Trailers", "file8.mkv").AsOsAgnostic(), + Path.Combine(_movie.Path, "Sample", "file5.mkv").AsOsAgnostic(), + Path.Combine(_movie.Path, "Samples", "file6.mkv").AsOsAgnostic(), + Path.Combine(_movie.Path, "Scenes", "file7.mkv").AsOsAgnostic(), + Path.Combine(_movie.Path, "Shorts", "file8.mkv").AsOsAgnostic(), + Path.Combine(_movie.Path, "Trailers", "file9.mkv").AsOsAgnostic(), Path.Combine(_movie.Path, "The Count of Monte Cristo (2002) (1080p BluRay x265 10bit Tigole).mkv").AsOsAgnostic(), }); diff --git a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs index 43e5015da..6d0892df0 100644 --- a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs +++ b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs @@ -62,7 +62,7 @@ namespace NzbDrone.Core.MediaFiles _logger = logger; } - private static readonly Regex ExcludedExtrasSubFolderRegex = new Regex(@"(?:\\|\/|^)(?:extras|extrafanart|behind the scenes|deleted scenes|featurettes|interviews|scenes|samples|shorts|trailers)(?:\\|\/)", RegexOptions.Compiled | RegexOptions.IgnoreCase); + private static readonly Regex ExcludedExtrasSubFolderRegex = new Regex(@"(?:\\|\/|^)(?:extras|extrafanart|behind the scenes|deleted scenes|featurettes|interviews|scenes|sample[s]?|shorts|trailers)(?:\\|\/)", RegexOptions.Compiled | RegexOptions.IgnoreCase); private static readonly Regex ExcludedSubFoldersRegex = new Regex(@"(?:\\|\/|^)(?:@eadir|\.@__thumb|plex versions|\.[^\\/]+)(?:\\|\/)", RegexOptions.Compiled | RegexOptions.IgnoreCase); private static readonly Regex ExcludedFilesRegex = new Regex(@"^\._|^Thumbs\.db$", RegexOptions.Compiled | RegexOptions.IgnoreCase);