[no ci]env fallback

storytellerF · Oct 24, 2024 · 469a0e9 · 469a0e9
1 parent 7092469
commit 469a0e9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/backend/src/main/kotlin/com/storyteller_f/Backend.kt b/backend/src/main/kotlin/com/storyteller_f/Backend.kt
@@ -8,6 +8,8 @@ import com.storyteller_f.media.MediaService
 import com.storyteller_f.media.MinIoMediaService
 import com.storyteller_f.naming.NameService
 import io.github.aakira.napier.Napier
+import java.io.File
+import java.io.FileInputStream
 import java.nio.file.Paths
 import java.util.*
 
@@ -34,8 +36,22 @@ fun readEnv(): Map<out Any, Any> {
         Properties().apply {
             load(it)
         }
-    }.orEmpty()
-    return map
+    }
+    return if (map != null) {
+        map
+    } else {
+        val userHome = System.getProperty("user.home")
+        val envFile = File(userHome, ".config/a.env")
+        if (envFile.exists()) {
+            FileInputStream(envFile).use {
+                Properties().apply {
+                    load(it)
+                }
+            }
+        } else {
+            System.getenv()
+        }
+    }
 }
 
 fun buildBackendFromEnv(env: Map<out Any, Any>): Backend {

diff --git a/server/src/main/kotlin/com/storyteller_f/a/server/Application.kt b/server/src/main/kotlin/com/storyteller_f/a/server/Application.kt
@@ -39,7 +39,7 @@ fun main(args: Array<String>) {
     EngineMain.main(args + extraArgs)
 }
 
-private fun processPreSetData(map: MutableMap<out Any, out Any>) {
+private fun processPreSetData(map: Map<out Any, Any>) {
     val preSetEnable = (map["PRESET_ENABLE"] as String).toBoolean()
     if (preSetEnable) {
         val preSetScript = map["PRESET_SCRIPT"] as String