starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-28 03:34:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jellyfin/master' into emby-namig-nullable

Browse Source
This commit is contained in:
Stepan
2020-11-10 12:42:49 +01:00
parent 3d1076ae42 cdf979efef
commit c0747512d6
144 changed files with 1722 additions and 1331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@@ -2440,6 +2440,21 @@ namespace Emby.Server.Implementations.Library
new SubtitleResolver(BaseItem.LocalizationManager).AddExternalSubtitleStreams(streams, videoPath, streams.Count, files);
}
public BaseItem GetParentItem(string parentId, Guid? userId)
{
if (!string.IsNullOrEmpty(parentId))
{
return GetItemById(new Guid(parentId));
}
if (userId.HasValue && userId != Guid.Empty)
{
return GetUserRootFolder();
}
return RootFolder;
}
/// <inheritdoc />
public bool IsVideoFile(string path)
{