Mirrors/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-10-30 23:42:33 +01:00
Code Issues Releases Wiki Activity

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.

Browse Source 
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.
This commit is contained in:
Mark McDowall 2012-01-12 08:41:58 -08:00
parent eb33cc3f5e
commit 359f6ea012
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NzbDrone.Core.Test/ParserTest.cs
View File

@ -297,6 +297,8 @@ namespace NzbDrone.Core.Test
[TestCase("Mad Men - Season 1 [Bluray720p]", "madmen")] [TestCase("Mad Men - Season 1 [Bluray720p]", "madmen")]
[TestCase("Mad Men - Season 1 [Bluray1080p]", "madmen")] [TestCase("Mad Men - Season 1 [Bluray1080p]", "madmen")]
[TestCase("The Daily Show With Jon Stewart -", "dailyshowwithjonstewart")] [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) public void parse_series_name(string postTitle, string title)
{ {
var result = Parser.ParseSeriesName(postTitle); var result = Parser.ParseSeriesName(postTitle);

2
NzbDrone.Core/Parser.cs
View File

@ -44,7 +44,7 @@ namespace NzbDrone.Core
RegexOptions.IgnoreCase | RegexOptions.Compiled), RegexOptions.IgnoreCase | RegexOptions.Compiled),
//Supports 1103/1113 naming //Supports 1103/1113 naming
new Regex(@"^(?<title>.+?)?(?:\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), RegexOptions.IgnoreCase | RegexOptions.Compiled),
//Supports 103/113 naming //Supports 103/113 naming

2
NzbDrone.Web/Views/AddSeries/ExistingSeries.cshtml
View File

@ -46,7 +46,7 @@ else
{ {
<div class="existingSeries"> <div class="existingSeries">
<span class="seriesPathValue"> <span class="seriesPathValue">
@Html.Label(series.Item1) <label>@series.Item1</label>
</span> </span>
<div class="existingSeriesContainer"> <div class="existingSeriesContainer">
<input class="seriesLookup" type="text" style="width: 400px;" value="@series.Item2" /> <input class="seriesLookup" type="text" style="width: 400px;" value="@series.Item2" />