diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-13 17:19:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-13 17:19:50 -0400 |
| commit | 3f438cdf7b991b77c9d80e07b71933240b726dc6 (patch) | |
| tree | f43b53ae3da95d74d856e444e72898e4515ebe0c /MediaBrowser.Server.Implementations/Library | |
| parent | 94ddbfd57f63cc484d232894bea1e2f183eaaf7e (diff) | |
| parent | 1c169b5b407c662a8ac0aa0f10bd37ce72e62901 (diff) | |
Merge pull request #2232 from MediaBrowser/beta
Beta
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs index c82825007..1e480e265 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs @@ -59,18 +59,18 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV return null; } - if (args.ContainsFileSystemEntryByName("tvshow.nfo")) - { - return new Series - { - Path = args.Path, - Name = Path.GetFileName(args.Path) - }; - } - var collectionType = args.GetCollectionType(); if (string.Equals(collectionType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase)) { + //if (args.ContainsFileSystemEntryByName("tvshow.nfo")) + //{ + // return new Series + // { + // Path = args.Path, + // Name = Path.GetFileName(args.Path) + // }; + //} + var configuredContentType = _libraryManager.GetConfiguredContentType(args.Path); if (!string.Equals(configuredContentType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase)) { @@ -83,6 +83,15 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV } else if (string.IsNullOrWhiteSpace(collectionType)) { + if (args.ContainsFileSystemEntryByName("tvshow.nfo")) + { + return new Series + { + Path = args.Path, + Name = Path.GetFileName(args.Path) + }; + } + if (args.Parent.IsRoot) { return null; |