Bläddra i källkod

Use additional unicode chars for year extraction

Erik Rigtorp 5 år sedan
förälder
incheckning
75efb8f52d
2 ändrade filer med 3 tillägg och 2 borttagningar
  1. 3 1
      Emby.Naming/Common/NamingOptions.cs
  2. 0 1
      Emby.Naming/Video/CleanDateTimeParser.cs

+ 3 - 1
Emby.Naming/Common/NamingOptions.cs

@@ -137,7 +137,9 @@ namespace Emby.Naming.Common
             CleanDateTimes = new[]
             CleanDateTimes = new[]
             {
             {
                 @"(.+[^_\,\.\(\)\[\]\-])[_\.\(\)\[\]\-](19\d{2}|20\d{2})([ _\,\.\(\)\[\]\-][^0-9]|).*(19\d{2}|20\d{2})*",
                 @"(.+[^_\,\.\(\)\[\]\-])[_\.\(\)\[\]\-](19\d{2}|20\d{2})([ _\,\.\(\)\[\]\-][^0-9]|).*(19\d{2}|20\d{2})*",
-                @"(.+[^_\,\.\(\)\[\]\-])[ _\.\(\)\[\]\-]+(19\d{2}|20\d{2})([ _\,\.\(\)\[\]\-][^0-9]|).*(19\d{2}|20\d{2})*"
+                @"(.+[^_\,\.\(\)\[\]\-])[ _\.\(\)\[\]\-]+(19\d{2}|20\d{2})([ _\,\.\(\)\[\]\-][^0-9]|).*(19\d{2}|20\d{2})*",
+                @"(.+\w)\W+\p{Ps}(19[0-9]{2}|20[0-9]{2})\p{Pe}", // Prefer year enclosed in parenthesis (){}[]
+                @"(.+\w)\W+(19[0-9]{2}|20[0-9]{2})(\W|$)", // Secondary year surrounded by non-word chars
             };
             };
 
 
             CleanStrings = new[]
             CleanStrings = new[]

+ 0 - 1
Emby.Naming/Video/CleanDateTimeParser.cs

@@ -32,7 +32,6 @@ namespace Emby.Naming.Video
             var match = expression.Match(name);
             var match = expression.Match(name);
 
 
             if (match.Success
             if (match.Success
-                && match.Groups.Count == 5
                 && match.Groups[1].Success
                 && match.Groups[1].Success
                 && match.Groups[2].Success
                 && match.Groups[2].Success
                 && int.TryParse(match.Groups[2].Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var year))
                 && int.TryParse(match.Groups[2].Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var year))