diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-10-04 14:52:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-04 14:52:50 -0400 |
| commit | 185fa7f5e76a9971e34c35783698d37902ed14cb (patch) | |
| tree | a840cff09050c5c76645596bfd99bb5dfd5ad4a0 /MediaBrowser.Api/ChannelService.cs | |
| parent | c67f03ee97019aff0af41e8c6f4f8525ef90b5e5 (diff) | |
| parent | 1caae368d5f75d96dada65cd2175831982363c21 (diff) | |
Merge pull request #2941 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Api/ChannelService.cs')
| -rw-r--r-- | MediaBrowser.Api/ChannelService.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/MediaBrowser.Api/ChannelService.cs b/MediaBrowser.Api/ChannelService.cs index d64bf7ec7..2e8eb9e07 100644 --- a/MediaBrowser.Api/ChannelService.cs +++ b/MediaBrowser.Api/ChannelService.cs @@ -101,7 +101,7 @@ namespace MediaBrowser.Api [ApiMember(Name = "Fields", Description = "Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimeted. Options: Budget, Chapters, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)] public string Fields { get; set; } - + /// <summary> /// Gets the filters. /// </summary> @@ -160,7 +160,7 @@ namespace MediaBrowser.Api [ApiMember(Name = "ChannelIds", Description = "Optional. Specify one or more channel id's, comma delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)] public string ChannelIds { get; set; } - + /// <summary> /// Gets the filters. /// </summary> @@ -177,7 +177,7 @@ namespace MediaBrowser.Api return val.Split(',').Select(v => (ItemFilter)Enum.Parse(typeof(ItemFilter), v, true)); } } - + [Route("/Channels/Folder", "GET", Summary = "Gets the users channel folder, along with configured images")] public class GetChannelFolder : IReturn<BaseItemDto> { @@ -209,9 +209,9 @@ namespace MediaBrowser.Api return ToOptimizedResult(result); } - public async Task<object> Get(GetChannelFolder request) + public object Get(GetChannelFolder request) { - return ToOptimizedResult(await _channelManager.GetChannelFolder(request.UserId, CancellationToken.None).ConfigureAwait(false)); + return ToOptimizedResult(_channelManager.GetChannelFolder(request.UserId, CancellationToken.None)); } public async Task<object> Get(GetChannels request) |