浏览代码

fixes #865 - Series Season folders

Luke Pulverenti 11 年之前
父节点
当前提交
d6aee6a2ed
共有 2 个文件被更改,包括 8 次插入0 次删除
  1. 6 0
      MediaBrowser.Controller/Library/TVUtils.cs
  2. 2 0
      MediaBrowser.Tests/Resolvers/TvUtilTests.cs

+ 6 - 0
MediaBrowser.Controller/Library/TVUtils.cs

@@ -129,6 +129,12 @@ namespace MediaBrowser.Controller.Library
                 return 0;
                 return 0;
             }
             }
 
 
+            int val;
+            if (int.TryParse(filename, NumberStyles.Integer, CultureInfo.InvariantCulture, out val))
+            {
+                return val;
+            }
+
             // Look for one of the season folder names
             // Look for one of the season folder names
             foreach (var name in SeasonFolderNames)
             foreach (var name in SeasonFolderNames)
             {
             {

+ 2 - 0
MediaBrowser.Tests/Resolvers/TvUtilTests.cs

@@ -161,6 +161,8 @@ namespace MediaBrowser.Tests.Resolvers
             Assert.AreEqual(1, TVUtils.GetSeasonNumberFromPath(@"\Drive\Season 1"));
             Assert.AreEqual(1, TVUtils.GetSeasonNumberFromPath(@"\Drive\Season 1"));
             Assert.AreEqual(1, TVUtils.GetSeasonNumberFromPath(@"\Drive\Season 1"));
             Assert.AreEqual(1, TVUtils.GetSeasonNumberFromPath(@"\Drive\Season 1"));
 
 
+            Assert.AreEqual(2, TVUtils.GetSeasonNumberFromPath(@"\Drive\Seinfeld\2"));
+            
             //Four Digits seasons
             //Four Digits seasons
             Assert.AreEqual(2009, TVUtils.GetSeasonNumberFromPath(@"\Drive\Season 2009"));
             Assert.AreEqual(2009, TVUtils.GetSeasonNumberFromPath(@"\Drive\Season 2009"));
             Assert.AreEqual(2009, TVUtils.GetSeasonNumberFromPath(@"\Drive\Season 2009"));
             Assert.AreEqual(2009, TVUtils.GetSeasonNumberFromPath(@"\Drive\Season 2009"));