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

Fix frontend

Browse Source
This commit is contained in:
Him188 2020-06-29 22:10:52 +08:00
parent bd33a0e39a
commit 58eac01cad
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -44,3 +44,6 @@ keys.properties
bintray.user.txt bintray.user.txt
bintray.key.txt bintray.key.txt
token.txt
/*/token.txt

2
backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/BuiltInCommands.kt
View File

@ -48,7 +48,7 @@ object BuiltInCommands {
} }
object Help : SimpleCommand( object Help : SimpleCommand(
ConsoleCommandOwner, "help", "?", ConsoleCommandOwner, "help",
description = "Gets help about the console." description = "Gets help about the console."
) { ) {
init { init {

15
frontend/mirai-console-pure/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsolePureLoader.kt
View File

@ -21,9 +21,12 @@
package net.mamoe.mirai.console.pure package net.mamoe.mirai.console.pure
import kotlinx.coroutines.isActive import kotlinx.coroutines.isActive
import net.mamoe.mirai.console.MiraiConsole
import net.mamoe.mirai.console.command.CommandExecuteStatus import net.mamoe.mirai.console.command.CommandExecuteStatus
import net.mamoe.mirai.console.command.CommandPrefix
import net.mamoe.mirai.console.command.ConsoleCommandSender import net.mamoe.mirai.console.command.ConsoleCommandSender
import net.mamoe.mirai.console.command.executeCommandDetailed import net.mamoe.mirai.console.command.executeCommandDetailed
import net.mamoe.mirai.console.job
import net.mamoe.mirai.console.pure.MiraiConsolePure.Companion.start import net.mamoe.mirai.console.pure.MiraiConsolePure.Companion.start
import net.mamoe.mirai.console.utils.ConsoleInternalAPI import net.mamoe.mirai.console.utils.ConsoleInternalAPI
import net.mamoe.mirai.message.data.Message import net.mamoe.mirai.message.data.Message
@ -42,8 +45,8 @@ object MiraiConsolePureLoader {
internal fun startup() { internal fun startup() {
startConsoleThread()
MiraiConsolePure().start() MiraiConsolePure().start()
startConsoleThread()
} }
internal fun startConsoleThread() { internal fun startConsoleThread() {
@ -51,7 +54,11 @@ internal fun startConsoleThread() {
val consoleLogger = DefaultLogger("Console") val consoleLogger = DefaultLogger("Console")
kotlinx.coroutines.runBlocking { kotlinx.coroutines.runBlocking {
while (isActive) { while (isActive) {
val next = MiraiConsoleFrontEndPure.requestInput("") val next = MiraiConsoleFrontEndPure.requestInput("").let {
if (it.startsWith(CommandPrefix)) {
it
} else CommandPrefix + it
}
if (next.isBlank()) { if (next.isBlank()) {
continue continue
} }
@ -71,6 +78,10 @@ internal fun startConsoleThread() {
} }
} }
} }
}.let { thread ->
MiraiConsole.job.invokeOnCompletion {
thread.interrupt()
}
} }
} }