Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 10 insertions, 4 deletions

diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs
index 64f3a3b4b..0681a8cd1 100644
--- a/MediaBrowser.Controller/Library/TVUtils.cs
+++ b/MediaBrowser.Controller/Library/TVUtils.cs
@@ -98,19 +98,19 @@ namespace MediaBrowser.Controller.Library
         private static readonly Regex[] EpisodeExpressionsWithoutSeason =
         {
             new Regex(
-                @".*[\\\/](?<epnumber>\d{1,3})\.\w+$",
+                @".*[\\\/](?<epnumber>\d{1,3})(-(?<endingepnumber>\d{2,3}))*\.\w+$",
                 RegexOptions.Compiled),
             // "01.avi"
             new Regex(
-                @".*(\\|\/)(?<epnumber>\d{1,2})\s?-\s?[^\\\/]*$",
+                @".*(\\|\/)(?<epnumber>\d{1,3})(-(?<endingepnumber>\d{2,3}))*\s?-\s?[^\\\/]*$",
                 RegexOptions.Compiled),
             // "01 - blah.avi", "01-blah.avi"
              new Regex(
-                @".*(\\|\/)(?<epnumber>\d{1,2})\.[^\\\/]+$",
+                @".*(\\|\/)(?<epnumber>\d{1,3})(-(?<endingepnumber>\d{2,3}))*\.[^\\\/]+$",
                 RegexOptions.Compiled),
             // "01.blah.avi"
             new Regex(
-                @".*[\\\/][^\\\/]* - (?<epnumber>\d{1,3})[^\\\/]*$",
+                @".*[\\\/][^\\\/]* - (?<epnumber>\d{1,3})(-(?<endingepnumber>\d{2,3}))*[^\\\/]*$",
                 RegexOptions.Compiled),
             // "blah - 01.avi", "blah 2 - 01.avi", "blah - 01 blah.avi", "blah 2 - 01 blah", "blah - 01 - blah.avi", "blah 2 - 01 - blah"
         };
@@ -284,6 +284,12 @@ namespace MediaBrowser.Controller.Library
                 if (m.Success && !string.IsNullOrEmpty(m.Groups["endingepnumber"].Value))
                     return ParseEpisodeNumber(m.Groups["endingepnumber"].Value);
             }
+            foreach (var r in EpisodeExpressionsWithoutSeason)
+            {
+                var m = r.Match(fl);
+                if (m.Success && !string.IsNullOrEmpty(m.Groups["endingepnumber"].Value))
+                    return ParseEpisodeNumber(m.Groups["endingepnumber"].Value);
+            }
             return null;
         }