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

Improve service finding

Browse Source 
- Close resource stream
- Skip comments
This commit is contained in:
Karlatemp 2021-02-18 12:06:56 +08:00
parent 825332abfe
commit 0fa67b7699
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/mirai-console/src/internal/util/PluginServiceHelper.kt
View File

@ -14,7 +14,6 @@ package net.mamoe.mirai.console.internal.util
import net.mamoe.mirai.console.internal.data.cast import net.mamoe.mirai.console.internal.data.cast
import net.mamoe.mirai.console.internal.data.createInstanceOrNull import net.mamoe.mirai.console.internal.data.createInstanceOrNull
import net.mamoe.mirai.console.internal.plugin.BuiltInJvmPluginLoaderImpl import net.mamoe.mirai.console.internal.plugin.BuiltInJvmPluginLoaderImpl
import java.io.InputStream
import java.lang.reflect.Modifier import java.lang.reflect.Modifier
import java.util.* import java.util.*
import kotlin.reflect.KClass import kotlin.reflect.KClass
@ -30,9 +29,13 @@ internal object PluginServiceHelper {
fun <T : Any> ClassLoader.findServices(vararg serviceTypes: KClass<out T>): ServiceList<T> = fun <T : Any> ClassLoader.findServices(vararg serviceTypes: KClass<out T>): ServiceList<T> =
serviceTypes.flatMap { serviceType -> serviceTypes.flatMap { serviceType ->
getResourceAsStream("META-INF/services/" + serviceType.qualifiedName!!) getResourceAsStream("META-INF/services/" + serviceType.qualifiedName!!)?.let { stream ->
?.use(InputStream::readBytes) stream.bufferedReader().useLines { lines ->
?.let(::String)?.lines()?.filter(String::isNotBlank).orEmpty() lines.filter(String::isNotBlank)
.filter { it[0] != '#' }
.toList()
}
}.orEmpty()
}.let { ServiceList(this, it) } }.let { ServiceList(this, it) }
fun <T : Any> ServiceList<T>.loadAllServices(): List<T> { fun <T : Any> ServiceList<T>.loadAllServices(): List<T> {