diff options
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/ItemsService.cs | 31 | ||||
| -rw-r--r-- | MediaBrowser.Model/Querying/ItemQuery.cs | 12 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Common.Internal.nuspec | 2 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Common.nuspec | 2 | ||||
| -rw-r--r-- | 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 cd6bd7854..3b8702e7d 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; @@ -125,6 +126,20 @@ namespace MediaBrowser.Api.UserLibrary public string AirDays { get; set; } /// <summary> + /// Gets or sets the min offical rating. + /// </summary> + /// <value>The min offical rating.</value> + [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; } + + /// <summary> + /// Gets or sets the max offical rating. + /// </summary> + /// <value>The max offical rating.</value> + [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; } + + /// <summary> /// Gets the order by. /// </summary> /// <returns>IEnumerable{ItemSortBy}.</returns> @@ -357,6 +372,22 @@ namespace MediaBrowser.Api.UserLibrary /// <returns>IEnumerable{BaseItem}.</returns> internal static IEnumerable<BaseItem> ApplyAdditionalFilters(GetItems request, IEnumerable<BaseItem> 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 59a5e938d..7b2a4903e 100644 --- a/MediaBrowser.Model/Querying/ItemQuery.cs +++ b/MediaBrowser.Model/Querying/ItemQuery.cs @@ -157,5 +157,17 @@ namespace MediaBrowser.Model.Querying /// </summary> /// <value>The ids.</value> public string[] Ids { get; set; } + + /// <summary> + /// Gets or sets the min official rating. + /// </summary> + /// <value>The min official rating.</value> + public string MinOfficialRating { get; set; } + + /// <summary> + /// Gets or sets the max official rating. + /// </summary> + /// <value>The max official rating.</value> + public string MaxOfficialRating { get; set; } } } diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index 861112b50..7663d918b 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <metadata> <id>MediaBrowser.Common.Internal</id> - <version>3.0.75</version> + <version>3.0.76</version> <title>MediaBrowser.Common.Internal</title> <authors>Luke</authors> <owners>ebr,Luke,scottisafool</owners> diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index f034329f9..a2202f1db 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <metadata> <id>MediaBrowser.Common</id> - <version>3.0.75</version> + <version>3.0.76</version> <title>MediaBrowser.Common</title> <authors>Media Browser Team</authors> <owners>ebr,Luke,scottisafool</owners> diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index 1797f275c..b6870c309 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <metadata> <id>MediaBrowser.Server.Core</id> - <version>3.0.75</version> + <version>3.0.76</version> <title>Media Browser.Server.Core</title> <authors>Media Browser Team</authors> <owners>ebr,Luke,scottisafool</owners> @@ -12,7 +12,7 @@ <description>Contains core components required to build plugins for Media Browser Server.</description> <copyright>Copyright © Media Browser 2013</copyright> <dependencies> - <dependency id="MediaBrowser.Common" version="3.0.75" /> + <dependency id="MediaBrowser.Common" version="3.0.76" /> </dependencies> </metadata> <files> |