Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
924fa65f
Commit
924fa65f
authored
Feb 17, 2020
by
jiahua.liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
terminal console closable
parent
7357c65e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
36 additions
and
9 deletions
+36
-9
mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalLoader.kt
...lin/net/mamoe/mirai/console/MiraiConsoleTerminalLoader.kt
+1
-1
mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt
.../kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt
+1
-1
mirai-console/build.gradle.kts
mirai-console/build.gradle.kts
+1
-2
mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt
...e/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt
+6
-2
mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleUIPure.kt
...main/kotlin/net/mamoe/mirai/console/MiraiConsoleUIPure.kt
+27
-3
No files found.
mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalLoader.kt
View file @
924fa65f
...
...
@@ -12,7 +12,7 @@ class MiraiConsoleTerminalLoader {
).
toLowerCase
().
contains
(
"windows"
)
)
{
println
(
"[MiraiConsoleTerminalLoader]: 将以Pure[兼容模式]启动Console"
)
MiraiConsole
.
start
(
MiraiConsoleUIPure
)
MiraiConsole
.
start
(
MiraiConsoleUIPure
()
)
}
else
{
MiraiConsoleTerminalUI
.
start
()
thread
{
...
...
mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt
View file @
924fa65f
...
...
@@ -643,7 +643,7 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
terminal
.
close
()
exitProcess
(
0
)
}
catch
(
ignored
:
Exception
)
{
exitProcess
(
0
)
}
}
}
...
...
mirai-console/build.gradle.kts
View file @
924fa65f
...
...
@@ -7,7 +7,6 @@ plugins {
apply
(
plugin
=
"com.github.johnrengelman.shadow"
)
val
kotlinVersion
:
String
by
rootProject
.
ext
val
atomicFuVersion
:
String
by
rootProject
.
ext
val
coroutinesVersion
:
String
by
rootProject
.
ext
...
...
@@ -25,7 +24,7 @@ fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version"
tasks
.
withType
<
com
.
github
.
jengelman
.
gradle
.
plugins
.
shadow
.
tasks
.
ShadowJar
>()
{
manifest
{
attributes
[
"Main-Class"
]
=
"net.mamoe.mirai.console.MiraiConsole
UI
PureLoader"
attributes
[
"Main-Class"
]
=
"net.mamoe.mirai.console.MiraiConsolePureLoader"
}
}
...
...
mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt
View file @
924fa65f
...
...
@@ -83,8 +83,12 @@ object MiraiConsole {
fun
stop
()
{
PluginManager
.
disableAllPlugins
()
allDown
=
true
bots
.
forEach
{
it
.
get
()
?.
close
()
try
{
bots
.
forEach
{
it
.
get
()
?.
close
()
}
}
catch
(
ignored
:
Exception
)
{
}
}
...
...
mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleUIPure.kt
View file @
924fa65f
package
net.mamoe.mirai.console
import
kotlinx.coroutines.delay
import
net.mamoe.mirai.Bot
import
net.mamoe.mirai.utils.DefaultLoginSolver
import
net.mamoe.mirai.utils.LoginSolver
import
kotlin.concurrent.thread
object
MiraiConsoleUIPure
:
MiraiConsoleUI
{
class
MiraiConsoleUIPure
()
:
MiraiConsoleUI
{
var
requesting
=
false
var
requestStr
=
""
init
{
thread
{
while
(
true
)
{
val
input
=
readLine
()
?:
""
if
(
requesting
)
{
requestStr
=
input
requesting
=
false
}
else
{
MiraiConsole
.
CommandListener
.
commandChannel
.
offer
(
input
)
}
}
}
}
override
fun
pushLog
(
identity
:
Long
,
message
:
String
)
{
println
(
message
)
}
...
...
@@ -23,7 +41,13 @@ object MiraiConsoleUIPure : MiraiConsoleUI {
}
override
suspend
fun
requestInput
(
question
:
String
):
String
{
return
readLine
()
?:
""
requesting
=
true
while
(
true
)
{
delay
(
50
)
if
(!
requesting
)
{
return
requestStr
}
}
}
override
fun
pushBotAdminStatus
(
identity
:
Long
,
admins
:
List
<
Long
>)
{
...
...
@@ -41,7 +65,7 @@ class MiraiConsolePureLoader {
companion
object
{
@JvmStatic
fun
main
(
args
:
Array
<
String
>)
{
MiraiConsole
.
start
(
MiraiConsoleUIPure
)
MiraiConsole
.
start
(
MiraiConsoleUIPure
()
)
Runtime
.
getRuntime
().
addShutdownHook
(
thread
(
start
=
false
)
{
MiraiConsole
.
stop
()
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment