mirror of
https://github.com/Sonarr/Sonarr.git
synced 2024-12-10 11:10:40 +02:00
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.
This commit is contained in:
parent
eb33cc3f5e
commit
359f6ea012
@ -297,6 +297,8 @@ public void Normalize_not_removed_common_words_in_the_middle(string word)
|
|||||||
[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);
|
||||||
|
@ -44,7 +44,7 @@ public static class Parser
|
|||||||
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
|
||||||
|
@ -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" />
|
||||||
|
Loading…
Reference in New Issue
Block a user