Config feedback on command only

Author: emyfops

common/src/main/kotlin/com/lambda/brigadier/CommandExecution.kt

@@ -55,6 +55,11 @@ sealed class CommandResult {
             return Failure(Communication.LogLevel.ERROR.text(message))
         }
 
+        /** Creates a [CommandResult.Failure] with the given throwable [t]. */
+        fun failure(t: Throwable): Failure {
+            return failure(t.message ?: "An error occurred")
+        }
+
         /**
          * Creates a [CommandResult.Failure] with the given error [message].
          */

common/src/main/kotlin/com/lambda/command/commands/ConfigCommand.kt

@@ -1,10 +1,13 @@
 package com.lambda.command.commands
 
+import com.lambda.brigadier.CommandResult.Companion.failure
+import com.lambda.brigadier.CommandResult.Companion.success
 import com.lambda.brigadier.argument.literal
-import com.lambda.brigadier.execute
+import com.lambda.brigadier.executeWithResult
 import com.lambda.brigadier.required
 import com.lambda.command.LambdaCommand
 import com.lambda.config.Configuration
+import com.lambda.util.Communication.info
 import com.lambda.util.primitives.extension.CommandBuilder
 
 object ConfigCommand : LambdaCommand(
@@ -15,17 +18,23 @@ object ConfigCommand : LambdaCommand(
 ) {
     override fun CommandBuilder.create() {
         required(literal("save")) {
-            execute {
-                Configuration.configurations.forEach {
-                    it.trySave()
+            executeWithResult {
+                Configuration.configurations.forEach { config ->
+                    config.trySave()?.let { return@executeWithResult failure(it) }
                 }
+
+                this@ConfigCommand.info("Saved ${Configuration.configurations.size} configuration files.")
+                return@executeWithResult success()
             }
         }
         required(literal("load")) {
-            execute {
-                Configuration.configurations.forEach {
-                    it.tryLoad()
+            executeWithResult {
+                Configuration.configurations.forEach { config ->
+                    config.tryLoad()?.let { return@executeWithResult failure(it) }
                 }
+
+                this@ConfigCommand.info("Loaded ${Configuration.configurations.size} configuration files.")
+                return@executeWithResult success()
             }
         }
     }

common/src/main/kotlin/com/lambda/config/Configuration.kt

@@ -6,15 +6,10 @@ import com.google.gson.JsonParser
 import com.lambda.Lambda.LOG
 import com.lambda.Lambda.gson
 import com.lambda.config.configurations.ModuleConfig
-import com.lambda.event.EventFlow.lambdaScope
 import com.lambda.event.events.ClientEvent
 import com.lambda.event.listener.UnsafeListener.Companion.unsafeListener
-import com.lambda.util.Communication.info
-import com.lambda.util.Communication.logError
 import com.lambda.util.FolderRegister
 import com.lambda.util.StringUtils.capitalize
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import java.io.File
 import java.time.Duration
 import kotlin.concurrent.fixedRateTimer
@@ -98,45 +93,37 @@ abstract class Configuration(
         loadFromJson(JsonParser.parseReader(file.reader()).asJsonObject)
     }
 
-    fun tryLoad() {
-        lambdaScope.launch(Dispatchers.IO) {
-            runCatching { load(primary) }
-                .onSuccess {
-                    val message = "${configName.capitalize()} config loaded."
-                    LOG.info(message)
-                    this@Configuration.info(message)
-                }
-                .onFailure {
-                    var message: String
-                    runCatching { load(backup) }
-                        .onSuccess {
-                            message = "${configName.capitalize()} config loaded from backup"
-                            LOG.info(message)
-                            this@Configuration.info(message)
-                        }
-                        .onFailure { error ->
-                            message =
-                                "Failed to load ${configName.capitalize()} config from backup, unrecoverable error"
-                            LOG.error(message, error)
-                            this@Configuration.logError(message)
-                        }
-                }
-        }
-    }
+    fun tryLoad() =
+        runCatching { load(primary) }
+            .onSuccess {
+                val message = "${configName.capitalize()} config loaded."
+                LOG.info(message)
+            }
+            .onFailure {
+                runCatching { load(backup) }
+                    .onSuccess {
+                        LOG.info("${configName.capitalize()} config loaded from backup.")
+                    }
+                    .onFailure { backupError ->
+                        LOG.error(
+                            "Failed to load ${configName.capitalize()} config from backup, unrecoverable error.",
+                            backupError
+                        )
+                    }
+            }
+            .exceptionOrNull()
 
-    fun trySave() {
+    fun trySave() =
         runCatching { save() }
             .onSuccess {
                 val message = "Saved ${configName.capitalize()} config."
                 LOG.info(message)
-                this@Configuration.info(message)
             }
             .onFailure {
                 val message = "Failed to save ${configName.capitalize()} config"
                 LOG.error(message, it)
-                this@Configuration.logError(message)
             }
-    }
+            .exceptionOrNull()
 
     companion object {
         val configurations = mutableSetOf<Configuration>()