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

plugin API fixed

Browse Source
This commit is contained in:
jiahua.liu 2020-03-07 18:12:24 +08:00
parent 66b9e59634
commit d411df85ca
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginBase.kt
View File

@ -83,7 +83,11 @@ abstract class PluginBase
@JvmOverloads @JvmOverloads
internal fun disable(throwable: CancellationException? = null) { internal fun disable(throwable: CancellationException? = null) {
this.coroutineContext[Job]!!.cancelChildren(throwable) this.coroutineContext[Job]!!.cancelChildren(throwable)
this.onDisable() try {
this.onDisable()
}catch (e:Exception){
logger.info(e)
}
} }
internal var pluginName: String = "" internal var pluginName: String = ""

34
mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt
View File

@ -42,7 +42,11 @@ object PluginManager {
fun onCommand(command: Command, sender: CommandSender, args: List<String>) { fun onCommand(command: Command, sender: CommandSender, args: List<String>) {
nameToPluginBaseMap.values.forEach { nameToPluginBaseMap.values.forEach {
it.onCommand(command, sender, args) try {
it.onCommand(command, sender, args)
}catch (e:Exception){
logger.info(e)
}
} }
} }
@ -194,7 +198,27 @@ object PluginManager {
} }
nameToPluginBaseMap.values.forEach { nameToPluginBaseMap.values.forEach {
it.enable() try {
it.onLoad()
}catch (ignored:Exception){
if(ignored is CancellationException) {
logger.info(ignored)
logger.info(it.pluginName + "Failed to load, disabling it")
it.disable(ignored)
}
}
}
nameToPluginBaseMap.values.forEach {
try {
it.enable()
}catch (ignored:Exception){
logger.info(ignored)
logger.info(it.pluginName + "Failed to enable, disabling it")
if(ignored is CancellationException) {
it.disable(ignored)
}
}
} }
logger.info("""加载了${nameToPluginBaseMap.size}个插件""") logger.info("""加载了${nameToPluginBaseMap.size}个插件""")
@ -213,9 +237,9 @@ object PluginManager {
* 根据插件名字找Jar的文件 * 根据插件名字找Jar的文件
* null => 没找到 * null => 没找到
*/ */
fun getJarPath(pluginName: String): File? { fun getJarFileByName(pluginName: String): File? {
File(pluginsPath).listFiles()?.forEach { file -> File(pluginsPath).listFiles()?.forEach { file ->
if (file != null && file.extension == "jar") { if (file != null && file.extension == "jar") {
val jar = JarFile(file) val jar = JarFile(file)
val pluginYml = val pluginYml =
jar.entries().asSequence().filter { it.name.toLowerCase().contains("plugin.yml") }.firstOrNull() jar.entries().asSequence().filter { it.name.toLowerCase().contains("plugin.yml") }.firstOrNull()
@ -240,7 +264,7 @@ object PluginManager {
* null => 没找到 * null => 没找到
*/ */
fun getFileInJarByName(pluginName: String, toFind: String): InputStream? { fun getFileInJarByName(pluginName: String, toFind: String): InputStream? {
val jarFile = getJarPath(pluginName) ?: return null val jarFile = getJarFileByName(pluginName) ?: return null
val jar = JarFile(jarFile) val jar = JarFile(jarFile)
val toFindFile = val toFindFile =
jar.entries().asSequence().filter { it.name == toFind }.firstOrNull() ?: return null jar.entries().asSequence().filter { it.name == toFind }.firstOrNull() ?: return null