From 2864e4a339d03fb57939b9771ec9c6a9dbed9987 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 8 Jan 2014 00:25:37 -0500 Subject: support linux share paths in episode tv utils --- MediaBrowser.Controller/Library/TVUtils.cs | 36 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'MediaBrowser.Controller/Library') diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs index d7504a86e..67d78fa89 100644 --- a/MediaBrowser.Controller/Library/TVUtils.cs +++ b/MediaBrowser.Controller/Library/TVUtils.cs @@ -45,49 +45,49 @@ namespace MediaBrowser.Controller.Library private static readonly Regex[] EpisodeExpressions = new[] { new Regex( - @".*\\[sS]?(?\d{1,4})[xX](?\d{1,3})[^\\]*$", + @".*(\\|\/)[sS]?(?\d{1,4})[xX](?\d{1,3})[^\\\/]*$", RegexOptions.Compiled), new Regex( - @".*\\[sS](?\d{1,4})[x,X]?[eE](?\d{1,3})[^\\]*$", + @".*(\\|\/)[sS](?\d{1,4})[x,X]?[eE](?\d{1,3})[^\\\/]*$", RegexOptions.Compiled), new Regex( - @".*\\(?((?![sS]?\d{1,4}[xX]\d{1,3})[^\\])*)?([sS]?(?\d{1,4})[xX](?\d{1,3}))[^\\]*$", + @".*(\\|\/)(?((?![sS]?\d{1,4}[xX]\d{1,3})[^\\\/])*)?([sS]?(?\d{1,4})[xX](?\d{1,3}))[^\\\/]*$", RegexOptions.Compiled), new Regex( - @".*\\(?[^\\]*)[sS](?\d{1,4})[xX\.]?[eE](?\d{1,3})[^\\]*$", + @".*(\\|\/)(?[^\\\/]*)[sS](?\d{1,4})[xX\.]?[eE](?\d{1,3})[^\\\/]*$", RegexOptions.Compiled) }; private static readonly Regex[] MultipleEpisodeExpressions = new[] { new Regex( - @".*\\[sS]?(?\d{1,4})[xX](?\d{1,3})((-| - )\d{1,4}[eExX](?\d{1,3}))+[^\\]*$", + @".*(\\|\/)[sS]?(?\d{1,4})[xX](?\d{1,3})((-| - )\d{1,4}[eExX](?\d{1,3}))+[^\\\/]*$", RegexOptions.Compiled), new Regex( - @".*\\[sS]?(?\d{1,4})[xX](?\d{1,3})((-| - )\d{1,4}[xX][eE](?\d{1,3}))+[^\\]*$", + @".*(\\|\/)[sS]?(?\d{1,4})[xX](?\d{1,3})((-| - )\d{1,4}[xX][eE](?\d{1,3}))+[^\\\/]*$", RegexOptions.Compiled), new Regex( - @".*\\[sS]?(?\d{1,4})[xX](?\d{1,3})((-| - )?[xXeE](?\d{1,3}))+[^\\]*$", + @".*(\\|\/)[sS]?(?\d{1,4})[xX](?\d{1,3})((-| - )?[xXeE](?\d{1,3}))+[^\\\/]*$", RegexOptions.Compiled), new Regex( - @".*\\[sS]?(?\d{1,4})[xX](?\d{1,3})(-[xE]?[eE]?(?\d{1,3}))+[^\\]*$", + @".*(\\|\/)[sS]?(?\d{1,4})[xX](?\d{1,3})(-[xE]?[eE]?(?\d{1,3}))+[^\\\/]*$", RegexOptions.Compiled), new Regex( - @".*\\(?((?![sS]?\d{1,4}[xX]\d{1,3})[^\\])*)?([sS]?(?\d{1,4})[xX](?\d{1,3}))((-| - )\d{1,4}[xXeE](?\d{1,3}))+[^\\]*$", + @".*(\\|\/)(?((?![sS]?\d{1,4}[xX]\d{1,3})[^\\\/])*)?([sS]?(?\d{1,4})[xX](?\d{1,3}))((-| - )\d{1,4}[xXeE](?\d{1,3}))+[^\\\/]*$", RegexOptions.Compiled), new Regex( - @".*\\(?((?![sS]?\d{1,4}[xX]\d{1,3})[^\\])*)?([sS]?(?\d{1,4})[xX](?\d{1,3}))((-| - )\d{1,4}[xX][eE](?\d{1,3}))+[^\\]*$", + @".*(\\|\/)(?((?![sS]?\d{1,4}[xX]\d{1,3})[^\\\/])*)?([sS]?(?\d{1,4})[xX](?\d{1,3}))((-| - )\d{1,4}[xX][eE](?\d{1,3}))+[^\\\/]*$", RegexOptions.Compiled), new Regex( - @".*\\(?((?![sS]?\d{1,4}[xX]\d{1,3})[^\\])*)?([sS]?(?\d{1,4})[xX](?\d{1,3}))((-| - )?[xXeE](?\d{1,3}))+[^\\]*$", + @".*(\\|\/)(?((?![sS]?\d{1,4}[xX]\d{1,3})[^\\\/])*)?([sS]?(?\d{1,4})[xX](?\d{1,3}))((-| - )?[xXeE](?\d{1,3}))+[^\\\/]*$", RegexOptions.Compiled), new Regex( - @".*\\(?((?![sS]?\d{1,4}[xX]\d{1,3})[^\\])*)?([sS]?(?\d{1,4})[xX](?\d{1,3}))(-[xX]?[eE]?(?\d{1,3}))+[^\\]*$", + @".*(\\|\/)(?((?![sS]?\d{1,4}[xX]\d{1,3})[^\\\/])*)?([sS]?(?\d{1,4})[xX](?\d{1,3}))(-[xX]?[eE]?(?\d{1,3}))+[^\\\/]*$", RegexOptions.Compiled), new Regex( - @".*\\(?[^\\]*)[sS](?\d{1,4})[xX\.]?[eE](?\d{1,3})((-| - )?[xXeE](?\d{1,3}))+[^\\]*$", + @".*(\\|\/)(?[^\\\/]*)[sS](?\d{1,4})[xX\.]?[eE](?\d{1,3})((-| - )?[xXeE](?\d{1,3}))+[^\\\/]*$", RegexOptions.Compiled), new Regex( - @".*\\(?[^\\]*)[sS](?\d{1,4})[xX\.]?[eE](?\d{1,3})(-[xX]?[eE]?(?\d{1,3}))+[^\\]*$", + @".*(\\|\/)(?[^\\\/]*)[sS](?\d{1,4})[xX\.]?[eE](?\d{1,3})(-[xX]?[eE]?(?\d{1,3}))+[^\\\/]*$", RegexOptions.Compiled) }; @@ -97,19 +97,19 @@ namespace MediaBrowser.Controller.Library private static readonly Regex[] EpisodeExpressionsInASeasonFolder = new[] { new Regex( - @".*\\(?\d{1,2})\s?-\s?[^\\]*$", + @".*(\\|\/)(?\d{1,2})\s?-\s?[^\\\/]*$", RegexOptions.Compiled), // 01 - blah.avi, 01-blah.avi new Regex( - @".*\\(?\d{1,2})[^\d\\]*[^\\]*$", + @".*(\\|\/)(?\d{1,2})[^\d\\]*[^\\\/]*$", RegexOptions.Compiled), // 01.avi, 01.blah.avi "01 - 22 blah.avi" new Regex( - @".*\\(?\d)(?\d{1,2})[^\d\\]+[^\\]*$", + @".*(\\|\/)(?\d)(?\d{1,2})[^\d\\]+[^\\\/]*$", RegexOptions.Compiled), // 01.avi, 01.blah.avi new Regex( - @".*\\\D*\d+(?\d{2})", + @".*(\\|\/)\D*\d+(?\d{2})", RegexOptions.Compiled) // hell0 - 101 - hello.avi -- cgit v1.2.3