alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 01:24:44 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fixes #943 - Add web client filtering by genres, parental ratings, tags and years

Browse Source
This commit is contained in:
Luke Pulverenti
2014-11-09 23:20:11 -05:00
parent 1a80362a0f
commit 95eaf88abd
7 changed files with 182 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Controller/Entities/InternalItemsQuery.cs
View File

@@ -69,9 +69,13 @@ namespace MediaBrowser.Controller.Entities
public ImageType[] ImageTypes { get; set; }
public VideoType[] VideoTypes { get; set; }
public int[] Years { get; set; }
public string[] Tags { get; set; }
public string[] OfficialRatings { get; set; }
public InternalItemsQuery()
{
Tags = new string[] { };
OfficialRatings = new string[] { };
SortBy = new string[] { };
MediaTypes = new string[] { };
IncludeItemTypes = new string[] { };

31
MediaBrowser.Controller/Entities/UserViewBuilder.cs
View File

@@ -870,6 +870,16 @@ namespace MediaBrowser.Controller.Entities
return false;
}
if (request.Tags.Length > 0)
{
return false;
}
if (request.OfficialRatings.Length > 0)
{
return false;
}
return true;
}
@@ -1405,6 +1415,12 @@ namespace MediaBrowser.Controller.Entities
}
}
// Apply official rating filter
if (query.OfficialRatings.Length > 0 && !query.OfficialRatings.Contains(item.OfficialRating ?? string.Empty))
{
return false;
}
// Apply person filter
if (!string.IsNullOrEmpty(query.Person))
{
@@ -1431,6 +1447,21 @@ namespace MediaBrowser.Controller.Entities
return false;
}
}
}
// 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;
}
}
return true;