diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-13 14:44:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-13 14:44:51 -0400 |
| commit | 61030bb1093f77f4ca7a742291179351acbc5e92 (patch) | |
| tree | f41ba213b4774e7b492421499a6f366c067f5f19 /MediaBrowser.Server.Implementations | |
| parent | 2ef130260c8e4684865e7c95f5cd0a075397ade0 (diff) | |
| parent | b9c430059a3097387ea925a3f5588c3042bb2464 (diff) | |
Merge pull request #2230 from MediaBrowser/dev
fix playlist deletion
Diffstat (limited to 'MediaBrowser.Server.Implementations')
| -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..870e8b55a 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; |