diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-12-05 13:36:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 13:36:50 -0500 |
| commit | b3fbdde04305a0406b5322ec6947f8a30ddc12af (patch) | |
| tree | 121dd382bf71a9b5c96e00771c0ba18a7d28ab87 | |
| parent | 70a73984b8de5e7880f9accff60fe9fac5a664d7 (diff) | |
| parent | bb3d80406b2fba067255b1552563d44671ead92c (diff) | |
Merge pull request #3053 from MediaBrowser/dev
Dev
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/LiveTvManager.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Api/LiveTv/LiveTvService.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs | 2 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs index 66eabf523..211e0de4b 100644 --- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs @@ -1021,7 +1021,8 @@ namespace Emby.Server.Implementations.LiveTv EnableTotalRecordCount = query.EnableTotalRecordCount, OrderBy = new[] { new Tuple<string, SortOrder>(ItemSortBy.StartDate, SortOrder.Ascending) }, TopParentIds = new[] { topFolder.Id.ToString("N") }, - DtoOptions = options + DtoOptions = options, + GenreIds = query.GenreIds }; if (query.Limit.HasValue) diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs index c13762048..fee52ea5e 100644 --- a/MediaBrowser.Api/LiveTv/LiveTvService.cs +++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs @@ -459,6 +459,9 @@ namespace MediaBrowser.Api.LiveTv [ApiMember(Name = "EnableImageTypes", Description = "Optional. The image types to include in the output.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")] public string EnableImageTypes { get; set; } + [ApiMember(Name = "GenreIds", Description = "The genres to return guide information for.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET,POST")] + public string GenreIds { get; set; } + /// <summary> /// Fields to return within the items, in addition to basic information /// </summary> @@ -1040,6 +1043,8 @@ namespace MediaBrowser.Api.LiveTv EnableTotalRecordCount = request.EnableTotalRecordCount }; + query.GenreIds = (request.GenreIds ?? String.Empty).Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries); + var result = _liveTvManager.GetRecommendedPrograms(query, GetDtoOptions(_authContext, request), CancellationToken.None); return ToOptimizedResult(result); diff --git a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs index 4bc506bf6..3d137256e 100644 --- a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs +++ b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs @@ -13,12 +13,14 @@ namespace MediaBrowser.Model.LiveTv public bool? EnableImages { get; set; } public int? ImageTypeLimit { get; set; } public ImageType[] EnableImageTypes { get; set; } + public string[] GenreIds { get; set; } public bool EnableTotalRecordCount { get; set; } public RecommendedProgramQuery() { EnableTotalRecordCount = true; + GenreIds = new string[] { }; } /// <summary> diff --git a/SharedVersion.cs b/SharedVersion.cs index db8007e85..c683d0245 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.40.7")] +[assembly: AssemblyVersion("3.2.50.0")] |