From 587d3c1908287c8f6c893355c18a4d5d15541952 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 13 Apr 2013 20:17:25 -0400 Subject: [PATCH] added min/max official rating --- MediaBrowser.Api/UserLibrary/ItemsService.cs | 31 ++++++++++++++++++++ MediaBrowser.Model/Querying/ItemQuery.cs | 12 ++++++++ Nuget/MediaBrowser.Common.Internal.nuspec | 2 +- Nuget/MediaBrowser.Common.nuspec | 2 +- Nuget/MediaBrowser.Server.Core.nuspec | 4 +-- 5 files changed, 47 insertions(+), 4 deletions(-) diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index cd6bd7854c..3b8702e7dd 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -2,6 +2,7 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Localization; using MediaBrowser.Controller.Persistence; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Querying; @@ -124,6 +125,20 @@ namespace MediaBrowser.Api.UserLibrary [ApiMember(Name = "AirDays", Description = "Optional filter by Series Air Days. Allows multiple, comma delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)] public string AirDays { get; set; } + /// + /// Gets or sets the min offical rating. + /// + /// The min offical rating. + [ApiMember(Name = "MinOfficalRating", Description = "Optional filter by minimum official rating (PG, PG-13, TV-MA, etc).", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")] + public string MinOfficalRating { get; set; } + + /// + /// Gets or sets the max offical rating. + /// + /// The max offical rating. + [ApiMember(Name = "MaxOfficalRating", Description = "Optional filter by maximum official rating (PG, PG-13, TV-MA, etc).", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")] + public string MaxOfficalRating { get; set; } + /// /// Gets the order by. /// @@ -357,6 +372,22 @@ namespace MediaBrowser.Api.UserLibrary /// IEnumerable{BaseItem}. internal static IEnumerable ApplyAdditionalFilters(GetItems request, IEnumerable items) { + // Min official rating + if (!string.IsNullOrEmpty(request.MinOfficalRating)) + { + var level = Ratings.Level(request.MinOfficalRating); + + items = items.Where(i => Ratings.Level(i.CustomRating ?? i.OfficialRating) >= level); + } + + // Max official rating + if (!string.IsNullOrEmpty(request.MaxOfficalRating)) + { + var level = Ratings.Level(request.MaxOfficalRating); + + items = items.Where(i => Ratings.Level(i.CustomRating ?? i.OfficialRating) <= level); + } + // Exclude item types if (!string.IsNullOrEmpty(request.ExcludeItemTypes)) { diff --git a/MediaBrowser.Model/Querying/ItemQuery.cs b/MediaBrowser.Model/Querying/ItemQuery.cs index 59a5e938d8..7b2a4903eb 100644 --- a/MediaBrowser.Model/Querying/ItemQuery.cs +++ b/MediaBrowser.Model/Querying/ItemQuery.cs @@ -157,5 +157,17 @@ namespace MediaBrowser.Model.Querying /// /// The ids. public string[] Ids { get; set; } + + /// + /// Gets or sets the min official rating. + /// + /// The min official rating. + public string MinOfficialRating { get; set; } + + /// + /// Gets or sets the max official rating. + /// + /// The max official rating. + public string MaxOfficialRating { get; set; } } } diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index 861112b505..7663d918bc 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common.Internal - 3.0.75 + 3.0.76 MediaBrowser.Common.Internal Luke ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index f034329f9c..a2202f1db1 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common - 3.0.75 + 3.0.76 MediaBrowser.Common Media Browser Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index 1797f275c8..b6870c309b 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Server.Core - 3.0.75 + 3.0.76 Media Browser.Server.Core Media Browser Team ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains core components required to build plugins for Media Browser Server. Copyright © Media Browser 2013 - +