diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-08-19 18:42:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-19 18:42:31 -0400 |
| commit | 1c494519c10f7aad08783c28348f6872023126d5 (patch) | |
| tree | 5aef83c994b7074b6889f601c4af46f3a686502d /Emby.Server.Implementations/Channels | |
| parent | c58db90c950c766321615eca236557d87b8d1b74 (diff) | |
| parent | a02968c568c97da544b239014506a03ecca35c09 (diff) | |
Merge pull request #2833 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/Channels')
| -rw-r--r-- | Emby.Server.Implementations/Channels/ChannelManager.cs | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/Emby.Server.Implementations/Channels/ChannelManager.cs b/Emby.Server.Implementations/Channels/ChannelManager.cs index e41e0ea87f..28a1503700 100644 --- a/Emby.Server.Implementations/Channels/ChannelManager.cs +++ b/Emby.Server.Implementations/Channels/ChannelManager.cs @@ -182,10 +182,8 @@ namespace Emby.Server.Implementations.Channels { }; - var returnList = (await _dtoService.GetBaseItemDtos(internalResult.Items, dtoOptions, user) + var returnItems = (await _dtoService.GetBaseItemDtos(internalResult.Items, dtoOptions, user) .ConfigureAwait(false)); - var returnItems = returnList - .ToArray(returnList.Count); var result = new QueryResult<BaseItemDto> { @@ -464,14 +462,14 @@ namespace Emby.Server.Implementations.Channels return _libraryManager.GetItemById(id) as Channel; } - public IEnumerable<ChannelFeatures> GetAllChannelFeatures() + public ChannelFeatures[] GetAllChannelFeatures() { return _libraryManager.GetItemIds(new InternalItemsQuery { IncludeItemTypes = new[] { typeof(Channel).Name }, SortBy = new[] { ItemSortBy.SortName } - }).Select(i => GetChannelFeatures(i.ToString("N"))); + }).Select(i => GetChannelFeatures(i.ToString("N"))).ToArray(); } public ChannelFeatures GetChannelFeatures(string id) @@ -511,10 +509,10 @@ namespace Emby.Server.Implementations.Channels { CanFilter = !features.MaxPageSize.HasValue, CanSearch = provider is ISearchableChannel, - ContentTypes = features.ContentTypes, - DefaultSortFields = features.DefaultSortFields, + ContentTypes = features.ContentTypes.ToArray(), + DefaultSortFields = features.DefaultSortFields.ToArray(), MaxPageSize = features.MaxPageSize, - MediaTypes = features.MediaTypes, + MediaTypes = features.MediaTypes.ToArray(), SupportsSortOrderToggle = features.SupportsSortOrderToggle, SupportsLatestMedia = supportsLatest, Name = channel.Name, @@ -566,12 +564,10 @@ namespace Emby.Server.Implementations.Channels var dtoOptions = new DtoOptions() { - Fields = query.Fields.ToList() + Fields = query.Fields }; - var returnList = (await _dtoService.GetBaseItemDtos(items, dtoOptions, user).ConfigureAwait(false)); - var returnItems = returnList - .ToArray(returnList.Count); + var returnItems = (await _dtoService.GetBaseItemDtos(items, dtoOptions, user).ConfigureAwait(false)); var result = new QueryResult<BaseItemDto> { @@ -833,13 +829,11 @@ namespace Emby.Server.Implementations.Channels var dtoOptions = new DtoOptions() { - Fields = query.Fields.ToList() + Fields = query.Fields }; - var returnList = (await _dtoService.GetBaseItemDtos(internalResult.Items, dtoOptions, user) + var returnItems = (await _dtoService.GetBaseItemDtos(internalResult.Items, dtoOptions, user) .ConfigureAwait(false)); - var returnItems = returnList - .ToArray(returnList.Count); var result = new QueryResult<BaseItemDto> { @@ -987,13 +981,11 @@ namespace Emby.Server.Implementations.Channels var dtoOptions = new DtoOptions() { - Fields = query.Fields.ToList() + Fields = query.Fields }; - var returnList = (await _dtoService.GetBaseItemDtos(internalResult.Items, dtoOptions, user) + var returnItems = (await _dtoService.GetBaseItemDtos(internalResult.Items, dtoOptions, user) .ConfigureAwait(false)); - var returnItems = returnList - .ToArray(returnList.Count); var result = new QueryResult<BaseItemDto> { |