Merge remote-tracking branch 'upstream/master'

2 files changed, 44 insertions, 0 deletions

diff --git a/MediaBrowser.Api/ChannelService.cs b/MediaBrowser.Api/ChannelService.cs
new file mode 100644
index 0000000000..aa8fc9e52a
--- /dev/null
+++ b/MediaBrowser.Api/ChannelService.cs
@@ -0,0 +1,43 @@
+using MediaBrowser.Controller.Channels;
+using MediaBrowser.Model.Channels;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Querying;
+using ServiceStack;
+using System.Threading;
+
+namespace MediaBrowser.Api
+{
+    [Route("/Channels", "GET")]
+    [Api(("Gets available channels"))]
+    public class GetChannels : IReturn<QueryResult<BaseItemDto>>
+    {
+        public string UserId { get; set; }
+
+        public int? StartIndex { get; set; }
+
+        public int? Limit { get; set; }
+    }
+
+    public class ChannelService : BaseApiService
+    {
+        private readonly IChannelManager _channelManager;
+
+        public ChannelService(IChannelManager channelManager)
+        {
+            _channelManager = channelManager;
+        }
+
+        public object Get(GetChannels request)
+        {
+            var result = _channelManager.GetChannels(new ChannelQuery
+            {
+                Limit = request.Limit,
+                StartIndex = request.StartIndex,
+                UserId = request.UserId,
+
+            }, CancellationToken.None).Result;
+
+            return ToOptimizedResult(result);
+        }
+    }
+}
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index e19fbb967f..38cf39b54f 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -66,6 +66,7 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
+    <Compile Include="ChannelService.cs" />
     <Compile Include="Movies\CollectionService.cs" />
     <Compile Include="Music\AlbumsService.cs" />
     <Compile Include="AppThemeService.cs" />