From 1292eccfb57d82110d197d7fa2f1f6bbf01a7e18 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 20 Oct 2014 16:23:40 -0400
Subject: add reel

---
 .../Dto/DtoService.cs                              | 27 ++++++++--------------
 1 file changed, 10 insertions(+), 17 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Dto')

diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 366a5558b1..3393876fce 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -72,22 +72,9 @@ namespace MediaBrowser.Server.Implementations.Dto
 
             if (byName != null && !(item is LiveTvChannel))
             {
-                IEnumerable<BaseItem> libraryItems;
-
-                var artist = item as MusicArtist;
-
-                if (artist == null || artist.IsAccessedByName)
-                {
-                    libraryItems = user != null ?
-                       user.RootFolder.GetRecursiveChildren(user) :
-                       _libraryManager.RootFolder.RecursiveChildren;
-                }
-                else
-                {
-                    libraryItems = user != null ?
-                       artist.GetRecursiveChildren(user) :
-                       artist.RecursiveChildren;
-                }
+                var libraryItems = user != null ?
+                   user.RootFolder.GetRecursiveChildren(user) :
+                   _libraryManager.RootFolder.RecursiveChildren;
 
                 SetItemByNameInfo(item, dto, byName.GetTaggedItems(libraryItems).ToList(), user);
 
@@ -398,7 +385,7 @@ namespace MediaBrowser.Server.Implementations.Dto
             }
 
             dto.Album = item.Album;
-            dto.Artists = string.IsNullOrEmpty(item.Artist) ? new List<string>() : new List<string> { item.Artist };
+            dto.Artists = item.Artists;
         }
 
         private void SetGameProperties(BaseItemDto dto, Game item)
@@ -1232,6 +1219,12 @@ namespace MediaBrowser.Server.Implementations.Dto
                 dto.ChannelId = channelItem.ChannelId;
                 dto.ChannelName = _channelManagerFactory().GetChannel(channelItem.ChannelId).Name;
             }
+
+            var channelMediaItem = item as IChannelMediaItem;
+            if (channelMediaItem != null)
+            {
+                dto.ExtraType = channelMediaItem.ExtraType;
+            }
         }
 
         private void AttachLinkedChildImages(BaseItemDto dto, Folder folder, User user)
-- 
cgit v1.2.3