sorceress
/
MatterLink
mirror of https://github.com/AgathaSorceress/MatterLink.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

this really should not break

This commit is contained in:
nikky 2018-06-26 03:51:17 +02:00
parent 602762f371
commit 88bee22010
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/kotlin/matterlink/Util.kt
View File

@ -56,7 +56,8 @@ val Exception.stackTraceString: String
return sw.toString() return sw.toString()
} }
inline fun <reified T : Any> JsonObject.getOrDefault(key: String, default: T, comment: String? = null): T { fun <T : Any> JsonObject.getOrDefault(key: String, default: T, comment: String? = null): T {
instance.info("type: ${T::class.java.name} key: $key default: $default") instance.info("type: ${default.javaClass.name} key: $key json: >>>${this.getObject(key)?.toJson()}<<< default: $default")
return putDefault(key, default, comment)!! putDefault(key, default, comment)!!
return get(default.javaClass, key)!!
} }

11
core/src/main/kotlin/matterlink/config/BaseConfig.kt
View File

@ -10,6 +10,7 @@ import matterlink.instance
import matterlink.stackTraceString import matterlink.stackTraceString
import java.io.File import java.io.File
import java.io.FileNotFoundException import java.io.FileNotFoundException
import kotlin.system.exitProcess
lateinit var cfg: BaseConfig.MatterLinkConfig lateinit var cfg: BaseConfig.MatterLinkConfig
lateinit var baseCfg: BaseConfig lateinit var baseCfg: BaseConfig
@ -358,16 +359,16 @@ data class BaseConfig(val rootDir: File) {
jankson.load(configFile) jankson.load(configFile)
} catch (e: SyntaxError) { } catch (e: SyntaxError) {
instance.error("error loading config: ${e.completeMessage}") instance.error("error loading config: ${e.completeMessage}")
Marshaller.getFallback().serialize(MatterLinkConfig()) as JsonObject jankson.marshaller.serialize(MatterLinkConfig()) as JsonObject
} catch (e: FileNotFoundException) { } catch (e: FileNotFoundException) {
instance.error("creating config file $configFile") instance.error("creating config file $configFile")
configFile.createNewFile() configFile.createNewFile()
Marshaller.getFallback().serialize(MatterLinkConfig()) as JsonObject jankson.marshaller.serialize(MatterLinkConfig()) as JsonObject
} }
instance.info("finished loading $jsonObject") instance.info("finished loading $jsonObject")
val tmpCfg = try { val tmpCfg = try {
cfgDirectory.resolve("debug.matterlink.hjson").writeText(jsonObject.toJson(false, true)) //cfgDirectory.resolve("debug.matterlink.hjson").writeText(jsonObject.toJson(false, true))
jankson.fromJson(jsonObject, MatterLinkConfig::class.java).apply { jankson.fromJson(jsonObject, MatterLinkConfig::class.java).apply {
configFile.writeText(jsonObject.toJson(true, true)) configFile.writeText(jsonObject.toJson(true, true))
instance.info("loaded config: $this") instance.info("loaded config: $this")
@ -378,6 +379,10 @@ data class BaseConfig(val rootDir: File) {
} catch (e: IllegalStateException) { } catch (e: IllegalStateException) {
instance.error(e.stackTraceString) instance.error(e.stackTraceString)
MatterLinkConfig() MatterLinkConfig()
} catch (e: NullPointerException) {
instance.error("error loading config: ${e.stackTraceString}")
MatterLinkConfig()
exitProcess(-1)
} }
// val defaultJsonObject = jankson.load("{}") // val defaultJsonObject = jankson.load("{}")

3
core/src/main/kotlin/matterlink/config/PermissionConfig.kt
View File

@ -4,7 +4,6 @@ import blue.endless.jankson.Jankson
import blue.endless.jankson.JsonObject import blue.endless.jankson.JsonObject
import blue.endless.jankson.impl.Marshaller import blue.endless.jankson.impl.Marshaller
import blue.endless.jankson.impl.SyntaxError import blue.endless.jankson.impl.SyntaxError
import matterlink.getOrDefault
import matterlink.instance import matterlink.instance
import java.io.File import java.io.File
import java.io.FileNotFoundException import java.io.FileNotFoundException
@ -84,7 +83,7 @@ object PermissionConfig {
fun add(platform: String, userid: String, powerlevel: Double, comment: String? = null) { fun add(platform: String, userid: String, powerlevel: Double, comment: String? = null) {
val platformObject = jsonObject.getObject(platform) ?: JsonObject() val platformObject = jsonObject.getObject(platform) ?: JsonObject()
platformObject.getOrDefault(userid, powerlevel, comment) platformObject.putDefault(userid, powerlevel, comment)
jsonObject[platform] = platformObject jsonObject[platform] = platformObject
perms.clear() perms.clear()