alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-25 03:24:47 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

added content type selection

Browse Source
This commit is contained in:
Luke Pulverenti
2014-12-22 01:50:29 -05:00
parent 98ae564226
commit 498b58aad0
6 changed files with 82 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@@ -560,10 +560,9 @@ namespace MediaBrowser.Server.Implementations.Library
}
public BaseItem ResolvePath(FileSystemInfo fileInfo,
Folder parent = null,
string collectionType = null)
Folder parent = null)
{
return ResolvePath(fileInfo, new DirectoryService(_logger), parent, collectionType);
return ResolvePath(fileInfo, new DirectoryService(_logger), parent);
}
private BaseItem ResolvePath(FileSystemInfo fileInfo, IDirectoryService directoryService, Folder parent = null, string collectionType = null)
@@ -573,10 +572,17 @@ namespace MediaBrowser.Server.Implementations.Library
throw new ArgumentNullException("fileInfo");
}
var fullPath = fileInfo.FullName;
if (string.IsNullOrWhiteSpace(collectionType))
{
collectionType = GetConfiguredContentType(fullPath);
}
var args = new ItemResolveArgs(ConfigurationManager.ApplicationPaths, this, directoryService)
{
Parent = parent,
Path = fileInfo.FullName,
Path = fullPath,
FileInfo = fileInfo,
CollectionType = collectionType
};
@@ -1548,12 +1554,43 @@ namespace MediaBrowser.Server.Implementations.Library
public string GetContentType(BaseItem item)
{
return GetInheritedContentType(item);
// Types cannot be overridden, so go from the top down until we find a configured content type
var type = GetTopFolderContentType(item);
if (!string.IsNullOrWhiteSpace(type))
{
return type;
}
type = GetInheritedContentType(item);
if (!string.IsNullOrWhiteSpace(type))
{
return type;
}
return GetConfiguredContentType(item);
}
public string GetInheritedContentType(BaseItem item)
{
return GetTopFolderContentType(item);
return item.Parents
.Select(GetConfiguredContentType)
.LastOrDefault(i => !string.IsNullOrWhiteSpace(i));
}
private string GetConfiguredContentType(BaseItem item)
{
return GetConfiguredContentType(item.ContainingFolderPath);
}
private string GetConfiguredContentType(string path)
{
var type = ConfigurationManager.Configuration.ContentTypes
.FirstOrDefault(i => string.Equals(i.Name, path, StringComparison.OrdinalIgnoreCase) || _fileSystem.ContainsSubPath(i.Name, path));
return type == null ? null : type.Value;
}
private string GetTopFolderContentType(BaseItem item)

4
MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
View File

@@ -79,7 +79,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
return ResolveVideos<Video>(parent, files, directoryService, collectionType);
}
return ResolveVideos<Movie>(parent, files, directoryService, collectionType);
return ResolveVideos<Video>(parent, files, directoryService, collectionType);
}
if (string.Equals(collectionType, CollectionType.Movies, StringComparison.OrdinalIgnoreCase))
@@ -219,7 +219,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
}
else if (string.IsNullOrEmpty(collectionType))
{
item = ResolveVideo<Movie>(args, false);
item = ResolveVideo<Video>(args, false);
}
if (item != null)