Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

2 files changed, 64 insertions, 3 deletions

diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs
index 7af9cb496c..39b139f02b 100644
--- a/MediaBrowser.Controller/Dto/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Dto/DtoBuilder.cs
@@ -63,7 +63,7 @@ namespace MediaBrowser.Controller.Dto
 
             if (fields.Contains(ItemFields.Studios))
             {
-                dto.Studios = item.Studios;
+                tasks.Add(AttachStudios(dto, item));
             }
 
             if (fields.Contains(ItemFields.People))
@@ -124,7 +124,7 @@ namespace MediaBrowser.Controller.Dto
 
             if (fields.Contains(ItemFields.Studios))
             {
-                dto.Studios = item.Studios;
+                tasks.Add(AttachStudios(dto, item));
             }
 
             if (fields.Contains(ItemFields.People))
@@ -645,6 +645,67 @@ namespace MediaBrowser.Controller.Dto
         }
 
         /// <summary>
+        /// Attaches the studios.
+        /// </summary>
+        /// <param name="dto">The dto.</param>
+        /// <param name="item">The item.</param>
+        /// <returns>Task.</returns>
+        private async Task AttachStudios(BaseItemDto dto, BaseItem item)
+        {
+            if (item.Studios == null)
+            {
+                return;
+            }
+
+            var studios = item.Studios.ToList();
+
+            dto.Studios = new StudioDto[studios.Count];
+
+            var entities = await Task.WhenAll(studios.Distinct(StringComparer.OrdinalIgnoreCase).Select(c =>
+
+                    Task.Run(async () =>
+                    {
+                        try
+                        {
+                            return await _libraryManager.GetStudio(c).ConfigureAwait(false);
+                        }
+                        catch (IOException ex)
+                        {
+                            _logger.ErrorException("Error getting studio {0}", ex, c);
+                            return null;
+                        }
+                    })
+
+            )).ConfigureAwait(false);
+
+            var dictionary = entities.ToDictionary(i => i.Name, StringComparer.OrdinalIgnoreCase);
+
+            for (var i = 0; i < studios.Count; i++)
+            {
+                var studio = studios[i];
+
+                var studioDto = new StudioDto
+                {
+                    Name = studio
+                };
+
+                Studio entity;
+
+                if (dictionary.TryGetValue(studio, out entity))
+                {
+                    var primaryImagePath = entity.PrimaryImagePath;
+
+                    if (!string.IsNullOrEmpty(primaryImagePath))
+                    {
+                        studioDto.PrimaryImageTag = Kernel.Instance.ImageManager.GetImageCacheTag(entity, ImageType.Primary, primaryImagePath);
+                    }
+                }
+
+                dto.Studios[i] = studioDto;
+            }
+        }
+
+        /// <summary>
         /// If an item does not any backdrops, this can be used to find the first parent that does have one
         /// </summary>
         /// <param name="item">The item.</param>
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 463e164256..63b6f377bc 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -483,7 +483,7 @@ namespace MediaBrowser.Controller.Entities
         {
             get
             {
-                return ActualChildren.Values;
+                return ActualChildren.Values.ToList();
             }
         }