From 4cdbaa9dafc933842613e2974f93654b972fd687 Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Mon, 20 Jun 2022 23:56:58 +0200 Subject: [PATCH] factorio mod deploy tweaks (better confirmation and link to the page) --- .../FactorioModPortalPublishClient.kt | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/FactorioModPortalPublishClient.kt b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/FactorioModPortalPublishClient.kt index 07a9e61..cb920fe 100644 --- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/FactorioModPortalPublishClient.kt +++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/FactorioModPortalPublishClient.kt @@ -71,7 +71,7 @@ class FactorioModPortalPublishClient( "", ) - val confirmed = enteredVersion.trim() == modVersion.trim() + val confirmed = enteredVersion.trim().equals(modVersion.trim(), ignoreCase = true) if (confirmed) { upload(initUploadResponse) @@ -98,7 +98,7 @@ class FactorioModPortalPublishClient( require(response.status.isSuccess()) { "init upload request failed" } return when (initUploadResponse) { - is Failure -> error(initUploadResponse) + is Failure -> error(initUploadResponse) is InitUploadResponse.Success -> initUploadResponse } } @@ -130,18 +130,4 @@ class FactorioModPortalPublishClient( } println("Mod uploaded successfully! ${modPortalBaseURl.removeSuffix("/")}/$modName") } - - companion object { - - /** - * @see org.jetbrains.kotlin.cli.common.toBooleanLenient - */ - private fun String?.toBooleanLenient(): Boolean? = when (this?.lowercase()?.trim()) { - null -> false - in listOf("yes", "true", "on", "y") -> true - in listOf("", "no", "false", "off", "n") -> false - else -> null - } - - } }