temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-07-02 02:14:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use properties to set rootDir so that ConfigManager can use it

Browse Source
This commit is contained in:
Syer10
2021-04-03 18:12:01 -04:00
parent b2d5354798
commit e043cb5690
4 changed files with 12 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/main/kotlin/ir/armor/tachidesk/server/ServerSetup.kt
View File

@@ -37,19 +37,21 @@ class ApplicationDirs(
val mangaRoot = "$dataRoot/manga"
}
val serverConfig: ServerConfig by DI.global.instance()
val serverConfig: ServerConfig by lazy { GlobalConfigManager.module() }
val systemTray by lazy { systemTray() }
val androidCompat by lazy { AndroidCompat() }
fun applicationSetup(rootDir: String? = null, config: Config = GlobalConfigManager.config) {
fun applicationSetup(rootDir: String? = null) {
val dirs = if (rootDir != null) {
ApplicationDirs(rootDir)
} else {
ApplicationDirs()
}
System.setProperty("ir.armor.tachidesk.rootDir", dirs.dataRoot)
// make dirs we need
listOf(
dirs.dataRoot,
@@ -60,10 +62,13 @@ fun applicationSetup(rootDir: String? = null, config: Config = GlobalConfigManag
File(it).mkdirs()
}
GlobalConfigManager.registerModule(
ServerConfig.register(GlobalConfigManager.config)
)
// Application dirs
DI.global.addImport(DI.Module("Server") {
bind<ApplicationDirs>() with singleton { dirs }
bind<ServerConfig>() with singleton { ServerConfig.register(config) }
})
// Load config API
DI.global.addImport(ConfigKodeinModule().create())