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 ConsoleInternalApi in ConsoleThread

Browse Source
This commit is contained in:
PeratX 2020-08-20 12:21:54 +08:00
parent c1090c1074
commit 8f39f42e56
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frontend/mirai-console-pure/src/main/kotlin/net/mamoe/mirai/console/pure/ConsoleThread.kt
View File

@ -11,10 +11,11 @@ package net.mamoe.mirai.console.pure
import kotlinx.coroutines.* import kotlinx.coroutines.*
import net.mamoe.mirai.console.MiraiConsole import net.mamoe.mirai.console.MiraiConsole
import net.mamoe.mirai.console.command.* import net.mamoe.mirai.console.command.BuiltInCommands
import net.mamoe.mirai.console.command.Command.Companion.primaryName import net.mamoe.mirai.console.command.Command.Companion.primaryName
import net.mamoe.mirai.console.command.CommandExecuteStatus
import net.mamoe.mirai.console.command.CommandManager
import net.mamoe.mirai.console.command.CommandManager.INSTANCE.executeCommandDetailed import net.mamoe.mirai.console.command.CommandManager.INSTANCE.executeCommandDetailed
import net.mamoe.mirai.console.command.CommandManager.INSTANCE.register
import net.mamoe.mirai.console.util.ConsoleInternalAPI import net.mamoe.mirai.console.util.ConsoleInternalAPI
import net.mamoe.mirai.utils.DefaultLogger import net.mamoe.mirai.utils.DefaultLogger
import org.fusesource.jansi.Ansi import org.fusesource.jansi.Ansi
@ -22,7 +23,7 @@ import java.util.*
import java.util.concurrent.Executors import java.util.concurrent.Executors
import kotlin.concurrent.thread import kotlin.concurrent.thread
@ConsoleInternalAPI @OptIn(ConsoleInternalAPI::class)
internal fun startupConsoleThread() { internal fun startupConsoleThread() {
val service = Executors.newSingleThreadExecutor { code -> val service = Executors.newSingleThreadExecutor { code ->
thread(start = false, isDaemon = false, name = "Console Input", block = code::run) thread(start = false, isDaemon = false, name = "Console Input", block = code::run)
@ -45,21 +46,6 @@ internal fun startupConsoleThread() {
} }
} }
/*
object : AbstractCommand(ConsoleCommandOwner, "test") {
override val usage: String
get() = "? Why usage"
override suspend fun CommandSender.onCommand(args: Array<out Any>) {
withContext(Dispatchers.IO) {
launch { sendMessage("I1> " + MiraiConsole.frontEnd.requestInput("Value 1")) }
launch { sendMessage("I2> " + MiraiConsole.frontEnd.requestInput("Value 2")) }
}
}
}.register(true)
*/
CoroutineScope(dispatch).launch { CoroutineScope(dispatch).launch {
val consoleLogger = DefaultLogger("Console") val consoleLogger = DefaultLogger("Console")
while (isActive) { while (isActive) {