diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-10-20 16:23:40 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-10-20 16:23:40 -0400 |
| commit | 1292eccfb57d82110d197d7fa2f1f6bbf01a7e18 (patch) | |
| tree | 1b0fc79b52662dc680a791162379c5ccc8ae3ef7 /MediaBrowser.Server.Implementations/Dto | |
| parent | 3be4aa8dc729f5899658790f43a1d1c182e7a243 (diff) | |
add reel
Diffstat (limited to 'MediaBrowser.Server.Implementations/Dto')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Dto/DtoService.cs | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index 366a5558b..3393876fc 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) |
