diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-07-04 21:22:26 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-07-04 21:22:26 -0400 |
| commit | d6aee6a2ed9f0882c73765bb27962a30d9e4a5ce (patch) | |
| tree | a71a0db1c75a49a0e06a750a148486502f022aec | |
| parent | e2b3320f8000b695f5e45c79adc12b03505e4dff (diff) | |
fixes #865 - Series Season folders
| -rw-r--r-- | MediaBrowser.Controller/Library/TVUtils.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Tests/Resolvers/TvUtilTests.cs | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs index 0681a8cd1..88eadda00 100644 --- a/MediaBrowser.Controller/Library/TVUtils.cs +++ b/MediaBrowser.Controller/Library/TVUtils.cs @@ -129,6 +129,12 @@ namespace MediaBrowser.Controller.Library return 0; } + int val; + if (int.TryParse(filename, NumberStyles.Integer, CultureInfo.InvariantCulture, out val)) + { + return val; + } + // Look for one of the season folder names foreach (var name in SeasonFolderNames) { diff --git a/MediaBrowser.Tests/Resolvers/TvUtilTests.cs b/MediaBrowser.Tests/Resolvers/TvUtilTests.cs index bffd22f3e..c10dcd3c5 100644 --- a/MediaBrowser.Tests/Resolvers/TvUtilTests.cs +++ b/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(2, TVUtils.GetSeasonNumberFromPath(@"\Drive\Seinfeld\2")); + //Four Digits seasons Assert.AreEqual(2009, TVUtils.GetSeasonNumberFromPath(@"\Drive\Season 2009")); Assert.AreEqual(2009, TVUtils.GetSeasonNumberFromPath(@"\Drive\Season 2009")); |