alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-15 10:43:30 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Updated live tv api

Browse Source
This commit is contained in:
Luke Pulverenti
2013-11-15 16:31:44 -05:00
parent a09e330d4e
commit 83d70c54ec
11 changed files with 63 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
MediaBrowser.Api/LiveTv/LiveTvService.cs
View File

@@ -32,17 +32,17 @@ namespace MediaBrowser.Api.LiveTv
public string ServiceName { get; set; }
}
[Route("/LiveTv/EPG", "GET")]
[Route("/LiveTv/Guide", "GET")]
[Api(Description = "Gets available live tv epgs..")]
public class GetEpg : IReturn<EpgFullInfo>
public class GetGuide : IReturn<List<ChannelGuide>>
{
[ApiMember(Name = "ServiceName", Description = "The live tv service name", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
[ApiMember(Name = "ServiceName", Description = "Live tv service name", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
public string ServiceName { get; set; }
[ApiMember(Name = "ChannelId", Description = "The channel id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
public string ChannelId { get; set; }
[ApiMember(Name = "ChannelIds", Description = "The channels to return guide information for.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
public string ChannelIds { get; set; }
}
public class LiveTvService : BaseApiService
{
private readonly ILiveTvManager _liveTvManager;
@@ -112,28 +112,33 @@ namespace MediaBrowser.Api.LiveTv
{
var services = GetServices(request.ServiceName);
var tasks = services.Select(i => i.GetRecordingsAsync(CancellationToken.None));
var query = new RecordingQuery
{
};
var tasks = services.Select(i => i.GetRecordingsAsync(query, CancellationToken.None));
var recordings = await Task.WhenAll(tasks).ConfigureAwait(false);
return recordings.SelectMany(i => i).Select(_liveTvManager.GetRecordingInfo);
return recordings.SelectMany(i => i);
}
public object Get(GetEpg request)
public object Get(GetGuide request)
{
var result = GetEpgAsync(request).Result;
var result = GetGuideAsync(request).Result;
return ToOptimizedResult(result);
}
private async Task<EpgFullInfo> GetEpgAsync(GetEpg request)
private async Task<IEnumerable<ChannelGuide>> GetGuideAsync(GetGuide request)
{
var service = GetServices(request.ServiceName)
.First();
var epg = await service.GetEpgAsync(request.ChannelId, CancellationToken.None).ConfigureAwait(false);
var channels = request.ChannelIds.Split(',');
return epg;
return await service.GetChannelGuidesAsync(channels, CancellationToken.None).ConfigureAwait(false);
}
}
}