mirror of
https://github.com/mamoe/mirai.git
synced 2025-01-21 09:47:31 +08:00
Do not throw exception when failed to locate desensitization rules, for tests on CI
This commit is contained in:
parent
c4a2f19db6
commit
297592b9f2
@ -25,6 +25,7 @@ import net.mamoe.mirai.utils.*
|
|||||||
import net.mamoe.yamlkt.Yaml
|
import net.mamoe.yamlkt.Yaml
|
||||||
import net.mamoe.yamlkt.YamlBuilder
|
import net.mamoe.yamlkt.YamlBuilder
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
import java.net.URL
|
||||||
import kotlin.reflect.KType
|
import kotlin.reflect.KType
|
||||||
import kotlin.reflect.full.createInstance
|
import kotlin.reflect.full.createInstance
|
||||||
import kotlin.reflect.full.findAnnotation
|
import kotlin.reflect.full.findAnnotation
|
||||||
@ -58,13 +59,15 @@ internal class Desensitizer private constructor(
|
|||||||
val filename =
|
val filename =
|
||||||
systemProp("mirai.network.recording.desensitization.filepath", "local.desensitization.yml")
|
systemProp("mirai.network.recording.desensitization.filepath", "local.desensitization.yml")
|
||||||
|
|
||||||
val file =
|
val file: URL? =
|
||||||
File(filename).takeIf { it.isFile }?.toURI()?.toURL()
|
File(filename).takeIf { it.isFile }?.toURI()?.toURL()
|
||||||
?: Thread.currentThread().contextClassLoader.getResource(filename)
|
?: Thread.currentThread().contextClassLoader.getResource(filename)
|
||||||
?: Thread.currentThread().contextClassLoader.getResource("recording/configs/$filename")
|
?: Thread.currentThread().contextClassLoader.getResource("recording/configs/$filename")
|
||||||
?: error("Could not find desensitization configuration!")
|
|
||||||
|
|
||||||
format.decodeFromString(file.readText())
|
file?.readText()?.let { format.decodeFromString(it) } ?: kotlin.run {
|
||||||
|
logger.warning { "Couldn't find desensitization rules. You can set by system property 'mirai.network.recording.desensitization.filepath' to path to the desensitization configuration file, or use the 'local.desensitization.yml' by default." }
|
||||||
|
mapOf()
|
||||||
|
}
|
||||||
}.also {
|
}.also {
|
||||||
logger.info { "Loaded ${it.size} desensitization rules." }
|
logger.info { "Loaded ${it.size} desensitization rules." }
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user