alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 09:34:44 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

3.0.5346.38509

Browse Source
This commit is contained in:
Luke Pulverenti
2014-08-21 22:24:38 -04:00
parent 88fce3670a
commit ca66390e24
15 changed files with 512 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View File

@@ -1366,6 +1366,7 @@ namespace MediaBrowser.Server.Implementations.Dto
dto.RecursiveItemCount = recursiveItemCount;
dto.UserData.UnplayedItemCount = unplayed;
dto.RecursiveUnplayedItemCount = unplayed;
if (recursiveItemCount > 0)
{

24
MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
View File

@@ -82,7 +82,7 @@ namespace MediaBrowser.Server.Implementations.Playlists
if (folder != null)
{
options.MediaType = folder.GetRecursiveChildren()
.Where(i => !i.IsFolder)
.Where(i => !i.IsFolder && i.SupportsAddingToPlaylist)
.Select(i => i.MediaType)
.FirstOrDefault(i => !string.IsNullOrWhiteSpace(i));
}
@@ -100,6 +100,8 @@ namespace MediaBrowser.Server.Implementations.Playlists
throw new ArgumentException("A playlist media type is required.");
}
var user = _userManager.GetUserById(new Guid(options.UserId));
var path = Path.Combine(parentFolder.Path, folderName);
path = GetTargetPath(path);
@@ -126,7 +128,7 @@ namespace MediaBrowser.Server.Implementations.Playlists
if (options.ItemIdList.Count > 0)
{
await AddToPlaylist(playlist.Id.ToString("N"), options.ItemIdList);
await AddToPlaylistInternal(playlist.Id.ToString("N"), options.ItemIdList, user);
}
return new PlaylistCreationResult
@@ -151,14 +153,21 @@ namespace MediaBrowser.Server.Implementations.Playlists
return path;
}
private IEnumerable<BaseItem> GetPlaylistItems(IEnumerable<string> itemIds, string playlistMediaType)
private IEnumerable<BaseItem> GetPlaylistItems(IEnumerable<string> itemIds, string playlistMediaType, User user)
{
var items = itemIds.Select(i => _libraryManager.GetItemById(i)).Where(i => i != null);
return Playlist.GetPlaylistItems(playlistMediaType, items, null);
return Playlist.GetPlaylistItems(playlistMediaType, items, user);
}
public async Task AddToPlaylist(string playlistId, IEnumerable<string> itemIds)
public Task AddToPlaylist(string playlistId, IEnumerable<string> itemIds, string userId)
{
var user = string.IsNullOrWhiteSpace(userId) ? null : _userManager.GetUserById(new Guid(userId));
return AddToPlaylistInternal(playlistId, itemIds, user);
}
private async Task AddToPlaylistInternal(string playlistId, IEnumerable<string> itemIds, User user)
{
var playlist = _libraryManager.GetItemById(playlistId) as Playlist;
@@ -170,7 +179,9 @@ namespace MediaBrowser.Server.Implementations.Playlists
var list = new List<LinkedChild>();
var itemList = new List<BaseItem>();
var items = GetPlaylistItems(itemIds, playlist.MediaType).ToList();
var items = GetPlaylistItems(itemIds, playlist.MediaType, user)
.Where(i => i.SupportsAddingToPlaylist)
.ToList();
foreach (var item in items)
{
@@ -183,7 +194,6 @@ namespace MediaBrowser.Server.Implementations.Playlists
await playlist.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
await playlist.RefreshMetadata(new MetadataRefreshOptions
{
ForceSave = true
}, CancellationToken.None).ConfigureAwait(false);