internal functions with public api to allow overriding instead of goofy onPreLoad onPostLoad functions

Author: beanbag44

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

@@ -105,6 +105,20 @@ abstract class Configuration : Jsonable, Loadable {
             }
     }
 
+    protected open fun internalTrySave(logToChat: Boolean) {
+        save()
+            .onSuccess {
+                val message = "Saved ${configName.capitalize()} config."
+                LOG.info(message)
+                if (logToChat) info(message)
+            }
+            .onFailure {
+                val message = "Failed to save ${configName.capitalize()} config"
+                LOG.error(message, it)
+                logError(message)
+            }
+    }
+
     /**
      * Loads the config from the [file]
      * Encapsulates [JsonIOException] and [JsonSyntaxException] in a runCatching block
@@ -114,7 +128,7 @@ abstract class Configuration : Jsonable, Loadable {
             .ifExists { loadFromJson(JsonParser.parseReader(it.reader()).asJsonObject) }
     }
 
-    open fun tryLoad() = runIO {
+    protected open fun internalTryLoad() {
         load(primary)
             .onSuccess {
                 val message = "${configName.capitalize()} config loaded."
@@ -137,19 +151,8 @@ abstract class Configuration : Jsonable, Loadable {
             }
     }
 
-    open fun trySave(logToChat: Boolean = false) = runIO {
-        save()
-            .onSuccess {
-                val message = "Saved ${configName.capitalize()} config."
-                LOG.info(message)
-                if (logToChat) info(message)
-            }
-            .onFailure {
-                val message = "Failed to save ${configName.capitalize()} config"
-                LOG.error(message, it)
-                logError(message)
-            }
-    }
+    fun tryLoad() = runIO { internalTryLoad() }
+    fun trySave(logToChat: Boolean = false) = runIO { internalTrySave(logToChat) }
 
     companion object {
         val configurations = mutableSetOf<Configuration>()

src/main/kotlin/com/lambda/config/DynamicConfiguration.kt

@@ -18,36 +18,30 @@
 package com.lambda.config.configurations
 
 import com.google.gson.JsonParser
-import com.lambda.config.DynamicConfiguration
+import com.lambda.config.Configuration
 import com.lambda.config.UserAutomationConfig
 import com.lambda.module.ModuleRegistry.moduleNameMap
 import com.lambda.util.FileUtils.ifExists
 import com.lambda.util.FolderRegister
 import java.io.File
 
-object UserAutomationConfigs : DynamicConfiguration() {
+object UserAutomationConfigs : Configuration() {
     override val configName = "custom-automation"
     override val primary: File = FolderRegister.config.resolve("${configName}.json").toFile()
 
-    override fun load(): String {
-        onPreLoad {
-            primary.ifExists {
-                JsonParser.parseReader(it.reader()).asJsonObject.entrySet().forEach { (name, _) ->
-                    if (configurables.any { config -> config.name == name }) return@forEach
-                    UserAutomationConfig(name)
-                }
+    override fun internalTryLoad() {
+        primary.ifExists {
+            JsonParser.parseReader(it.reader()).asJsonObject.entrySet().forEach { (name, _) ->
+                if (configurables.any { config -> config.name == name }) return@forEach
+                UserAutomationConfig(name)
             }
         }
-
-        onPostLoad {
-            configurables.forEach {
-                val config = it as? UserAutomationConfig ?: throw IllegalStateException("UserAutomationConfigs contains non-AutomationConfig")
-                config.linkedModules.value.forEach { moduleName ->
-                    moduleNameMap[moduleName]?.automationConfig = config
-                }
+        super.internalTryLoad()
+        configurables.forEach {
+            val config = it as? UserAutomationConfig ?: throw IllegalStateException("UserAutomationConfigs contains non-AutomationConfig")
+            config.linkedModules.value.forEach { moduleName ->
+                moduleNameMap[moduleName]?.automationConfig = config
             }
         }
-
-        return super.load()
     }
 }