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

Correctly read resource in build jar and dev mode (#594)

Browse Source 
The server reference config file was only able to be read while in dev mode.
Using the build jar, the content of the file was empty, since in the build jar resources aren't actual files anymore, instead they are streams.
This caused the user config content to be replaced with an empty string.
This commit is contained in:
schroda
2023-07-04 02:37:49 +02:00
committed by GitHub
parent 32d0890dba
commit 9a80992aec
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,8 +117,8 @@ open class ConfigManager {
* - removes outdated settings * - removes outdated settings
*/ */
fun updateUserConfig() { fun updateUserConfig() {
val serverConfigFile = File(javaClass.classLoader.getResource("server-reference.conf")?.file ?: return) val serverConfigFileContent = this::class.java.getResource("/server-reference.conf")?.readText()
val serverConfig = ConfigFactory.parseFile(serverConfigFile) val serverConfig = ConfigFactory.parseResources("server-reference.conf")
val userConfig = getUserConfig() val userConfig = getUserConfig()
val hasMissingSettings = serverConfig.entrySet().any { !userConfig.hasPath(it.key) } val hasMissingSettings = serverConfig.entrySet().any { !userConfig.hasPath(it.key) }
@@ -130,7 +130,7 @@ open class ConfigManager {
logger.debug { "user config is out of date, updating... (missingSettings= $hasMissingSettings, outdatedSettings= $hasOutdatedSettings" } logger.debug { "user config is out of date, updating... (missingSettings= $hasMissingSettings, outdatedSettings= $hasOutdatedSettings" }
val serverConfigDoc = ConfigDocumentFactory.parseFile(serverConfigFile) val serverConfigDoc = ConfigDocumentFactory.parseString(serverConfigFileContent)
userConfigFile.writeText(serverConfigDoc.render()) userConfigFile.writeText(serverConfigDoc.render())
var newUserConfigDoc: ConfigDocument = serverConfigDoc var newUserConfigDoc: ConfigDocument = serverConfigDoc