github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-04 15:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix value updating

Browse Source
This commit is contained in:
Him188 2020-05-22 20:43:37 +08:00
parent f363a7d4b0
commit 912b2e3464
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/setting/Setting.kt
View File

@ -56,7 +56,7 @@ abstract class Setting : SettingImpl() {
return this return this
} }
override fun toString(): String = yaml.stringify(this.serializer, this) override fun toString(): String = yamlForToString.stringify(this.serializer, this)
} }
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")

10
backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/setting/internal/internal.kt
View File

@ -15,6 +15,7 @@ import kotlinx.serialization.builtins.serializer
import net.mamoe.mirai.console.setting.SerialName import net.mamoe.mirai.console.setting.SerialName
import net.mamoe.mirai.console.setting.Setting import net.mamoe.mirai.console.setting.Setting
import net.mamoe.mirai.console.setting.Value import net.mamoe.mirai.console.setting.Value
import net.mamoe.mirai.utils.MiraiExperimentalAPI
import net.mamoe.yamlkt.Yaml import net.mamoe.yamlkt.Yaml
import net.mamoe.yamlkt.YamlConfiguration import net.mamoe.yamlkt.YamlConfiguration
import kotlin.reflect.KProperty import kotlin.reflect.KProperty
@ -58,7 +59,7 @@ internal abstract class SettingImpl {
companion object { companion object {
@JvmStatic @JvmStatic
internal val yaml = internal val yamlForToString =
Yaml( Yaml(
configuration = YamlConfiguration( configuration = YamlConfiguration(
nonStrictNullability = true, nonStrictNullability = true,
@ -75,6 +76,7 @@ internal class SettingUpdaterSerializer(
private val instance: Setting private val instance: Setting
) : KSerializer<SettingSerializerMark> { ) : KSerializer<SettingSerializerMark> {
override val descriptor: SerialDescriptor by lazy { override val descriptor: SerialDescriptor by lazy {
@OptIn(MiraiExperimentalAPI::class)
SerialDescriptor(instance.serialName) { SerialDescriptor(instance.serialName) {
for ((value, property) in instance.valueList) { for ((value, property) in instance.valueList) {
element(property.serialNameOrPropertyName, value.serializer.descriptor, annotations, true) element(property.serialNameOrPropertyName, value.serializer.descriptor, annotations, true)
@ -97,9 +99,8 @@ internal class SettingUpdaterSerializer(
while (true) { while (true) {
val index = this.decodeElementIndex(descriptor) val index = this.decodeElementIndex(descriptor)
if (index == CompositeDecoder.READ_DONE) return@decodeStructure SettingSerializerMark if (index == CompositeDecoder.READ_DONE) return@decodeStructure SettingSerializerMark
val value = instance.valueList[index].first val value = instance.valueList[index].first as Value<Any>
value.value = this.decodeSerializableElement(
this.decodeSerializableElement(
descriptor, descriptor,
index, index,
value.serializer value.serializer
@ -125,6 +126,7 @@ internal class SettingUpdaterSerializer(
} }
// until https://github.com/Him188/yamlkt/issues/2 fixed
internal fun <T : Any> CompositeEncoder.encodeElementSmart( internal fun <T : Any> CompositeEncoder.encodeElementSmart(
descriptor: SerialDescriptor, descriptor: SerialDescriptor,
index: Int, index: Int,