lazzexus/Kafkatorio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tidy up factorio mod publish task

Browse source
This commit is contained in:
Adam 2022-06-19 10:21:14 +02:00
parent 33d31bfbdd
commit ea0a6b939d
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/FactorioModPortalPublishClient.kt
View file

@ -27,7 +27,6 @@ import kotlinx.coroutines.runBlocking
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import org.gradle.api.internal.tasks.userinput.UserInputHandler import org.gradle.api.internal.tasks.userinput.UserInputHandler
import org.gradle.kotlin.dsl.support.useToRun import org.gradle.kotlin.dsl.support.useToRun
import org.jetbrains.kotlin.cli.common.toBooleanLenient
class FactorioModPortalPublishClient( class FactorioModPortalPublishClient(
@ -91,7 +90,7 @@ class FactorioModPortalPublishClient(
require(response.status.isSuccess()) { "init upload request failed" } require(response.status.isSuccess()) { "init upload request failed" }
return when (initUploadResponse) { return when (initUploadResponse) {
is Failure -> error(initUploadResponse) is Failure -> error(initUploadResponse)
is InitUploadResponse.Success -> initUploadResponse is InitUploadResponse.Success -> initUploadResponse
} }
} }
@ -122,4 +121,18 @@ class FactorioModPortalPublishClient(
"upload request failed" "upload request failed"
} }
} }
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
}
}
} }

7
buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/model.kt
View file

@ -21,7 +21,8 @@ sealed interface InitUploadResponse {
*/ */
@Serializable @Serializable
data class Success( data class Success(
@SerialName("upload_url") val uploadUrl: String, @SerialName("upload_url")
val uploadUrl: String,
) : InitUploadResponse ) : InitUploadResponse
object Serializer : object Serializer :
@ -68,10 +69,10 @@ data class Failure(
private val reasons: Map<String?, String> = mapOf( private val reasons: Map<String?, String> = mapOf(
//@formatter:off //@formatter:off
"InvalidApiKey" to "Missing or invalid API key for the current endpoint", "InvalidApiKey" to "Missing or invalid API key for the current endpoint",
"InvalidRequest" to "Invalid request.", "InvalidRequest" to "Invalid request",
"InternalError" to "Internal error, please try again later.", "InternalError" to "Internal error, please try again later.",
"Forbidden" to "Insufficient permission for current endpoint", "Forbidden" to "Insufficient permission for current endpoint",
"Unknown" to "Unknown error, please try again later.", "Unknown" to "Unknown error, please try again later",
"InvalidModRelease" to "Invalid release data in info.json", "InvalidModRelease" to "Invalid release data in info.json",
"InvalidModUpload" to "Invalid mod data in zipfile", "InvalidModUpload" to "Invalid mod data in zipfile",
"UnknownMod" to "Mod does not exist in mod portal", "UnknownMod" to "Mod does not exist in mod portal",