From 39a8d4f0d88375da7ee6b66d3c0e4d22b7314522 Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Mon, 3 Sep 2018 11:24:48 -0700
Subject: [PATCH] Fixed: Parsing of new hashed release filenames
(######_##.ext)
---
.../ParserTests/HashedReleaseFixture.cs | 9 ++++++++-
src/NzbDrone.Core/Parser/Parser.cs | 9 ++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/NzbDrone.Core.Test/ParserTests/HashedReleaseFixture.cs b/src/NzbDrone.Core.Test/ParserTests/HashedReleaseFixture.cs
index 7f17e1563..7c028016a 100644
--- a/src/NzbDrone.Core.Test/ParserTests/HashedReleaseFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/HashedReleaseFixture.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Test.Framework;
@@ -80,6 +80,13 @@ namespace NzbDrone.Core.Test.ParserTests
"The Good Wife",
Quality.HDTV720p,
"NZBgeek"
+ },
+ new object[]
+ {
+ @"C:\Test\Fargo.S03E04.1080p.WEB-DL.DD5.1.H264-RARBG\170424_26.mkv".AsOsAgnostic(),
+ "Fargo",
+ Quality.WEBDL1080p,
+ "RARBG"
}
};
diff --git a/src/NzbDrone.Core/Parser/Parser.cs b/src/NzbDrone.Core/Parser/Parser.cs
index 804d2039b..141325c29 100644
--- a/src/NzbDrone.Core/Parser/Parser.cs
+++ b/src/NzbDrone.Core/Parser/Parser.cs
@@ -252,7 +252,7 @@ namespace NzbDrone.Core.Parser
RegexOptions.IgnoreCase | RegexOptions.Compiled)
};
- private static readonly Regex[] RejectHashedReleasesRegex = new Regex[]
+ private static readonly Regex[] RejectHashedReleasesRegexes = new Regex[]
{
// Generic match for md5 and mixed-case hashes.
new Regex(@"^[0-9a-zA-Z]{32}", RegexOptions.Compiled),
@@ -275,7 +275,10 @@ namespace NzbDrone.Core.Parser
new Regex(@"^abc$", RegexOptions.Compiled | RegexOptions.IgnoreCase),
//b00bs - Started appearing January 2015
- new Regex(@"^b00bs$", RegexOptions.Compiled | RegexOptions.IgnoreCase)
+ new Regex(@"^b00bs$", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+
+ // 170424_26 - Started appearing August 2018
+ new Regex(@"^\d{6}_\d{2}$"),
};
//Regex to detect whether the title was reversed.
@@ -751,7 +754,7 @@ namespace NzbDrone.Core.Parser
var titleWithoutExtension = RemoveFileExtension(title);
- if (RejectHashedReleasesRegex.Any(v => v.IsMatch(titleWithoutExtension)))
+ if (RejectHashedReleasesRegexes.Any(v => v.IsMatch(titleWithoutExtension)))
{
Logger.Debug("Rejected Hashed Release Title: " + title);
return false;