1 files changed, 60 insertions, 10 deletions

diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs
index 579517aeb..6a8457ecb 100644
--- a/MediaBrowser.Api/LiveTv/LiveTvService.cs
+++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs
@@ -20,6 +20,20 @@ namespace MediaBrowser.Api.LiveTv
     {
         // Add filter by service if needed, and/or other filters
     }
+
+    [Route("/LiveTv/Recordings", "GET")]
+    [Api(Description = "Gets available live tv recordings.")]
+    public class GetRecordings : IReturn<List<RecordingInfo>>
+    {
+        // Add filter by service if needed, and/or other filters
+    }
+
+    [Route("/LiveTv/EPG", "GET")]
+    [Api(Description = "Gets available live tv epgs..")]
+    public class GetEpg : IReturn<List<EpgFullInfo>>
+    {
+        // Add filter by service if needed, and/or other filters
+    }
     
     public class LiveTvService : BaseApiService
     {
@@ -40,6 +54,14 @@ namespace MediaBrowser.Api.LiveTv
             return ToOptimizedResult(result);
         }
 
+        private LiveTvServiceInfo GetServiceInfo(ILiveTvService service)
+        {
+            return new LiveTvServiceInfo
+            {
+                Name = service.Name
+            };
+        }
+
         public object Get(GetChannels request)
         {
             var result = GetChannelsAsync(request).Result;
@@ -47,25 +69,53 @@ namespace MediaBrowser.Api.LiveTv
             return ToOptimizedResult(result);
         }
 
-        public async Task<IEnumerable<ChannelInfoDto>> GetChannelsAsync(GetChannels request)
+        private async Task<IEnumerable<ChannelInfoDto>> GetChannelsAsync(GetChannels request)
         {
             var services = _liveTvManager.Services;
 
-            var channelTasks = services.Select(i => i.GetChannelsAsync(CancellationToken.None));
+            var tasks = services.Select(i => i.GetChannelsAsync(CancellationToken.None));
 
-            var channelLists = await Task.WhenAll(channelTasks).ConfigureAwait(false);
+            var channelLists = await Task.WhenAll(tasks).ConfigureAwait(false);
 
             // Aggregate all channels from all services
             return channelLists.SelectMany(i => i)
                 .Select(_liveTvManager.GetChannelInfoDto);
         }
-        
-        private LiveTvServiceInfo GetServiceInfo(ILiveTvService service)
+
+        public object Get(GetRecordings request)
         {
-            return new LiveTvServiceInfo
-            {
-                Name = service.Name
-            };
+            var result = GetRecordingsAsync(request).Result;
+
+            return ToOptimizedResult(result);
+        }
+
+        private async Task<IEnumerable<RecordingInfo>> GetRecordingsAsync(GetRecordings request)
+        {
+            var services = _liveTvManager.Services;
+
+            var tasks = services.Select(i => i.GetRecordingsAsync(CancellationToken.None));
+
+            var recordings = await Task.WhenAll(tasks).ConfigureAwait(false);
+
+            return recordings.SelectMany(i => i);
+        }
+
+        public object Get(GetEpg request)
+        {
+            var result = GetEpgAsync(request).Result;
+
+            return ToOptimizedResult(result);
+        }
+
+        private async Task<IEnumerable<EpgFullInfo>> GetEpgAsync(GetEpg request)
+        {
+            var services = _liveTvManager.Services;
+
+            var tasks = services.Select(i => i.GetEpgAsync(CancellationToken.None));
+
+            var epg = await Task.WhenAll(tasks).ConfigureAwait(false);
+
+            return epg.SelectMany(i => i);
         }
     }
-}
+}
\ No newline at end of file