starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-17 22:43:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use Guid as API parameter type where possible

Browse Source
This commit is contained in:
crobibero
2020-12-01 11:07:41 -07:00
parent f660969e6c
commit c083b29e29
23 changed files with 99 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Jellyfin.Api/Controllers/FilterController.cs
View File

@@ -50,13 +50,13 @@ namespace Jellyfin.Api.Controllers
[ProducesResponseType(StatusCodes.Status200OK)]
public ActionResult<QueryFiltersLegacy> GetQueryFiltersLegacy(
[FromQuery] Guid? userId,
[FromQuery] string? parentId,
[FromQuery] Guid? parentId,
[FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] includeItemTypes,
[FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] mediaTypes)
{
var parentItem = string.IsNullOrEmpty(parentId)
? null
: _libraryManager.GetItemById(parentId);
var parentItem = parentId.HasValue
? _libraryManager.GetItemById(parentId.Value)
: null;
var user = userId.HasValue && !userId.Equals(Guid.Empty)
? _userManager.GetUserById(userId.Value)
@@ -71,11 +71,11 @@ namespace Jellyfin.Api.Controllers
parentItem = null;
}
var item = string.IsNullOrEmpty(parentId)
? user == null
var item = parentId.HasValue
? parentItem
: user == null
? _libraryManager.RootFolder
: _libraryManager.GetUserRootFolder()
: parentItem;
: _libraryManager.GetUserRootFolder();
var query = new InternalItemsQuery
{
@@ -140,7 +140,7 @@ namespace Jellyfin.Api.Controllers
[ProducesResponseType(StatusCodes.Status200OK)]
public ActionResult<QueryFilters> GetQueryFilters(
[FromQuery] Guid? userId,
[FromQuery] string? parentId,
[FromQuery] Guid? parentId,
[FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] includeItemTypes,
[FromQuery] bool? isAiring,
[FromQuery] bool? isMovie,
@@ -150,9 +150,9 @@ namespace Jellyfin.Api.Controllers
[FromQuery] bool? isSeries,
[FromQuery] bool? recursive)
{
var parentItem = string.IsNullOrEmpty(parentId)
? null
: _libraryManager.GetItemById(parentId);
var parentItem = parentId.HasValue
? _libraryManager.GetItemById(parentId.Value)
: null;
var user = userId.HasValue && !userId.Equals(Guid.Empty)
? _userManager.GetUserById(userId.Value)