1 files changed, 13 insertions, 21 deletions

diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index c88cefdb3..4bcbfaf95 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -326,7 +326,7 @@ namespace MediaBrowser.Server.Implementations.Dto
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>List{System.String}.</returns>
-        private List<Guid> GetBackdropImageTags(BaseItem item)
+        private List<string> GetBackdropImageTags(BaseItem item)
         {
             return GetCacheTags(item, ImageType.Backdrop).ToList();
         }
@@ -336,26 +336,25 @@ namespace MediaBrowser.Server.Implementations.Dto
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>List{Guid}.</returns>
-        private List<Guid> GetScreenshotImageTags(BaseItem item)
+        private List<string> GetScreenshotImageTags(BaseItem item)
         {
             var hasScreenshots = item as IHasScreenshots;
             if (hasScreenshots == null)
             {
-                return new List<Guid>();
+                return new List<string>();
             }
             return GetCacheTags(item, ImageType.Screenshot).ToList();
         }
 
-        private IEnumerable<Guid> GetCacheTags(BaseItem item, ImageType type)
+        private IEnumerable<string> GetCacheTags(BaseItem item, ImageType type)
         {
             return item.GetImages(type)
                 .Select(p => GetImageCacheTag(item, p))
-                .Where(i => i.HasValue)
-                .Select(i => i.Value)
+                .Where(i => i != null)
                 .ToList();
         }
 
-        private Guid? GetImageCacheTag(BaseItem item, ImageType type)
+        private string GetImageCacheTag(BaseItem item, ImageType type)
         {
             try
             {
@@ -368,7 +367,7 @@ namespace MediaBrowser.Server.Implementations.Dto
             }
         }
 
-        private Guid? GetImageCacheTag(BaseItem item, ItemImageInfo image)
+        private string GetImageCacheTag(BaseItem item, ItemImageInfo image)
         {
             try
             {
@@ -430,6 +429,7 @@ namespace MediaBrowser.Server.Implementations.Dto
                 if (dictionary.TryGetValue(person.Name, out entity))
                 {
                     baseItemPerson.PrimaryImageTag = GetImageCacheTag(entity, ImageType.Primary);
+                    baseItemPerson.Id = entity.Id.ToString("N");
                 }
 
                 dto.People[i] = baseItemPerson;
@@ -677,7 +677,7 @@ namespace MediaBrowser.Server.Implementations.Dto
                 dto.Genres = item.Genres;
             }
 
-            dto.ImageTags = new Dictionary<ImageType, Guid>();
+            dto.ImageTags = new Dictionary<ImageType, string>();
 
             // Prevent implicitly captured closure
             var currentItem = item;
@@ -685,9 +685,9 @@ namespace MediaBrowser.Server.Implementations.Dto
             {
                 var tag = GetImageCacheTag(item, image);
 
-                if (tag.HasValue)
+                if (tag != null)
                 {
-                    dto.ImageTags[image.Type] = tag.Value;
+                    dto.ImageTags[image.Type] = tag;
                 }
             }
 
@@ -1166,7 +1166,7 @@ namespace MediaBrowser.Server.Implementations.Dto
             }).ThenBy(i => i.Video3DFormat.HasValue ? 1 : 0)
             .ThenByDescending(i =>
             {
-                var stream = i.MediaStreams.FirstOrDefault(m => m.Type == MediaStreamType.Video);
+                var stream = i.VideoStream;
 
                 return stream == null || stream.Width == null ? 0 : stream.Width.Value;
             })
@@ -1216,7 +1216,7 @@ namespace MediaBrowser.Server.Implementations.Dto
                 }
             }
 
-            var bitrate = i.TotalBitrate ?? 
+            var bitrate = i.TotalBitrate ??
                 info.MediaStreams.Where(m => m.Type != MediaStreamType.Subtitle && !string.Equals(m.Codec, "mjpeg", StringComparison.OrdinalIgnoreCase))
                 .Select(m => m.BitRate ?? 0)
                 .Sum();
@@ -1420,7 +1420,6 @@ namespace MediaBrowser.Server.Implementations.Dto
         /// <returns>Task.</returns>
         private void SetSpecialCounts(Folder folder, User user, BaseItemDto dto, List<ItemFields> fields)
         {
-            var rcentlyAddedItemCount = 0;
             var recursiveItemCount = 0;
             var unplayed = 0;
             long runtime = 0;
@@ -1457,12 +1456,6 @@ namespace MediaBrowser.Server.Implementations.Dto
 
                 recursiveItemCount++;
 
-                // Check is recently added
-                //if (child.IsRecentlyAdded())
-                //{
-                //    rcentlyAddedItemCount++;
-                //}
-
                 var isUnplayed = true;
 
                 // Incrememt totalPercentPlayed
@@ -1491,7 +1484,6 @@ namespace MediaBrowser.Server.Implementations.Dto
             }
 
             dto.RecursiveItemCount = recursiveItemCount;
-            dto.RecentlyAddedItemCount = rcentlyAddedItemCount;
             dto.RecursiveUnplayedItemCount = unplayed;
 
             if (recursiveItemCount > 0)