From 1fb31a4c9cef0f2c791cd6bfb83014051907f423 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Sun, 14 May 2023 10:20:28 +0300 Subject: [PATCH] Fix validation for boolean query parameters (cherry picked from commit 2fecd280016630d5afe2d60e52cbb52338c155b5) Closes #3671 --- src/Lidarr.Api.V1/Albums/AlbumController.cs | 6 +----- src/Lidarr.Api.V1/Artist/ArtistController.cs | 9 ++------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/Lidarr.Api.V1/Albums/AlbumController.cs b/src/Lidarr.Api.V1/Albums/AlbumController.cs index 30dc2dc74..321d8f500 100644 --- a/src/Lidarr.Api.V1/Albums/AlbumController.cs +++ b/src/Lidarr.Api.V1/Albums/AlbumController.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using FluentValidation; using Lidarr.Http; -using Lidarr.Http.Extensions; using Lidarr.Http.REST.Attributes; using Microsoft.AspNetCore.Mvc; using NzbDrone.Common.Extensions; @@ -139,11 +138,8 @@ namespace Lidarr.Api.V1.Albums } [RestDeleteById] - public void DeleteAlbum(int id) + public void DeleteAlbum(int id, bool deleteFiles = false, bool addImportListExclusion = false) { - var deleteFiles = Request.GetBooleanQueryParameter("deleteFiles"); - var addImportListExclusion = Request.GetBooleanQueryParameter("addImportListExclusion"); - _albumService.DeleteAlbum(id, deleteFiles, addImportListExclusion); } diff --git a/src/Lidarr.Api.V1/Artist/ArtistController.cs b/src/Lidarr.Api.V1/Artist/ArtistController.cs index 5ac36b7a8..71efe3594 100644 --- a/src/Lidarr.Api.V1/Artist/ArtistController.cs +++ b/src/Lidarr.Api.V1/Artist/ArtistController.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using FluentValidation; using Lidarr.Http; -using Lidarr.Http.Extensions; using Lidarr.Http.REST; using Lidarr.Http.REST.Attributes; using Microsoft.AspNetCore.Mvc; @@ -156,9 +155,8 @@ namespace Lidarr.Api.V1.Artist } [RestPutById] - public ActionResult UpdateArtist(ArtistResource artistResource) + public ActionResult UpdateArtist(ArtistResource artistResource, bool moveFiles = false) { - var moveFiles = Request.GetBooleanQueryParameter("moveFiles"); var artist = _artistService.GetArtist(artistResource.Id); var sourcePath = artist.Path; @@ -183,11 +181,8 @@ namespace Lidarr.Api.V1.Artist } [RestDeleteById] - public void DeleteArtist(int id) + public void DeleteArtist(int id, bool deleteFiles = false, bool addImportListExclusion = false) { - var deleteFiles = Request.GetBooleanQueryParameter("deleteFiles"); - var addImportListExclusion = Request.GetBooleanQueryParameter("addImportListExclusion"); - _artistService.DeleteArtist(id, deleteFiles, addImportListExclusion); }