From 394361001fecc8fa7f0166db9f2509290cb940a6 Mon Sep 17 00:00:00 2001
From: Adam <897017+aSemy@users.noreply.github.com>
Date: Sun, 17 Jul 2022 12:34:35 +0200
Subject: [PATCH] Factorio Mod Portal Publish task - reduce logging

---
 .../portal/FactorioModPortalPublishClient.kt  | 29 ++++++++++++-------
 .../portal/FactorioModPublishTask.kt          |  1 -
 .../kafkatorio/factoriomod/portal/model.kt    |  6 ----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/portal/FactorioModPortalPublishClient.kt b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/portal/FactorioModPortalPublishClient.kt
index 7b1aead..6d988d0 100644
--- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/portal/FactorioModPortalPublishClient.kt
+++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/portal/FactorioModPortalPublishClient.kt
@@ -5,9 +5,6 @@ import io.ktor.client.engine.cio.CIO
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.client.plugins.defaultRequest
 import io.ktor.client.plugins.logging.LogLevel
-import io.ktor.client.plugins.logging.Logger
-import io.ktor.client.plugins.logging.Logging
-import io.ktor.client.plugins.logging.SIMPLE
 import io.ktor.client.request.forms.MultiPartFormDataContent
 import io.ktor.client.request.forms.formData
 import io.ktor.client.request.forms.submitForm
@@ -27,6 +24,10 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.json.Json
 import org.gradle.api.internal.tasks.userinput.UserInputHandler
 import org.gradle.kotlin.dsl.support.useToRun
+import io.ktor.client.plugins.logging.Logger as KtorLogger
+import io.ktor.client.plugins.logging.Logging as KtorLogging
+import org.gradle.api.logging.Logger as GradleLogger
+import org.gradle.api.logging.Logging as GradleLogging
 
 
 class FactorioModPortalPublishClient(
@@ -39,9 +40,15 @@ class FactorioModPortalPublishClient(
   private val modPortalBaseURl: String,
 ) {
 
+  private val logger: GradleLogger = GradleLogging.getLogger(this::class.java)
+
   private fun client() = HttpClient(CIO) {
-    install(Logging) {
-      logger = Logger.SIMPLE
+    install(KtorLogging) {
+      logger = object : KtorLogger {
+        override fun log(message: String) {
+          this@FactorioModPortalPublishClient.logger.debug(message)
+        }
+      }
       level = LogLevel.ALL
     }
     install(ContentNegotiation) {
@@ -76,7 +83,7 @@ class FactorioModPortalPublishClient(
       if (confirmed) {
         upload(initUploadResponse)
       } else {
-        println("aborting upload")
+        logger.lifecycle("aborting mod '$modName' upload")
       }
     }
   }
@@ -90,10 +97,10 @@ class FactorioModPortalPublishClient(
       }
     )
 
-    println(response)
+//    println(response)
     val initUploadResponse: InitUploadResponse =
       Json.decodeFromString(InitUploadResponse.serializer(), response.bodyAsText())
-    println(initUploadResponse)
+//    println(initUploadResponse)
 
     require(response.status.isSuccess()) { "init upload request failed" }
 
@@ -123,11 +130,11 @@ class FactorioModPortalPublishClient(
     val submitUploadResponse =
       Json.decodeFromString(SubmitUploadResponse.serializer(), response.bodyAsText())
 
-    println(response)
-    println(submitUploadResponse)
+//    logger(response)
+//    println(submitUploadResponse)
     require(response.status.isSuccess() && submitUploadResponse is SubmitUploadResponse.Success) {
       "upload request failed"
     }
-    println("Mod uploaded successfully! ${modPortalBaseURl.removeSuffix("/")}/$modName")
+    logger.lifecycle("Mod '$modName' uploaded successfully! ${modPortalBaseURl.removeSuffix("/")}/$modName")
   }
 }
diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/portal/FactorioModPublishTask.kt b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/portal/FactorioModPublishTask.kt
index d798e32..894feae 100644
--- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/portal/FactorioModPublishTask.kt
+++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/portal/FactorioModPublishTask.kt
@@ -67,7 +67,6 @@ abstract class FactorioModPublishTask @Inject constructor(
   @TaskAction
   fun deploy() = runBlocking {
 
-
     val userInputHandler = services.get<UserInputHandler>()
 
     val portalUploadEndpoint = URLBuilder(portalApiUrl.get())
diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/portal/model.kt b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/portal/model.kt
index aee2ac6..61f0e61 100644
--- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/portal/model.kt
+++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/factoriomod/portal/model.kt
@@ -7,12 +7,6 @@ import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.jsonObject
 
 
-//@Serializable
-//data class InitUploadRequest(
-//  @SerialName("mod") val modName: String,
-//)
-
-
 @Serializable(with = InitUploadResponse.Serializer::class)
 sealed interface InitUploadResponse {