alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-05 07:18:47 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #2232 from MediaBrowser/beta

Browse Source 
Beta
This commit is contained in:
Luke
2016-10-13 17:19:50 -04:00
committed by GitHub
parent 94ddbfd57f 1c169b5b40
commit 3f438cdf7b
10 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
View File

@@ -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;