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

Fix inconsistent exceptions specified in docs and actually thrown.

Browse Source
This commit is contained in:
Him188 2020-11-25 18:29:03 +08:00
parent 8f61943c70
commit 73533c37cb
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/mirai-console/src/internal/plugin/BuiltInJvmPluginLoaderImpl.kt
View File

@ -20,6 +20,7 @@ import net.mamoe.mirai.console.internal.util.PluginServiceHelper.loadAllServices
import net.mamoe.mirai.console.plugin.jvm.* import net.mamoe.mirai.console.plugin.jvm.*
import net.mamoe.mirai.console.plugin.loader.AbstractFilePluginLoader import net.mamoe.mirai.console.plugin.loader.AbstractFilePluginLoader
import net.mamoe.mirai.console.plugin.loader.PluginLoadException import net.mamoe.mirai.console.plugin.loader.PluginLoadException
import net.mamoe.mirai.console.plugin.name
import net.mamoe.mirai.console.util.CoroutineScopeUtils.childScope import net.mamoe.mirai.console.util.CoroutineScopeUtils.childScope
import net.mamoe.mirai.utils.MiraiLogger import net.mamoe.mirai.utils.MiraiLogger
import java.io.File import java.io.File
@ -93,12 +94,17 @@ internal object BuiltInJvmPluginLoaderImpl :
return filePlugins.toSet().map { it.value } return filePlugins.toSet().map { it.value }
} }
private val loadedPlugins = ConcurrentHashMap<JvmPlugin, Unit>()
@Throws(PluginLoadException::class) @Throws(PluginLoadException::class)
override fun load(plugin: JvmPlugin) { override fun load(plugin: JvmPlugin) {
ensureActive() ensureActive()
if (loadedPlugins.put(plugin, Unit) != null) {
error("Plugin '${plugin.name}' is already loaded and cannot be reloaded.")
}
runCatching { runCatching {
check(plugin is JvmPluginInternal) { "A JvmPlugin must extend AbstractJvmPlugin" } check(plugin is JvmPluginInternal) { "A JvmPlugin must extend AbstractJvmPlugin to be loaded by JvmPluginLoader.BuiltIn" }
plugin.internalOnLoad(plugin.componentStorage) plugin.internalOnLoad(plugin.componentStorage)
}.getOrElse { }.getOrElse {
throw PluginLoadException("Exception while loading ${plugin.description.name}", it) throw PluginLoadException("Exception while loading ${plugin.description.name}", it)
@ -106,7 +112,7 @@ internal object BuiltInJvmPluginLoaderImpl :
} }
override fun enable(plugin: JvmPlugin) { override fun enable(plugin: JvmPlugin) {
if (plugin.isEnabled) return if (plugin.isEnabled) error("Plugin '${plugin.name}' is already enabled and cannot be re-enabled.")
ensureActive() ensureActive()
runCatching { runCatching {
if (plugin is JvmPluginInternal) { if (plugin is JvmPluginInternal) {
@ -118,7 +124,7 @@ internal object BuiltInJvmPluginLoaderImpl :
} }
override fun disable(plugin: JvmPlugin) { override fun disable(plugin: JvmPlugin) {
if (!plugin.isEnabled) return if (!plugin.isEnabled) error("Plugin '${plugin.name}' is not already disabled and cannot be re-disabled.")
if (MiraiConsole.isActive) if (MiraiConsole.isActive)
ensureActive() ensureActive()

2
backend/mirai-console/src/plugin/loader/PluginLoader.kt
View File

@ -76,7 +76,7 @@ public interface PluginLoader<P : Plugin, D : PluginDescription> {
* @throws PluginLoadException 在加载插件遇到意料之中的错误时抛出 (如找不到主类等). * @throws PluginLoadException 在加载插件遇到意料之中的错误时抛出 (如找不到主类等).
* @throws IllegalStateException 在插件已经被加载时抛出. 这属于意料之外的情况. * @throws IllegalStateException 在插件已经被加载时抛出. 这属于意料之外的情况.
*/ */
@Throws(PluginLoadException::class) @Throws(IllegalStateException::class, PluginLoadException::class)
public fun load(plugin: P) public fun load(plugin: P)
/** /**