mirrors/Tachidesk
1
0
Fork 0
mirror of https://github.com/Suwayomi/Tachidesk.git synced 2025-12-22 20:42:37 +01:00
Code Issues Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Aria Moradi
2021-08-30 02:44:35 +04:30
parent 37cf80a188
commit 38ad4c6dec
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,8 +14,13 @@ import kotlin.reflect.KProperty
/** /**
* Abstract config module. * Abstract config module.
*/ */
abstract class ConfigModule(config: Config, moduleName: String = "") { abstract class ConfigModule(config: Config)
val overridableWithSysProperty = SystemPropertyOverrideDelegate(config, moduleName)
/**
* Abstract jvm-commandline-argument-overridable config module.
*/
abstract class SystemPropertyOverridableConfigModule(config: Config, moduleName: String): ConfigModule(config) {
val overridableConfig = SystemPropertyOverrideDelegate(config, moduleName)
} }
/** Defines a config property that is overridable with jvm `-D` commandline arguments prefixed with [CONFIG_PREFIX] */ /** Defines a config property that is overridable with jvm `-D` commandline arguments prefixed with [CONFIG_PREFIX] */

24
server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt
View File

@@ -8,30 +8,30 @@ package suwayomi.tachidesk.server
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
import com.typesafe.config.Config import com.typesafe.config.Config
import xyz.nulldev.ts.config.ConfigModule
import xyz.nulldev.ts.config.GlobalConfigManager import xyz.nulldev.ts.config.GlobalConfigManager
import xyz.nulldev.ts.config.SystemPropertyOverridableConfigModule
import xyz.nulldev.ts.config.debugLogsEnabled import xyz.nulldev.ts.config.debugLogsEnabled
private const val MODULE_NAME = "server" private const val MODULE_NAME = "server"
class ServerConfig(config: Config, moduleName: String = MODULE_NAME) : ConfigModule(config, moduleName) { class ServerConfig(config: Config, moduleName: String = MODULE_NAME) : SystemPropertyOverridableConfigModule(config, moduleName) {
val ip: String by overridableWithSysProperty val ip: String by overridableConfig
val port: Int by overridableWithSysProperty val port: Int by overridableConfig
// proxy // proxy
val socksProxyEnabled: Boolean by overridableWithSysProperty val socksProxyEnabled: Boolean by overridableConfig
val socksProxyHost: String by overridableWithSysProperty val socksProxyHost: String by overridableConfig
val socksProxyPort: String by overridableWithSysProperty val socksProxyPort: String by overridableConfig
// misc // misc
val debugLogsEnabled: Boolean = debugLogsEnabled(GlobalConfigManager.config) val debugLogsEnabled: Boolean = debugLogsEnabled(GlobalConfigManager.config)
val systemTrayEnabled: Boolean by overridableWithSysProperty val systemTrayEnabled: Boolean by overridableConfig
// webUI // webUI
val webUIEnabled: Boolean by overridableWithSysProperty val webUIEnabled: Boolean by overridableConfig
val initialOpenInBrowserEnabled: Boolean by overridableWithSysProperty val initialOpenInBrowserEnabled: Boolean by overridableConfig
val webUIInterface: String by overridableWithSysProperty val webUIInterface: String by overridableConfig
val electronPath: String by overridableWithSysProperty val electronPath: String by overridableConfig
companion object { companion object {
fun register(config: Config) = ServerConfig(config.getConfig(MODULE_NAME)) fun register(config: Config) = ServerConfig(config.getConfig(MODULE_NAME))