temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-06-30 09:24:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix paths in system properties (#1528)

Browse Source 
* Fix paths in system properties

* Remove uneeded parse

* Cleanup name
This commit is contained in:
Mitchell Syer
2025-07-16 21:52:34 -04:00
committed by GitHub
parent b8e85422f0
commit bef326d2d7
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,6 @@ import io.github.config4k.ClassContainer
import io.github.config4k.TypeReference import io.github.config4k.TypeReference
import io.github.config4k.getValue import io.github.config4k.getValue
import io.github.config4k.readers.SelectReader import io.github.config4k.readers.SelectReader
import io.github.config4k.toConfig
import kotlin.reflect.KProperty import kotlin.reflect.KProperty
/** /**
@@ -45,22 +44,19 @@ class SystemPropertyOverrideDelegate(
property: KProperty<*>, property: KProperty<*>,
): T { ): T {
val config = getConfig() val config = getConfig()
val configValue: T = config.getValue(thisRef, property)
val combined = val systemProperty =
System.getProperty( System.getProperty("$CONFIG_PREFIX.$moduleName.${property.name}")
"$CONFIG_PREFIX.$moduleName.${property.name}", if (systemProperty == null) {
configValue!! val configValue: T = config.getValue(thisRef, property)
.toConfig("internal") return configValue
.root() }
.render()
.removePrefix("internal="), val systemPropertyConfig =
)
val combinedConfig =
try { try {
ConfigFactory.parseString(combined) ConfigFactory.parseString("internal=$systemProperty")
} catch (_: ConfigException) { } catch (_: ConfigException) {
ConfigFactory.parseString("internal=$combined") ConfigFactory.parseString("internal=\"$systemProperty\"")
} }
val genericType = object : TypeReference<T>() {}.genericType() val genericType = object : TypeReference<T>() {}.genericType()
@@ -68,7 +64,7 @@ class SystemPropertyOverrideDelegate(
val reader = SelectReader.getReader(clazz) val reader = SelectReader.getReader(clazz)
val path = property.name val path = property.name
val result = reader(combinedConfig, "internal") val result = reader(systemPropertyConfig, "internal")
return try { return try {
result as T result as T
} catch (e: Exception) { } catch (e: Exception) {