From 6713525757ad9fc7f0af07633180c11d46207457 Mon Sep 17 00:00:00 2001 From: Qstick Date: Sun, 6 Sep 2020 22:51:25 -0400 Subject: [PATCH] Simplify ManualImportModule null check --- src/Lidarr.Api.V1/ManualImport/ManualImportModule.cs | 11 ++++------- src/Lidarr.Http/Extensions/RequestExtensions.cs | 12 ++++++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/Lidarr.Api.V1/ManualImport/ManualImportModule.cs b/src/Lidarr.Api.V1/ManualImport/ManualImportModule.cs index e9464bada..73199ec31 100644 --- a/src/Lidarr.Api.V1/ManualImport/ManualImportModule.cs +++ b/src/Lidarr.Api.V1/ManualImport/ManualImportModule.cs @@ -47,14 +47,11 @@ namespace Lidarr.Api.V1.ManualImport var downloadId = (string)Request.Query.downloadId; NzbDrone.Core.Music.Artist artist = null; - var artistIdQuery = Request.Query.artistId; - if (artistIdQuery.HasValue) + var artistIdQuery = Request.GetNullableIntegerQueryParameter("artistId", null); + + if (artistIdQuery.HasValue && artistIdQuery.Value > 0) { - var artistId = Convert.ToInt32(artistIdQuery.Value); - if (artistId > 0) - { - artist = _artistService.GetArtist(Convert.ToInt32(artistIdQuery.Value)); - } + artist = _artistService.GetArtist(Convert.ToInt32(artistIdQuery.Value)); } var filter = Request.GetBooleanQueryParameter("filterExistingFiles", true) ? FilterFilesType.Matched : FilterFilesType.None; diff --git a/src/Lidarr.Http/Extensions/RequestExtensions.cs b/src/Lidarr.Http/Extensions/RequestExtensions.cs index ee1e74fcb..b56fd3f65 100644 --- a/src/Lidarr.Http/Extensions/RequestExtensions.cs +++ b/src/Lidarr.Http/Extensions/RequestExtensions.cs @@ -78,5 +78,17 @@ namespace Lidarr.Http.Extensions return defaultValue; } + + public static int? GetNullableIntegerQueryParameter(this Request request, string parameter, int? defaultValue = null) + { + var parameterValue = request.Query[parameter]; + + if (parameterValue.HasValue) + { + return int.Parse(parameterValue.Value); + } + + return defaultValue; + } } }