From 8879240fc1128f6da99a985b68aef46a940a7ab7 Mon Sep 17 00:00:00 2001 From: Luis Miguel Almánzar Date: Thu, 27 Jun 2013 22:12:21 -0400 Subject: Fixes #285 - Support tv with four digit seasons --- MediaBrowser.Controller/Library/TVUtils.cs | 42 +++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'MediaBrowser.Controller/Library/TVUtils.cs') diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs index 03df934cf..d8a715b0f 100644 --- a/MediaBrowser.Controller/Library/TVUtils.cs +++ b/MediaBrowser.Controller/Library/TVUtils.cs @@ -43,49 +43,49 @@ namespace MediaBrowser.Controller.Library private static readonly Regex[] EpisodeExpressions = new[] { new Regex( - @".*\\[s|S]?(?\d{1,2})[x|X](?\d{1,3})[^\\]*$", + @".*\\[s|S]?(?\d{1,4})[x|X](?\d{1,3})[^\\]*$", RegexOptions.Compiled), new Regex( - @".*\\[s|S](?\d{1,2})[x,X]?[e|E](?\d{1,3})[^\\]*$", + @".*\\[s|S](?\d{1,4})[x,X]?[e|E](?\d{1,3})[^\\]*$", RegexOptions.Compiled), new Regex( - @".*\\(?((?![s|S]?\d{1,2}[x|X]\d{1,3})[^\\])*)?([s|S]?(?\d{1,2})[x|X](?\d{1,3}))[^\\]*$", + @".*\\(?((?![s|S]?\d{1,4}[x|X]\d{1,3})[^\\])*)?([s|S]?(?\d{1,4})[x|X](?\d{1,3}))[^\\]*$", RegexOptions.Compiled), new Regex( - @".*\\(?[^\\]*)[s|S](?\d{1,2})[x|X|\.]?[e|E](?\d{1,3})[^\\]*$", + @".*\\(?[^\\]*)[s|S](?\d{1,4})[x|X|\.]?[e|E](?\d{1,3})[^\\]*$", RegexOptions.Compiled) }; private static readonly Regex[] MultipleEpisodeExpressions = new[] { new Regex( - @".*\\[s|S]?(?\d{1,2})[x|X](?\d{1,3})([ |-]{1,3}\d{1,2}[e|E|x|X](?\d{1,3}))+[^\\]*$", + @".*\\[s|S]?(?\d{1,4})[x|X](?\d{1,3})([ |-]{1,3}\d{1,4}[e|E|x|X](?\d{1,3}))+[^\\]*$", RegexOptions.Compiled), - new Regex( - @".*\\[s|S]?(?\d{1,2})[x|X](?\d{1,3})([ |-]{1,3}\d{1,2}[x|X][e|E](?\d{1,3}))+[^\\]*$", + new Regex( + @".*\\[s|S]?(?\d{1,4})[x|X](?\d{1,3})([ |-]{1,3}\d{1,4}[x|X][e|E](?\d{1,3}))+[^\\]*$", RegexOptions.Compiled), - new Regex( - @".*\\[s|S]?(?\d{1,2})[x|X](?\d{1,3})([ |-]{0,3}[x|X|e|E](?\d{1,3}))+[^\\]*$", + new Regex( + @".*\\[s|S]?(?\d{1,4})[x|X](?\d{1,3})([ |-]{0,3}[x|X|e|E](?\d{1,3}))+[^\\]*$", RegexOptions.Compiled), - new Regex( - @".*\\[s|S]?(?\d{1,2})[x|X](?\d{1,3})([ |-]{1,3}[x|E]?[e|E]?(?\d{1,3}))+[^\\]*$", + new Regex( + @".*\\[s|S]?(?\d{1,4})[x|X](?\d{1,3})([ |-]{1,3}[x|E]?[e|E]?(?\d{1,3}))+[^\\]*$", RegexOptions.Compiled), new Regex( - @".*\\(?((?![s|S]?\d{1,2}[x|X]\d{1,3})[^\\])*)?([s|S]?(?\d{1,2})[x|X](?\d{1,3}))([ |-]{1,3}\d{1,2}[x|X|e|E](?\d{1,3}))+[^\\]*$", + @".*\\(?((?![s|S]?\d{1,4}[x|X]\d{1,3})[^\\])*)?([s|S]?(?\d{1,4})[x|X](?\d{1,3}))([ |-]{1,3}\d{1,4}[x|X|e|E](?\d{1,3}))+[^\\]*$", RegexOptions.Compiled), - new Regex( - @".*\\(?((?![s|S]?\d{1,2}[x|X]\d{1,3})[^\\])*)?([s|S]?(?\d{1,2})[x|X](?\d{1,3}))([ |-]{1,3}\d{1,2}[x|X][e|E](?\d{1,3}))+[^\\]*$", + new Regex( + @".*\\(?((?![s|S]?\d{1,4}[x|X]\d{1,3})[^\\])*)?([s|S]?(?\d{1,4})[x|X](?\d{1,3}))([ |-]{1,3}\d{1,4}[x|X][e|E](?\d{1,3}))+[^\\]*$", RegexOptions.Compiled), - new Regex( - @".*\\(?((?![s|S]?\d{1,2}[x|X]\d{1,3})[^\\])*)?([s|S]?(?\d{1,2})[x|X](?\d{1,3}))([ |-]{0,3}[x|X|e|E](?\d{1,3}))+[^\\]*$", + new Regex( + @".*\\(?((?![s|S]?\d{1,4}[x|X]\d{1,3})[^\\])*)?([s|S]?(?\d{1,4})[x|X](?\d{1,3}))([ |-]{0,3}[x|X|e|E](?\d{1,3}))+[^\\]*$", RegexOptions.Compiled), - new Regex( - @".*\\(?((?![s|S]?\d{1,2}[x|X]\d{1,3})[^\\])*)?([s|S]?(?\d{1,2})[x|X](?\d{1,3}))([ |-]{1,3}[x|X]?[e|E]?(?\d{1,3}))+[^\\]*$", + new Regex( + @".*\\(?((?![s|S]?\d{1,4}[x|X]\d{1,3})[^\\])*)?([s|S]?(?\d{1,4})[x|X](?\d{1,3}))([ |-]{1,3}[x|X]?[e|E]?(?\d{1,3}))+[^\\]*$", RegexOptions.Compiled), new Regex( - @".*\\(?[^\\]*)[s|S](?\d{1,2})[x|X|\.]?[e|E](?\d{1,3})([ |-]{0,3}[x|X|e|E](?\d{1,3}))+[^\\]*$", + @".*\\(?[^\\]*)[s|S](?\d{1,4})[x|X|\.]?[e|E](?\d{1,3})([ |-]{0,3}[x|X|e|E](?\d{1,3}))+[^\\]*$", RegexOptions.Compiled), - new Regex( - @".*\\(?[^\\]*)[s|S](?\d{1,2})[x|X|\.]?[e|E](?\d{1,3})([ |-]{1,3}[x|X]?[e|E]?(?\d{1,3}))+[^\\]*$", + new Regex( + @".*\\(?[^\\]*)[s|S](?\d{1,4})[x|X|\.]?[e|E](?\d{1,3})([ |-]{1,3}[x|X]?[e|E]?(?\d{1,3}))+[^\\]*$", RegexOptions.Compiled) }; -- cgit v1.2.3