diff options
16 files changed, 58 insertions, 33 deletions
diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs index a6074e529..2a83e57b3 100644 --- a/MediaBrowser.Api/LiveTv/LiveTvService.cs +++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs @@ -21,7 +21,7 @@ namespace MediaBrowser.Api.LiveTv public class GetChannels : IReturn<QueryResult<ChannelInfoDto>> { [ApiMember(Name = "Type", Description = "Optional filter by channel type.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")] - public ChannelType? Type { get; set; } + public LiveTvChannelType? Type { get; set; } [ApiMember(Name = "UserId", Description = "Optional filter by user and attach user data.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")] public string UserId { get; set; } @@ -294,7 +294,7 @@ namespace MediaBrowser.Api.LiveTv public object Get(GetChannels request) { - var result = _liveTvManager.GetChannels(new ChannelQuery + var result = _liveTvManager.GetChannels(new LiveTvChannelQuery { ChannelType = request.Type, UserId = request.UserId, diff --git a/MediaBrowser.Controller/LiveTv/ChannelInfo.cs b/MediaBrowser.Controller/LiveTv/ChannelInfo.cs index cdc9c76c8..0d074c6c8 100644 --- a/MediaBrowser.Controller/LiveTv/ChannelInfo.cs +++ b/MediaBrowser.Controller/LiveTv/ChannelInfo.cs @@ -29,7 +29,7 @@ namespace MediaBrowser.Controller.LiveTv /// Gets or sets the type of the channel. /// </summary> /// <value>The type of the channel.</value> - public ChannelType ChannelType { get; set; } + public LiveTvChannelType ChannelType { get; set; } /// <summary> /// Supply the image path if it can be accessed directly from the file system diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs index dddd26358..6899b7a59 100644 --- a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs +++ b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs @@ -72,7 +72,7 @@ namespace MediaBrowser.Controller.LiveTv /// <param name="query">The query.</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>IEnumerable{Channel}.</returns> - Task<QueryResult<ChannelInfoDto>> GetChannels(ChannelQuery query, CancellationToken cancellationToken); + Task<QueryResult<ChannelInfoDto>> GetChannels(LiveTvChannelQuery query, CancellationToken cancellationToken); /// <summary> /// Gets the recording. diff --git a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs index 5b78b6789..65b0006a2 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs @@ -63,7 +63,7 @@ namespace MediaBrowser.Controller.LiveTv /// Gets or sets the type of the channel. /// </summary> /// <value>The type of the channel.</value> - public ChannelType ChannelType { get; set; } + public LiveTvChannelType ChannelType { get; set; } public string ServiceName { get; set; } @@ -101,7 +101,7 @@ namespace MediaBrowser.Controller.LiveTv { get { - return ChannelType == ChannelType.Radio ? Model.Entities.MediaType.Audio : Model.Entities.MediaType.Video; + return ChannelType == LiveTvChannelType.Radio ? Model.Entities.MediaType.Audio : Model.Entities.MediaType.Video; } } diff --git a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs index 266eaabee..47c1fda68 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs @@ -35,7 +35,7 @@ namespace MediaBrowser.Controller.LiveTv /// Gets or sets the type of the channel. /// </summary> /// <value>The type of the channel.</value> - public ChannelType ChannelType { get; set; } + public LiveTvChannelType ChannelType { get; set; } /// <summary> /// The start date of the program, in UTC. @@ -161,7 +161,7 @@ namespace MediaBrowser.Controller.LiveTv { get { - return ChannelType == ChannelType.TV ? Model.Entities.MediaType.Video : Model.Entities.MediaType.Audio; + return ChannelType == LiveTvChannelType.TV ? Model.Entities.MediaType.Video : Model.Entities.MediaType.Audio; } } diff --git a/MediaBrowser.Controller/LiveTv/RecordingInfo.cs b/MediaBrowser.Controller/LiveTv/RecordingInfo.cs index bf453ccf4..4ea1961e0 100644 --- a/MediaBrowser.Controller/LiveTv/RecordingInfo.cs +++ b/MediaBrowser.Controller/LiveTv/RecordingInfo.cs @@ -26,7 +26,7 @@ namespace MediaBrowser.Controller.LiveTv /// Gets or sets the type of the channel. /// </summary> /// <value>The type of the channel.</value> - public ChannelType ChannelType { get; set; } + public LiveTvChannelType ChannelType { get; set; } /// <summary> /// Name of the recording. diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj index 561d0d9e4..f17a9c6db 100644 --- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj +++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj @@ -482,18 +482,18 @@ <Compile Include="..\MediaBrowser.Model\LiveTv\ChannelInfoDto.cs"> <Link>LiveTv\ChannelInfoDto.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\LiveTv\ChannelQuery.cs"> - <Link>LiveTv\ChannelQuery.cs</Link> - </Compile> - <Compile Include="..\MediaBrowser.Model\LiveTv\ChannelType.cs"> - <Link>LiveTv\ChannelType.cs</Link> - </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\DayPattern.cs"> <Link>LiveTv\DayPattern.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\GuideInfo.cs"> <Link>LiveTv\GuideInfo.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvChannelQuery.cs"> + <Link>LiveTv\LiveTvChannelQuery.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvChannelType.cs"> + <Link>LiveTv\LiveTvChannelType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvInfo.cs"> <Link>LiveTv\LiveTvInfo.cs</Link> </Compile> diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj index 92f0afb53..41afdea27 100644 --- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj +++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj @@ -463,18 +463,18 @@ <Compile Include="..\MediaBrowser.Model\LiveTv\ChannelInfoDto.cs"> <Link>LiveTv\ChannelInfoDto.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\LiveTv\ChannelQuery.cs"> - <Link>LiveTv\ChannelQuery.cs</Link> - </Compile> - <Compile Include="..\MediaBrowser.Model\LiveTv\ChannelType.cs"> - <Link>LiveTv\ChannelType.cs</Link> - </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\DayPattern.cs"> <Link>LiveTv\DayPattern.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\GuideInfo.cs"> <Link>LiveTv\GuideInfo.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvChannelQuery.cs"> + <Link>LiveTv\LiveTvChannelQuery.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvChannelType.cs"> + <Link>LiveTv\LiveTvChannelType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvInfo.cs"> <Link>LiveTv\LiveTvInfo.cs</Link> </Compile> diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs index f30bb5daf..e5597cbc0 100644 --- a/MediaBrowser.Model/ApiClient/IApiClient.cs +++ b/MediaBrowser.Model/ApiClient/IApiClient.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Model.Configuration; +using MediaBrowser.Model.Channels; +using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Globalization; @@ -1147,5 +1148,29 @@ namespace MediaBrowser.Model.ApiClient /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{SeriesTimerInfoDto}.</returns> Task<SeriesTimerInfoDto> GetDefaultLiveTvTimerInfo(string programId, CancellationToken cancellationToken); + + /// <summary> + /// Gets the channel features. + /// </summary> + /// <param name="channelId">The channel identifier.</param> + /// <param name="cancellationToken">The cancellation token.</param> + /// <returns>Task{ChannelFeatures}.</returns> + Task<ChannelFeatures> GetChannelFeatures(string channelId, CancellationToken cancellationToken); + + /// <summary> + /// Gets the channel items. + /// </summary> + /// <param name="query">The query.</param> + /// <param name="cancellationToken">The cancellation token.</param> + /// <returns>Task{QueryResult{BaseItemDto}}.</returns> + Task<QueryResult<BaseItemDto>> GetChannelItems(ChannelItemQuery query, CancellationToken cancellationToken); + + /// <summary> + /// Gets the channels. + /// </summary> + /// <param name="query">The query.</param> + /// <param name="cancellationToken">The cancellation token.</param> + /// <returns>Task{QueryResult{BaseItemDto}}.</returns> + Task<QueryResult<BaseItemDto>> GetChannels(ChannelQuery query, CancellationToken cancellationToken); } }
\ No newline at end of file diff --git a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs index 2f244b4e3..8be745a12 100644 --- a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs +++ b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs @@ -62,7 +62,7 @@ namespace MediaBrowser.Model.LiveTv /// Gets or sets the type of the channel. /// </summary> /// <value>The type of the channel.</value> - public ChannelType ChannelType { get; set; } + public LiveTvChannelType ChannelType { get; set; } /// <summary> /// Gets or sets the type. diff --git a/MediaBrowser.Model/LiveTv/ChannelQuery.cs b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs index 6d986d337..75fcb7a10 100644 --- a/MediaBrowser.Model/LiveTv/ChannelQuery.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs @@ -4,13 +4,13 @@ namespace MediaBrowser.Model.LiveTv /// <summary> /// Class ChannelQuery. /// </summary> - public class ChannelQuery + public class LiveTvChannelQuery { /// <summary> /// Gets or sets the type of the channel. /// </summary> /// <value>The type of the channel.</value> - public ChannelType? ChannelType { get; set; } + public LiveTvChannelType? ChannelType { get; set; } /// <summary> /// Gets or sets a value indicating whether this instance is favorite. diff --git a/MediaBrowser.Model/LiveTv/ChannelType.cs b/MediaBrowser.Model/LiveTv/LiveTvChannelType.cs index bca16f839..d447f73a2 100644 --- a/MediaBrowser.Model/LiveTv/ChannelType.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvChannelType.cs @@ -4,7 +4,7 @@ namespace MediaBrowser.Model.LiveTv /// <summary> /// Enum ChannelType /// </summary> - public enum ChannelType + public enum LiveTvChannelType { /// <summary> /// The TV diff --git a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs index 58bca06bd..d03e1a4e4 100644 --- a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs +++ b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs @@ -164,7 +164,7 @@ namespace MediaBrowser.Model.LiveTv /// Gets or sets the type of the channel. /// </summary> /// <value>The type of the channel.</value> - public ChannelType ChannelType { get; set; } + public LiveTvChannelType ChannelType { get; set; } /// <summary> /// Gets or sets the official rating. diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index c98db03c0..1a66adafd 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -154,7 +154,7 @@ <Compile Include="Library\PlayAccess.cs" /> <Compile Include="LiveTv\BaseTimerInfoDto.cs" /> <Compile Include="LiveTv\ChannelInfoDto.cs" /> - <Compile Include="LiveTv\ChannelQuery.cs" /> + <Compile Include="LiveTv\LiveTvChannelQuery.cs" /> <Compile Include="LiveTv\DayPattern.cs" /> <Compile Include="LiveTv\GuideInfo.cs" /> <Compile Include="LiveTv\LiveTvInfo.cs" /> @@ -200,7 +200,7 @@ <Compile Include="IO\IIsoManager.cs" /> <Compile Include="IO\IIsoMount.cs" /> <Compile Include="IO\IIsoMounter.cs" /> - <Compile Include="LiveTv\ChannelType.cs" /> + <Compile Include="LiveTv\LiveTvChannelType.cs" /> <Compile Include="LiveTv\LiveTvServiceInfo.cs" /> <Compile Include="LiveTv\RecordingInfoDto.cs" /> <Compile Include="Net\WebSocketMessage.cs" /> diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs index 8d9abc128..b03139c64 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs @@ -206,7 +206,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv IsRepeat = info.IsRepeat, EpisodeTitle = info.EpisodeTitle, ChannelType = info.ChannelType, - MediaType = info.ChannelType == ChannelType.Radio ? MediaType.Audio : MediaType.Video, + MediaType = info.ChannelType == LiveTvChannelType.Radio ? MediaType.Audio : MediaType.Video, CommunityRating = GetClientCommunityRating(info.CommunityRating), OfficialRating = info.OfficialRating, Audio = info.Audio, diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs index bc22c531c..a449b525c 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs @@ -118,7 +118,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv _taskManager.CancelIfRunningAndQueue<RefreshChannelsScheduledTask>(); } - public async Task<QueryResult<ChannelInfoDto>> GetChannels(ChannelQuery query, CancellationToken cancellationToken) + public async Task<QueryResult<ChannelInfoDto>> GetChannels(LiveTvChannelQuery query, CancellationToken cancellationToken) { var user = string.IsNullOrEmpty(query.UserId) ? null : _userManager.GetUserById(new Guid(query.UserId)); @@ -416,7 +416,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv return item; } - private LiveTvProgram GetProgram(ProgramInfo info, ChannelType channelType, string serviceName, CancellationToken cancellationToken) + private LiveTvProgram GetProgram(ProgramInfo info, LiveTvChannelType channelType, string serviceName, CancellationToken cancellationToken) { var id = _tvDtoService.GetInternalProgramId(serviceName, info.Id); @@ -475,7 +475,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv if (item == null) { - if (info.ChannelType == ChannelType.TV) + if (info.ChannelType == LiveTvChannelType.TV) { item = new LiveTvVideoRecording { |