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

Fix device info coping; fix #281

Browse Source
This commit is contained in:
Karlatemp 2021-02-03 15:32:00 +08:00
parent b7c46e27e0
commit a9ca815627
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
backend/mirai-console/src/MiraiConsole.kt
View File

@ -1,10 +1,10 @@
/* /*
* Copyright 2019-2020 Mamoe Technologies and contributors. * Copyright 2019-2021 Mamoe Technologies and contributors.
* *
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
* Use of this source code is governed by the GNU AFFERO GENERAL PUBLIC LICENSE version 3 license that can be found through the following link. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
* *
* https://github.com/mamoe/mirai/blob/master/LICENSE * https://github.com/mamoe/mirai/blob/master/LICENSE
*/ */
@file:Suppress("WRONG_MODIFIER_CONTAINING_DECLARATION", "unused") @file:Suppress("WRONG_MODIFIER_CONTAINING_DECLARATION", "unused")
@ -32,6 +32,7 @@ import net.mamoe.mirai.console.util.CoroutineScopeUtils.childScopeContext
import net.mamoe.mirai.console.util.SemVersion import net.mamoe.mirai.console.util.SemVersion
import net.mamoe.mirai.utils.BotConfiguration import net.mamoe.mirai.utils.BotConfiguration
import net.mamoe.mirai.utils.MiraiLogger import net.mamoe.mirai.utils.MiraiLogger
import net.mamoe.mirai.utils.verbose
import java.io.File import java.io.File
import java.nio.file.Path import java.nio.file.Path
import java.time.Instant import java.time.Instant
@ -139,8 +140,24 @@ public interface MiraiConsole : CoroutineScope {
@Suppress("UNREACHABLE_CODE") @Suppress("UNREACHABLE_CODE")
private fun addBotImpl(id: Long, password: Any, configuration: BotConfiguration.() -> Unit = {}): Bot { private fun addBotImpl(id: Long, password: Any, configuration: BotConfiguration.() -> Unit = {}): Bot {
var config = BotConfiguration().apply { var config = BotConfiguration().apply {
workingDir = rootDir
fileBasedDeviceInfo() workingDir = MiraiConsole.rootDir
.resolve("bots")
.resolve(id.toString())
.also { it.mkdirs() }
mainLogger.verbose { "Bot $id working in $workingDir" }
// copy root/device.json to bots/id/deviceInfo.json
val deviceInfoInRoot = MiraiConsole.rootDir.resolve("device.json")
val deviceInfoTarget = workingDir.resolve("deviceInfo.json")
if (deviceInfoInRoot.isFile && !deviceInfoTarget.isFile) {
mainLogger.verbose { "Coping $deviceInfoInRoot to $deviceInfoTarget" }
deviceInfoInRoot.copyTo(deviceInfoTarget)
}
fileBasedDeviceInfo("deviceInfo.json")
redirectNetworkLogToDirectory() redirectNetworkLogToDirectory()
this.botLoggerSupplier = { this.botLoggerSupplier = {
MiraiLogger.create("Bot.${it.id}") MiraiLogger.create("Bot.${it.id}")

15
backend/mirai-console/src/internal/MiraiConsoleImplementationBridge.kt
View File

@ -231,21 +231,6 @@ internal object MiraiConsoleImplementationBridge : CoroutineScope, MiraiConsoleI
) )
} }
} }
workingDir = MiraiConsole.rootDir
.resolve("bots")
.resolve(id.toString())
if (!workingDir.exists()
&& workingDir.mkdirs()
&& account.configuration[ConfigurationKey.device] == null // no custom device
) {
// copy root/deviceInfo.json to bots/id/deviceInfo.json
val deviceInfoInRoot = MiraiConsole.rootDir.resolve("deviceInfo.json")
deviceInfoInRoot.copyTo(workingDir.resolve("deviceInfo.json"))
fileBasedDeviceInfo("deviceInfo.json")
}
account.configuration[ConfigurationKey.device]?.let { device -> account.configuration[ConfigurationKey.device]?.let { device ->
fileBasedDeviceInfo(device.toString()) fileBasedDeviceInfo(device.toString())
} }