lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4304 from crobibero/query-location-type

Browse Source 
Convert exclude location type string to enum.
This commit is contained in:
dkanada 2020-10-11 18:32:22 +09:00 committed by GitHub
commit 4fafa5796d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Jellyfin.Api/Controllers/ItemsController.cs
View File

@ -159,7 +159,7 @@ namespace Jellyfin.Api.Controllers
[FromQuery] bool? isHd, [FromQuery] bool? isHd,
[FromQuery] bool? is4K, [FromQuery] bool? is4K,
[FromQuery] string? locationTypes, [FromQuery] string? locationTypes,
[FromQuery] string? excludeLocationTypes, [FromQuery] LocationType[] excludeLocationTypes,
[FromQuery] bool? isMissing, [FromQuery] bool? isMissing,
[FromQuery] bool? isUnaired, [FromQuery] bool? isUnaired,
[FromQuery] double? minCommunityRating, [FromQuery] double? minCommunityRating,
@ -406,12 +406,9 @@ namespace Jellyfin.Api.Controllers
} }
// ExcludeLocationTypes // ExcludeLocationTypes
if (!string.IsNullOrEmpty(excludeLocationTypes)) if (excludeLocationTypes.Any(t => t == LocationType.Virtual))
{ {
if (excludeLocationTypes.Split(',').Select(d => (LocationType)Enum.Parse(typeof(LocationType), d, true)).ToArray().Contains(LocationType.Virtual)) query.IsVirtualItem = false;
{
query.IsVirtualItem = false;
}
} }
if (!string.IsNullOrEmpty(locationTypes)) if (!string.IsNullOrEmpty(locationTypes))

3
Jellyfin.Api/Controllers/TrailersController.cs
View File

@ -1,6 +1,7 @@
using System; using System;
using Jellyfin.Api.Constants; using Jellyfin.Api.Constants;
using MediaBrowser.Model.Dto; using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Querying; using MediaBrowser.Model.Querying;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
@ -124,7 +125,7 @@ namespace Jellyfin.Api.Controllers
[FromQuery] bool? isHd, [FromQuery] bool? isHd,
[FromQuery] bool? is4K, [FromQuery] bool? is4K,
[FromQuery] string? locationTypes, [FromQuery] string? locationTypes,
[FromQuery] string? excludeLocationTypes, [FromQuery] LocationType[] excludeLocationTypes,
[FromQuery] bool? isMissing, [FromQuery] bool? isMissing,
[FromQuery] bool? isUnaired, [FromQuery] bool? isUnaired,
[FromQuery] double? minCommunityRating, [FromQuery] double? minCommunityRating,