github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-27 00:30:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve PluginDependency.parseFromString

Browse Source
This commit is contained in:
Karlatemp 2020-11-24 12:52:03 +08:00
parent cd2ee20961
commit debe5baae4
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/mirai-console/src/plugin/description/PluginDependency.kt
View File

@ -66,7 +66,7 @@ public data class PluginDependency @JvmOverloads constructor(
public override fun toString(): String = buildString { public override fun toString(): String = buildString {
append(id) append(id)
versionRequirement?.let { versionRequirement?.let {
append(":") append(':')
append(it) append(it)
} }
if (isOptional) { if (isOptional) {
@ -83,10 +83,14 @@ public data class PluginDependency @JvmOverloads constructor(
public fun parseFromString(string: String): PluginDependency { public fun parseFromString(string: String): PluginDependency {
require(string.isNotEmpty()) { "string is empty." } require(string.isNotEmpty()) { "string is empty." }
val optional = string.endsWith('?') val optional = string.endsWith('?')
val (id, version) = string.removeSuffix("?").let { val (id, version) = string.removeSuffix("?").let { rule ->
it.substringBeforeLast(':') to it.substringAfterLast(':', "") if (rule.contains(':')) {
rule.substringBeforeLast(':') to rule.substringAfterLast(':')
} else {
rule to null
}
} }
return PluginDependency(id, version.takeIf(String::isNotBlank), optional) return PluginDependency(id, version, optional)
} }
} }