Feature/make config settings changeable during runtime (#545)

* Add logic to update config during runtime

* Update ConfigModule to always use the latest config

* Make ServerConfig settings re-assignable

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigManager.kt

@@ -11,6 +11,9 @@ import ch.qos.logback.classic.Level
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import com.typesafe.config.ConfigRenderOptions
+import com.typesafe.config.ConfigValue
+import com.typesafe.config.ConfigValueFactory
+import com.typesafe.config.parser.ConfigDocumentFactory
 import mu.KotlinLogging
 import java.io.File
 
@@ -18,15 +21,17 @@ import java.io.File
  * Manages app config.
  */
 open class ConfigManager {
+    val logger = KotlinLogging.logger {}
     private val generatedModules = mutableMapOf<Class<out ConfigModule>, ConfigModule>()
-    val config by lazy { loadConfigs() }
+    private val userConfigFile = File(ApplicationRootDir, "server.conf")
+    private var internalConfig = loadConfigs()
+    val config: Config
+        get() = internalConfig
 
     // Public read-only view of modules
     val loadedModules: Map<Class<out ConfigModule>, ConfigModule>
         get() = generatedModules
 
-    val logger = KotlinLogging.logger {}
-
     /**
      * Get a config module
      */
@@ -54,7 +59,7 @@ open class ConfigManager {
 
         // Load user config
         val userConfig =
-            File(ApplicationRootDir, "server.conf").let {
+            userConfigFile.let {
                 ConfigFactory.parseFile(it)
             }
 
@@ -86,6 +91,20 @@ open class ConfigManager {
             registerModule(it)
         }
     }
+
+    private fun updateUserConfigFile(path: String, value: ConfigValue) {
+        val userConfigDoc = ConfigDocumentFactory.parseFile(userConfigFile)
+        val updatedConfigDoc = userConfigDoc.withValue(path, value)
+        val newFileContent = updatedConfigDoc.render()
+        userConfigFile.writeText(newFileContent)
+    }
+
+    fun updateValue(path: String, value: Any) {
+        val configValue = ConfigValueFactory.fromAnyRef(value)
+
+        updateUserConfigFile(path, configValue)
+        internalConfig = internalConfig.withValue(path, configValue)
+    }
 }
 
 object GlobalConfigManager : ConfigManager()

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigModule.kt

@@ -15,19 +15,23 @@ import kotlin.reflect.KProperty
  * Abstract config module.
  */
 @Suppress("UNUSED_PARAMETER")
-abstract class ConfigModule(config: Config)
+abstract class ConfigModule(getConfig: () -> Config)
 
 /**
  * Abstract jvm-commandline-argument-overridable config module.
  */
-abstract class SystemPropertyOverridableConfigModule(config: Config, moduleName: String) : ConfigModule(config) {
-    val overridableConfig = SystemPropertyOverrideDelegate(config, moduleName)
+abstract class SystemPropertyOverridableConfigModule(getConfig: () -> Config, moduleName: String) : ConfigModule(getConfig) {
+    val overridableConfig = SystemPropertyOverrideDelegate(getConfig, moduleName)
 }
 
 /** Defines a config property that is overridable with jvm `-D` commandline arguments prefixed with [CONFIG_PREFIX] */
-class SystemPropertyOverrideDelegate(val config: Config, val moduleName: String) {
+class SystemPropertyOverrideDelegate(val getConfig: () -> Config, val moduleName: String) {
+    operator fun <R> setValue(thisRef: R, property: KProperty<*>, value: Any) {
+        GlobalConfigManager.updateValue("$moduleName.${property.name}", value)
+    }
+
     inline operator fun <R, reified T> getValue(thisRef: R, property: KProperty<*>): T {
-        val configValue: T = config.getValue(thisRef, property)
+        val configValue: T = getConfig().getValue(thisRef, property)
 
         val combined = System.getProperty(
             "$CONFIG_PREFIX.$moduleName.${property.name}",

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/ApplicationInfoConfigModule.kt

@@ -8,12 +8,12 @@ import xyz.nulldev.ts.config.ConfigModule
  * Application info config.
  */
 
-class ApplicationInfoConfigModule(config: Config) : ConfigModule(config) {
-    val packageName: String by config
-    val debug: Boolean by config
+class ApplicationInfoConfigModule(getConfig: () -> Config) : ConfigModule(getConfig) {
+    val packageName: String by getConfig()
+    val debug: Boolean by getConfig()
 
     companion object {
         fun register(config: Config) =
-            ApplicationInfoConfigModule(config.getConfig("android.app"))
+            ApplicationInfoConfigModule { config.getConfig("android.app") }
     }
 }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/FilesConfigModule.kt

@@ -8,27 +8,27 @@ import xyz.nulldev.ts.config.ConfigModule
  * Files configuration modules. Specifies where to store the Android files.
  */
 
-class FilesConfigModule(config: Config) : ConfigModule(config) {
-    val dataDir: String by config
-    val filesDir: String by config
-    val noBackupFilesDir: String by config
-    val externalFilesDirs: MutableList<String> by config
-    val obbDirs: MutableList<String> by config
-    val cacheDir: String by config
-    val codeCacheDir: String by config
-    val externalCacheDirs: MutableList<String> by config
-    val externalMediaDirs: MutableList<String> by config
-    val rootDir: String by config
-    val externalStorageDir: String by config
-    val downloadCacheDir: String by config
-    val databasesDir: String by config
+class FilesConfigModule(getConfig: () -> Config) : ConfigModule(getConfig) {
+    val dataDir: String by getConfig()
+    val filesDir: String by getConfig()
+    val noBackupFilesDir: String by getConfig()
+    val externalFilesDirs: MutableList<String> by getConfig()
+    val obbDirs: MutableList<String> by getConfig()
+    val cacheDir: String by getConfig()
+    val codeCacheDir: String by getConfig()
+    val externalCacheDirs: MutableList<String> by getConfig()
+    val externalMediaDirs: MutableList<String> by getConfig()
+    val rootDir: String by getConfig()
+    val externalStorageDir: String by getConfig()
+    val downloadCacheDir: String by getConfig()
+    val databasesDir: String by getConfig()
 
-    val prefsDir: String by config
+    val prefsDir: String by getConfig()
 
-    val packageDir: String by config
+    val packageDir: String by getConfig()
 
     companion object {
         fun register(config: Config) =
-            FilesConfigModule(config.getConfig("android.files"))
+            FilesConfigModule { config.getConfig("android.files") }
     }
 }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/SystemConfigModule.kt

@@ -4,19 +4,19 @@ import com.typesafe.config.Config
 import io.github.config4k.getValue
 import xyz.nulldev.ts.config.ConfigModule
 
-class SystemConfigModule(val config: Config) : ConfigModule(config) {
-    val isDebuggable: Boolean by config
+class SystemConfigModule(val getConfig: () -> Config) : ConfigModule(getConfig) {
+    val isDebuggable: Boolean by getConfig()
 
     val propertyPrefix = "properties."
 
-    fun getStringProperty(property: String) = config.getString("$propertyPrefix$property")!!
-    fun getIntProperty(property: String) = config.getInt("$propertyPrefix$property")
-    fun getLongProperty(property: String) = config.getLong("$propertyPrefix$property")
-    fun getBooleanProperty(property: String) = config.getBoolean("$propertyPrefix$property")
-    fun hasProperty(property: String) = config.hasPath("$propertyPrefix$property")
+    fun getStringProperty(property: String) = getConfig().getString("$propertyPrefix$property")!!
+    fun getIntProperty(property: String) = getConfig().getInt("$propertyPrefix$property")
+    fun getLongProperty(property: String) = getConfig().getLong("$propertyPrefix$property")
+    fun getBooleanProperty(property: String) = getConfig().getBoolean("$propertyPrefix$property")
+    fun hasProperty(property: String) = getConfig().hasPath("$propertyPrefix$property")
 
     companion object {
         fun register(config: Config) =
-            SystemConfigModule(config.getConfig("android.system"))
+            SystemConfigModule { config.getConfig("android.system") }
     }
 }