Merge pull request #4 from Goksi/config-defaults

Using default config values
Goksi · Nov 13, 2022 · 8c3a44f · 8c3a44f
2 parents 14bdd4f + 5c1f99a
commit 8c3a44f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/kotlin/tech/goksi/pterobot/PteroBot.kt b/src/main/kotlin/tech/goksi/pterobot/PteroBot.kt
@@ -13,6 +13,7 @@ import tech.goksi.pterobot.events.NodeStatusDelete
 import tech.goksi.pterobot.manager.ConfigManager
 import tech.goksi.pterobot.manager.EmbedManager
 import tech.goksi.pterobot.util.Checks
+import kotlin.system.exitProcess
 
 private const val DEFAULT_NO_TOKEN_MSG = "YOUR TOKEN HERE"
 private const val DEFAULT_NO_ID_MSG = "YOUR DISCORD SERVER ID HERE"
@@ -117,8 +118,8 @@ class PteroBot {
         logger.info("PteroBot has successfully started, you can stop it by typing \"stop\"")
         while (true) {
             if ((readLine()?.lowercase()) == "stop") {
-                jda.shutdown()
-                break
+                jda.shutdownNow()
+                exitProcess(0)
             } else logger.warn("Wrong command ! You mean \"stop\" ?")
         }
     }

diff --git a/src/main/kotlin/tech/goksi/pterobot/manager/ConfigManager.kt b/src/main/kotlin/tech/goksi/pterobot/manager/ConfigManager.kt
@@ -1,7 +1,9 @@
 package tech.goksi.pterobot.manager
 
 import dev.minn.jda.ktx.util.SLF4J
+import org.simpleyaml.configuration.file.YamlConfiguration
 import org.simpleyaml.configuration.file.YamlFile
+import org.simpleyaml.utils.SupplierIO
 import java.io.File
 import java.io.IOException
 import kotlin.system.exitProcess
@@ -12,13 +14,16 @@ object ConfigManager {
     val config: YamlFile
 
     init {
+        val inputStreamURL = ConfigManager::class.java.classLoader.getResource("config.yml")!!
         if (!configFile.exists()) {
-            val content = ConfigManager::class.java.classLoader.getResource("config.yml")!!.readText()
+            val content = inputStreamURL.readText()
             configFile.writeText(content)
         }
         config = YamlFile(configFile)
         try {
             config.loadWithComments()
+            config.defaults =
+                YamlConfiguration.loadConfiguration(SupplierIO.InputStream { inputStreamURL.openStream() })
         } catch (exception: IOException) {
             logger.error("Error while loading configuration file, exiting program...", exception)
             exitProcess(1)