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

fix web playback

Browse Source
This commit is contained in:
Luke Pulverenti
2015-03-15 15:22:04 -04:00
parent 280ab32ec1
commit 003886a476
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
MediaBrowser.Server.Implementations/Library/UserViewManager.cs
View File

@@ -52,8 +52,6 @@ namespace MediaBrowser.Server.Implementations.Library
.OfType<Folder>()
.ToList();
var list = new List<Folder>();
var excludeFolderIds = user.Configuration.ExcludeFoldersFromGrouping.Select(i => new Guid(i)).ToList();
var standaloneFolders = folders
@@ -65,7 +63,21 @@ namespace MediaBrowser.Server.Implementations.Library
.OfType<ICollectionFolder>()
.ToList();
list.AddRange(standaloneFolders);
var list = new List<Folder>();
if (_config.Configuration.EnableUserSpecificUserViews)
{
foreach (var folder in standaloneFolders)
{
var collectionFolder = folder as ICollectionFolder;
var folderViewType = collectionFolder == null ? null : collectionFolder.CollectionType;
list.Add(await GetUserView(folder.Id, folder.Name, folderViewType, string.Empty, user, cancellationToken).ConfigureAwait(false));
}
}
else
{
list.AddRange(standaloneFolders);
}
if (foldersWithViewTypes.Any(i => string.Equals(i.CollectionType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase)) ||
foldersWithViewTypes.Any(i => string.IsNullOrWhiteSpace(i.CollectionType)))
@@ -169,6 +181,11 @@ namespace MediaBrowser.Server.Implementations.Library
return _libraryManager.GetNamedView(user, name, type, sortName, cancellationToken);
}
public Task<UserView> GetUserView(Guid parentId, string name, string type, string sortName, User user, CancellationToken cancellationToken)
{
return _libraryManager.GetNamedView(user, name, parentId.ToString("N"), type, sortName, cancellationToken);
}
public List<Tuple<BaseItem, List<BaseItem>>> GetLatestItems(LatestItemsQuery request)
{
var user = _userManager.GetUserById(request.UserId);