mirror of
https://github.com/Radarr/Radarr.git
synced 2026-03-05 13:21:25 -05:00
Fixed: Allow more prefixes and suffixes for Release Year naming token
This commit is contained in:
@@ -41,7 +41,7 @@ namespace NzbDrone.Core.Organizer
|
||||
private static readonly Regex TitleRegex = new Regex(@"(?<tag>\{(?<prefix>[-{ ._\[(]*)(?:imdb(?:id)?-|edition-))?\{(?<prefix>[-{ ._\[(]*)(?<token>(?:[a-z0-9]+)(?:(?<separator>[- ._]+)(?:[a-z0-9]+))?)(?::(?<customFormat>[ ,a-z0-9|+-]+(?<![- ])))?(?<suffix>[-} ._)\]]*)\}",
|
||||
RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
|
||||
|
||||
public static readonly Regex ReleaseYearRegex = new Regex(@"\{[\[\(]?Release[- ._]Year[\]\)]?\}", RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
||||
public static readonly Regex ReleaseYearRegex = new Regex(@"\{[-{ ._\[(]*Release[- ._]Year[-} ._)\]]*\}", RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
||||
|
||||
public static readonly Regex MovieTitleRegex = new Regex(@"(?<token>\{(?:Movie)(?<separator>[- ._])(?:Clean)?(?:OriginalTitle|Title(?:The)?)(?::(?<customFormat>[a-z0-9|-]+))?\})",
|
||||
RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
||||
|
||||
@@ -23,6 +23,11 @@ namespace NzbDrone.Integration.Test.ApiTests
|
||||
[TestCase("{Movie Title} {Release Year}")]
|
||||
[TestCase("{Movie Title} {(Release Year)}")]
|
||||
[TestCase("{Movie Title} {[Release Year]}")]
|
||||
[TestCase("{Movie Title} {{Release Year}}")]
|
||||
[TestCase("{Movie Title}{ Release Year }")]
|
||||
[TestCase("{Movie-Title}{-Release-Year-}")]
|
||||
[TestCase("{Movie_Title}{_Release_Year_}")]
|
||||
[TestCase("{Movie.Title}{.Release.Year.}")]
|
||||
public void should_be_able_to_update(string standardMovieFormat)
|
||||
{
|
||||
var config = NamingConfig.GetSingle();
|
||||
|
||||
Reference in New Issue
Block a user