diff --git a/src/NzbDrone.Core.Test/ParserTests/AbsoluteEpisodeNumberParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/AbsoluteEpisodeNumberParserFixture.cs
index 9670fdd67..9a115d838 100644
--- a/src/NzbDrone.Core.Test/ParserTests/AbsoluteEpisodeNumberParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/AbsoluteEpisodeNumberParserFixture.cs
@@ -128,6 +128,9 @@ namespace NzbDrone.Core.Test.ParserTests
[TestCase("[RlsGrp] Series Title (2010) - S01E01-02 - 001-002 - Episode Title HDTV-720p v2", "Series Title (2010)", new[] { 1, 2 })]
[TestCase("Series Title (2010) - S01E01-02 (001-002) - Episode Title (1) HDTV-720p v2 [RlsGrp]", "Series Title (2010)", new[] { 1, 2 })]
[TestCase("[HorribleSubs] Haikyuu!! (01-25) [1080p] (Batch)", "Haikyuu!!", new[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 })]
+ [TestCase("Hunter X Hunter (2011) Episode 99-100 [1080p] [Dual.Audio] [x265]", "Hunter X Hunter (2011)", new[] { 99, 100 })]
+ [TestCase("Twin Star Exorcists 1-13 (English Dub) [720p]", "Twin Star Exorcists", new[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 })]
+// [TestCase("", "", new[] { 0 })]
public void should_parse_multi_episode_absolute_numbers(string postTitle, string title, int[] absoluteEpisodeNumbers)
{
var result = Parser.Parser.ParseTitle(postTitle);
diff --git a/src/NzbDrone.Core/Parser/Parser.cs b/src/NzbDrone.Core/Parser/Parser.cs
index f6f07005c..807d4a8e7 100644
--- a/src/NzbDrone.Core/Parser/Parser.cs
+++ b/src/NzbDrone.Core/Parser/Parser.cs
@@ -96,8 +96,12 @@ namespace NzbDrone.Core.Parser
new Regex(@"^(?
.+?)(?:(?:[-_\W](?(?\d{2,3}(?!\d+))(?:(?:\-|[ex]|\W[ex]|_){1,2}(?\d{2,3}(?!\d+)))+).+?(?:\[.+?\])(?!\\)",
RegexOptions.IgnoreCase | RegexOptions.Compiled),
- //Anime - Title Absolute Episode Number [SubGroup]
- new Regex(@"^(?.+?)(?:(?:_|-|\s|\.)+(?\d{3}(\.\d{1,2})?(?!\d+)))+(?:.+?)\[(?.+?)\].*?(?\[\w{8}\])?(?:$|\.)",
+ //Anime - Title Absolute Episode Number [SubGroup] [Hash]? (Series Title Episode 99-100 [RlsGroup] [ABCD1234])
+ new Regex(@"^(?.+?)[-_. ]Episode(?:[-_. ]+(?\d{2,3}(\.\d{1,2})?(?!\d+)))+(?:.+?)\[(?.+?)\].*?(?\[\w{8}\])?(?:$|\.)",
+ RegexOptions.IgnoreCase | RegexOptions.Compiled),
+
+ //Anime - Title Absolute Episode Number [SubGroup] [Hash]
+ new Regex(@"^(?.+?)(?:(?:_|-|\s|\.)+(?\d{3}(\.\d{1,2})(?!\d+)))+(?:.+?)\[(?.+?)\].*?(?\[\w{8}\])?(?:$|\.)",
RegexOptions.IgnoreCase | RegexOptions.Compiled),
//Anime - Title Absolute Episode Number [Hash]
@@ -242,7 +246,6 @@ namespace NzbDrone.Core.Parser
new Regex(@"^(?:(?(?\d{2,3}(?!\d+))))",
RegexOptions.IgnoreCase | RegexOptions.Compiled),
- // TODO: THIS ONE
//Anime - Title Absolute Episode Number (e66)
new Regex(@"^(?:\[(?.+?)\][-_. ]?)?(?.+?)(?:(?:_|-|\s|\.)+(?:e|ep)(?\d{2,3}(\.\d{1,2})?))+.*?(?\[\w{8}\])?(?:$|\.)",
RegexOptions.IgnoreCase | RegexOptions.Compiled),
@@ -251,6 +254,10 @@ namespace NzbDrone.Core.Parser
new Regex(@"^(?.+?)[-_. ](?:Episode)(?:[-_. ]+(?(?\[.{8}\])?(?:$|\.)?",
RegexOptions.IgnoreCase | RegexOptions.Compiled),
+ //Anime Range - Title Absolute Episode Number (1 or 2 digit absolute episode numbers in a range, 1-10)
+ new Regex(@"^(?:\[(?.+?)\][-_. ]?)?(?.+?)[_. ]+(?(?(?\[.{8}\])?(?:$|\.)?",
+ RegexOptions.IgnoreCase | RegexOptions.Compiled),
+
//Anime - Title Absolute Episode Number
new Regex(@"^(?:\[(?.+?)\][-_. ]?)?(?.+?)(?:[-_. ]+(?(?\[.{8}\])?(?:$|\.)?",
RegexOptions.IgnoreCase | RegexOptions.Compiled),