From 359f6ea0120dec2991fc174d132bc3bf7d6e31f4 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 12 Jan 2012 08:41:58 -0800 Subject: [PATCH] Bug: Fixed years being picked up as 4-digit season/episode combo when using the folder name only. a year wrapped with brackets '()' or '[]' will be treated as a year. Bug: Fixed display issue for series with a period in them when adding existing series, Html.Label(path) would only show text from after the period. --- NzbDrone.Core.Test/ParserTest.cs | 2 ++ NzbDrone.Core/Parser.cs | 2 +- NzbDrone.Web/Views/AddSeries/ExistingSeries.cshtml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NzbDrone.Core.Test/ParserTest.cs b/NzbDrone.Core.Test/ParserTest.cs index 5b5284dcd..3abfb70c9 100644 --- a/NzbDrone.Core.Test/ParserTest.cs +++ b/NzbDrone.Core.Test/ParserTest.cs @@ -297,6 +297,8 @@ namespace NzbDrone.Core.Test [TestCase("Mad Men - Season 1 [Bluray720p]", "madmen")] [TestCase("Mad Men - Season 1 [Bluray1080p]", "madmen")] [TestCase("The Daily Show With Jon Stewart -", "dailyshowwithjonstewart")] + [TestCase("The Venture Bros. (2004)", "venturebros2004")] + [TestCase("Castle (2011)", "castle2011")] public void parse_series_name(string postTitle, string title) { var result = Parser.ParseSeriesName(postTitle); diff --git a/NzbDrone.Core/Parser.cs b/NzbDrone.Core/Parser.cs index 578231970..4402544ff 100644 --- a/NzbDrone.Core/Parser.cs +++ b/NzbDrone.Core/Parser.cs @@ -44,7 +44,7 @@ namespace NzbDrone.Core RegexOptions.IgnoreCase | RegexOptions.Compiled), //Supports 1103/1113 naming - new Regex(@"^(?.+?)?(?:\W?(?<season>(?<!\d+)\d{2})(?<episode>\d{2}(?!p|i|\d+)))+\W?(?!\\)", + new Regex(@"^(?<title>.+?)?(?:\W?(?<season>(?<!\d+|\(|\[)\d{2})(?<episode>\d{2}(?!p|i|\d+|\)|\])))+\W?(?!\\)", RegexOptions.IgnoreCase | RegexOptions.Compiled), //Supports 103/113 naming diff --git a/NzbDrone.Web/Views/AddSeries/ExistingSeries.cshtml b/NzbDrone.Web/Views/AddSeries/ExistingSeries.cshtml index 7c2e8c4df..a0fb5bfd9 100644 --- a/NzbDrone.Web/Views/AddSeries/ExistingSeries.cshtml +++ b/NzbDrone.Web/Views/AddSeries/ExistingSeries.cshtml @@ -46,7 +46,7 @@ else { <div class="existingSeries"> <span class="seriesPathValue"> - @Html.Label(series.Item1) + <label>@series.Item1</label> </span> <div class="existingSeriesContainer"> <input class="seriesLookup" type="text" style="width: 400px;" value="@series.Item2" />