2 files changed, 18 insertions, 7 deletions
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 2010b495c..2c683991c 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -1366,6 +1366,7 @@ namespace MediaBrowser.Server.Implementations.Dto
 
             dto.RecursiveItemCount = recursiveItemCount;
             dto.UserData.UnplayedItemCount = unplayed;
+            dto.RecursiveUnplayedItemCount = unplayed;
 
             if (recursiveItemCount > 0)
             {
diff --git a/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
index 07c937389..ee2114aa4 100644
--- a/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
+++ b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
@@ -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);