updated nuget

3 files changed, 18 insertions, 7 deletions

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index fdffa60d0..34056c240 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1309,7 +1309,8 @@ namespace MediaBrowser.Controller.Entities
                 {
                     Path = file.FullName,
                     Type = type,
-                    DateModified = FileSystem.GetLastWriteTimeUtc(file)
+                    DateModified = FileSystem.GetLastWriteTimeUtc(file),
+                    Length = ((FileInfo)file).Length
                 });
             }
             else
@@ -1420,11 +1421,14 @@ namespace MediaBrowser.Controller.Entities
                     return null;
                 }
 
+                var info = new FileInfo(path);
+
                 return new ItemImageInfo
                 {
                     Path = path,
-                    DateModified = FileSystem.GetLastWriteTimeUtc(path),
-                    Type = imageType
+                    DateModified = FileSystem.GetLastWriteTimeUtc(info),
+                    Type = imageType,
+                    Length = info.Length
                 };
             }
 
diff --git a/MediaBrowser.Controller/Entities/ItemImageInfo.cs b/MediaBrowser.Controller/Entities/ItemImageInfo.cs
index 80aec6482..fe8193c5f 100644
--- a/MediaBrowser.Controller/Entities/ItemImageInfo.cs
+++ b/MediaBrowser.Controller/Entities/ItemImageInfo.cs
@@ -10,5 +10,7 @@ namespace MediaBrowser.Controller.Entities
         public ImageType Type { get; set; }
 
         public DateTime DateModified { get; set; }
+
+        public long? Length { get; set; }
     }
 }
diff --git a/MediaBrowser.Controller/Playlists/Playlist.cs b/MediaBrowser.Controller/Playlists/Playlist.cs
index 5ea535f4d..a2335b4bc 100644
--- a/MediaBrowser.Controller/Playlists/Playlist.cs
+++ b/MediaBrowser.Controller/Playlists/Playlist.cs
@@ -24,7 +24,7 @@ namespace MediaBrowser.Controller.Playlists
 
         public IEnumerable<BaseItem> GetManageableItems()
         {
-            return GetLinkedChildren();
+            return GetPlaylistItems(MediaType, GetLinkedChildren(), null);
         }
 
         private IEnumerable<BaseItem> GetPlayableItems(User user)
@@ -40,8 +40,12 @@ namespace MediaBrowser.Controller.Playlists
 
                 if (folder != null)
                 {
-                    var items = folder.GetRecursiveChildren(user, true)
-                        .Where(m => !m.IsFolder && string.Equals(m.MediaType, playlistMediaType, StringComparison.OrdinalIgnoreCase));
+                    var items = user == null
+                        ? folder.GetRecursiveChildren()
+                        : folder.GetRecursiveChildren(user, true);
+
+                    items = items
+                       .Where(m => !m.IsFolder);
 
                     if (!folder.IsPreSorted)
                     {
@@ -52,7 +56,8 @@ namespace MediaBrowser.Controller.Playlists
                 }
 
                 return new[] { i };
-            });
+
+            }).Where(m =>  string.Equals(m.MediaType, playlistMediaType, StringComparison.OrdinalIgnoreCase));
         }
 
         [IgnoreDataMember]