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

move nameFolder under config folder to idFolder, untested

Browse Source
This commit is contained in:
Eritque arcus 2021-12-16 10:14:43 +08:00 committed by Karlatemp
parent f4a2effa01
commit 7d5bd4564e
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
2 changed files with 27 additions and 19 deletions
mirai-console/backend/mirai-console/src/internal/plugin
BuiltInJvmPluginLoaderImpl.ktJvmPluginInternal.kt

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

@ -26,6 +26,7 @@ import net.mamoe.mirai.console.util.CoroutineScopeUtils.childScope
import net.mamoe.mirai.utils.MiraiLogger
import net.mamoe.mirai.utils.verbose
import java.io.File
import java.nio.file.Path
import java.util.concurrent.ConcurrentHashMap
internal object BuiltInJvmPluginLoaderImpl :
@ -98,28 +99,16 @@ internal object BuiltInJvmPluginLoaderImpl :
private val loadedPlugins = ConcurrentHashMap<JvmPlugin, Unit>()
@Throws(PluginLoadException::class)
override fun load(plugin: JvmPlugin) {
ensureActive()
if (loadedPlugins.put(plugin, Unit) != null) {
error("Plugin '${plugin.name}' is already loaded and cannot be reloaded.")
}
logger.verbose { "Loading plugin ${plugin.description.smartToString()}" }
runCatching {
check(plugin is JvmPluginInternal) { "A JvmPlugin must extend AbstractJvmPlugin to be loaded by JvmPluginLoader.BuiltIn" }
plugin.internalOnLoad()
}.getOrElse {
throw PluginLoadException("Exception while loading ${plugin.description.smartToString()}", it)
}
val nameFolder = PluginManager.pluginsDataPath.resolve(plugin.description.name).toFile()
private fun Path.moveNameFolder(plugin: JvmPlugin) {
val nameFolder = this.resolve(plugin.description.name).toFile()
if (plugin.description.name != plugin.description.id && nameFolder.exists()) {
// need move
val idFolder = PluginManager.pluginsDataPath.resolve(plugin.description.id).toFile()
val moveDescription = "移动 ${plugin.description.smartToString()} 的配置目录(${nameFolder.path})到 ${idFolder.path}"
val idFolder = this.resolve(plugin.description.id).toFile()
val moveDescription =
"移动 ${plugin.description.smartToString()} 的数据文件目录(${nameFolder.path})到 ${idFolder.path}"
if (idFolder.exists()) {
if (idFolder.listFiles()?.size != 0) {
logger.error("$moveDescription 失败, 原因:配置目录(${idFolder.path})被占用")
logger.error("$moveDescription 失败, 原因:数据文件目录(${idFolder.path})被占用")
logger.error("Mirai Console 将自动关闭, 请删除或移动该目录后再启动")
MiraiConsole.job.cancel()
} else
@ -141,6 +130,25 @@ internal object BuiltInJvmPluginLoaderImpl :
}
}
@Throws(PluginLoadException::class)
override fun load(plugin: JvmPlugin) {
ensureActive()
if (loadedPlugins.put(plugin, Unit) != null) {
error("Plugin '${plugin.name}' is already loaded and cannot be reloaded.")
}
logger.verbose { "Loading plugin ${plugin.description.smartToString()}" }
runCatching {
check(plugin is JvmPluginInternal) { "A JvmPlugin must extend AbstractJvmPlugin to be loaded by JvmPluginLoader.BuiltIn" }
plugin.internalOnLoad()
}.getOrElse {
throw PluginLoadException("Exception while loading ${plugin.description.smartToString()}", it)
}
// move nameFolder in config and data to idFolder
PluginManager.pluginsDataPath.moveNameFolder(plugin)
PluginManager.pluginsConfigPath.moveNameFolder(plugin)
}
override fun enable(plugin: JvmPlugin) {
if (plugin.isEnabled) error("Plugin '${plugin.name}' is already enabled and cannot be re-enabled.")
ensureActive()

2
mirai-console/backend/mirai-console/src/internal/plugin/JvmPluginInternal.kt
View File

@ -76,7 +76,7 @@ internal abstract class JvmPluginInternal(
}
final override val configFolderPath: Path by lazy {
PluginManager.pluginsConfigPath.resolve(description.name).apply { mkdir() }
PluginManager.pluginsConfigPath.resolve(description.id).apply { mkdir() }
}
final override val configFolder: File by lazy {