diff options
Diffstat (limited to 'MediaBrowser.Api')
| -rw-r--r-- | MediaBrowser.Api/Images/ImageByNameService.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.Api/LiveTv/LiveTvService.cs | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/MediaBrowser.Api/Images/ImageByNameService.cs b/MediaBrowser.Api/Images/ImageByNameService.cs index c741dd8a8..8c543c8c2 100644 --- a/MediaBrowser.Api/Images/ImageByNameService.cs +++ b/MediaBrowser.Api/Images/ImageByNameService.cs @@ -118,20 +118,20 @@ namespace MediaBrowser.Api.Images public object Get(GetMediaInfoImages request) { - return ToOptimizedResult(GetImageList(_appPaths.MediaInfoImagesPath)); + return ToOptimizedResult(GetImageList(_appPaths.MediaInfoImagesPath, true)); } public object Get(GetRatingImages request) { - return ToOptimizedResult(GetImageList(_appPaths.RatingsPath)); + return ToOptimizedResult(GetImageList(_appPaths.RatingsPath, true)); } public object Get(GetGeneralImages request) { - return ToOptimizedResult(GetImageList(_appPaths.GeneralPath)); + return ToOptimizedResult(GetImageList(_appPaths.GeneralPath, false)); } - private List<ImageByNameInfo> GetImageList(string path) + private List<ImageByNameInfo> GetImageList(string path, bool supportsThemes) { try { @@ -142,7 +142,7 @@ namespace MediaBrowser.Api.Images { Name = Path.GetFileNameWithoutExtension(i.FullName), FileLength = i.Length, - Theme = GetThemeName(i.FullName, path), + Theme = supportsThemes ? GetThemeName(i.FullName, path) : null, Format = i.Extension.ToLower().TrimStart('.') }) .OrderBy(i => i.Name) diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs index abeaba910..a6074e529 100644 --- a/MediaBrowser.Api/LiveTv/LiveTvService.cs +++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs @@ -42,6 +42,12 @@ namespace MediaBrowser.Api.LiveTv [ApiMember(Name = "IsFavorite", Description = "Filter by channels that are favorites, or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")] public bool? IsFavorite { get; set; } + + [ApiMember(Name = "IsLiked", Description = "Filter by channels that are liked, or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")] + public bool? IsLiked { get; set; } + + [ApiMember(Name = "IsDisliked", Description = "Filter by channels that are disliked, or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")] + public bool? IsDisliked { get; set; } } [Route("/LiveTv/Channels/{Id}", "GET", Summary = "Gets a live tv channel")] @@ -294,7 +300,9 @@ namespace MediaBrowser.Api.LiveTv UserId = request.UserId, StartIndex = request.StartIndex, Limit = request.Limit, - IsFavorite = request.IsFavorite + IsFavorite = request.IsFavorite, + IsLiked = request.IsLiked, + IsDisliked = request.IsDisliked }, CancellationToken.None).Result; |