aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Controller/Entities')
-rw-r--r--MediaBrowser.Controller/Entities/BaseItem.cs14
-rw-r--r--MediaBrowser.Controller/Entities/InternalItemsQuery.cs16
-rw-r--r--MediaBrowser.Controller/Entities/Person.cs9
-rw-r--r--MediaBrowser.Controller/Entities/UserViewBuilder.cs153
4 files changed, 168 insertions, 24 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index abd6e4262..d9dbf265f 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -235,6 +235,15 @@ namespace MediaBrowser.Controller.Entities
}
}
+ [IgnoreDataMember]
+ public virtual bool EnableAlphaNumericSorting
+ {
+ get
+ {
+ return true;
+ }
+ }
+
/// <summary>
/// This is just a helper for convenience
/// </summary>
@@ -439,6 +448,11 @@ namespace MediaBrowser.Controller.Entities
{
if (Name == null) return null; //some items may not have name filled in properly
+ if (!EnableAlphaNumericSorting)
+ {
+ return Name.TrimStart();
+ }
+
var sortable = Name.Trim().ToLower();
sortable = ConfigurationManager.Configuration.SortRemoveCharacters.Aggregate(sortable, (current, search) => current.Replace(search.ToLower(), string.Empty));
diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index faa9bc875..c5e60a73d 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Model.Entities;
+using System.Collections.Generic;
+using MediaBrowser.Model.Entities;
using System;
namespace MediaBrowser.Controller.Entities
@@ -42,6 +43,7 @@ namespace MediaBrowser.Controller.Entities
public string Person { get; set; }
public string[] PersonIds { get; set; }
+ public string[] ItemIds { get; set; }
public string AdjacentTo { get; set; }
public string[] PersonTypes { get; set; }
@@ -82,9 +84,16 @@ namespace MediaBrowser.Controller.Entities
public bool? IsMovie { get; set; }
public bool? IsSports { get; set; }
public bool? IsKids { get; set; }
-
+
+ public int? MinPlayers { get; set; }
+ public int? MaxPlayers { get; set; }
+ public double? MinCriticRating { get; set; }
+ public double? MinCommunityRating { get; set; }
+
public string[] ChannelIds { get; set; }
-
+
+ internal List<Guid> ItemIdsFromPersonFilters { get; set; }
+
public InternalItemsQuery()
{
Tags = new string[] { };
@@ -102,6 +111,7 @@ namespace MediaBrowser.Controller.Entities
PersonTypes = new string[] { };
PersonIds = new string[] { };
ChannelIds = new string[] { };
+ ItemIds = new string[] { };
}
}
}
diff --git a/MediaBrowser.Controller/Entities/Person.cs b/MediaBrowser.Controller/Entities/Person.cs
index 0a62655ee..6c277da56 100644
--- a/MediaBrowser.Controller/Entities/Person.cs
+++ b/MediaBrowser.Controller/Entities/Person.cs
@@ -55,6 +55,15 @@ namespace MediaBrowser.Controller.Entities
return true;
}
+ [IgnoreDataMember]
+ public override bool EnableAlphaNumericSorting
+ {
+ get
+ {
+ return false;
+ }
+ }
+
/// <summary>
/// Gets a value indicating whether this instance is owned item.
/// </summary>
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index 62c71d169..b2d359277 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -1116,6 +1116,11 @@ namespace MediaBrowser.Controller.Entities
return false;
}
+ if (request.ItemIds.Length > 0)
+ {
+ return false;
+ }
+
if (request.Studios.Length > 0)
{
return false;
@@ -1146,6 +1151,26 @@ namespace MediaBrowser.Controller.Entities
return false;
}
+ if (request.MinPlayers.HasValue)
+ {
+ return false;
+ }
+
+ if (request.MaxPlayers.HasValue)
+ {
+ return false;
+ }
+
+ if (request.MinCommunityRating.HasValue)
+ {
+ return false;
+ }
+
+ if (request.MinCriticRating.HasValue)
+ {
+ return false;
+ }
+
return true;
}
@@ -1304,6 +1329,41 @@ namespace MediaBrowser.Controller.Entities
public static bool Filter(BaseItem item, User user, InternalItemsQuery query, IUserDataManager userDataManager, ILibraryManager libraryManager)
{
+ if (query.ItemIdsFromPersonFilters == null)
+ {
+ if (query.PersonIds.Length > 0)
+ {
+ var names = query.PersonIds
+ .Select(libraryManager.GetItemById)
+ .Select(i => i == null ? null : i.Name)
+ .Where(i => !string.IsNullOrWhiteSpace(i))
+ .ToList();
+
+ var itemIdList = new List<Guid>();
+ foreach (var name in names)
+ {
+ itemIdList.AddRange(libraryManager.GetItemIds(new InternalItemsQuery
+ {
+ Person = name
+ }));
+ }
+ query.ItemIdsFromPersonFilters = itemIdList;
+ }
+
+ // Apply person filter
+ else if (!string.IsNullOrWhiteSpace(query.Person))
+ {
+ var itemIdList = new List<Guid>();
+
+ itemIdList.AddRange(libraryManager.GetItemIds(new InternalItemsQuery
+ {
+ Person = query.Person,
+ PersonTypes = query.PersonTypes
+ }));
+ query.ItemIdsFromPersonFilters = itemIdList;
+ }
+ }
+
if (query.MediaTypes.Length > 0 && !query.MediaTypes.Contains(item.MediaType ?? string.Empty, StringComparer.OrdinalIgnoreCase))
{
return false;
@@ -1691,57 +1751,108 @@ namespace MediaBrowser.Controller.Entities
return false;
}
+ if (query.ItemIds.Length > 0)
+ {
+ if (!query.ItemIds.Contains(item.Id.ToString("N"), StringComparer.OrdinalIgnoreCase))
+ {
+ return false;
+ }
+ }
+
// Apply person filter
- if (query.PersonIds.Length > 0)
+ if (query.ItemIdsFromPersonFilters != null)
{
- var names = query.PersonIds
- .Select(libraryManager.GetItemById)
- .Select(i => i == null ? "-1" : i.Name)
- .ToList();
+ if (!query.ItemIdsFromPersonFilters.Contains(item.Id))
+ {
+ return false;
+ }
+ }
- if (!(names.Any(v => libraryManager.GetPeople(item).Select(i => i.Name).Contains(v, StringComparer.OrdinalIgnoreCase))))
+ // Apply tag filter
+ var tags = query.Tags;
+ if (tags.Length > 0)
+ {
+ var hasTags = item as IHasTags;
+ if (hasTags == null)
+ {
+ return false;
+ }
+ if (!(tags.Any(v => hasTags.Tags.Contains(v, StringComparer.OrdinalIgnoreCase))))
{
return false;
}
}
- // Apply person filter
- if (!string.IsNullOrWhiteSpace(query.Person))
+ if (query.MinPlayers.HasValue)
{
- var personTypes = query.PersonTypes;
+ var filterValue = query.MinPlayers.Value;
+
+ var game = item as Game;
- if (personTypes.Length == 0)
+ if (game != null)
{
- if (!(libraryManager.GetPeople(item).Any(p => string.Equals(p.Name, query.Person, StringComparison.OrdinalIgnoreCase))))
+ var players = game.PlayersSupported ?? 1;
+
+ var ok = players >= filterValue;
+
+ if (!ok)
{
return false;
}
}
else
{
- var types = personTypes;
+ return false;
+ }
+ }
+
+ if (query.MaxPlayers.HasValue)
+ {
+ var filterValue = query.MaxPlayers.Value;
+
+ var game = item as Game;
+
+ if (game != null)
+ {
+ var players = game.PlayersSupported ?? 1;
- var ok = new[] { item }.Any(i =>
- libraryManager.GetPeople(i).Any(p =>
- string.Equals(p.Name, query.Person, StringComparison.OrdinalIgnoreCase) && (types.Contains(p.Type ?? string.Empty, StringComparer.OrdinalIgnoreCase) || types.Contains(p.Role ?? string.Empty, StringComparer.OrdinalIgnoreCase))));
+ var ok = players <= filterValue;
if (!ok)
{
return false;
}
}
+ else
+ {
+ return false;
+ }
}
- // Apply tag filter
- var tags = query.Tags;
- if (tags.Length > 0)
+ if (query.MinCommunityRating.HasValue)
{
- var hasTags = item as IHasTags;
- if (hasTags == null)
+ var val = query.MinCommunityRating.Value;
+
+ if (!(item.CommunityRating.HasValue && item.CommunityRating >= val))
{
return false;
}
- if (!(tags.Any(v => hasTags.Tags.Contains(v, StringComparer.OrdinalIgnoreCase))))
+ }
+
+ if (query.MinCriticRating.HasValue)
+ {
+ var val = query.MinCriticRating.Value;
+
+ var hasCriticRating = item as IHasCriticRating;
+
+ if (hasCriticRating != null)
+ {
+ if (!(hasCriticRating.CriticRating.HasValue && hasCriticRating.CriticRating >= val))
+ {
+ return false;
+ }
+ }
+ else
{
return false;
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-04 17:51:05 +0000