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
758ea29c
Commit
758ea29c
authored
Feb 16, 2020
by
jiahua.liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mirai Console (Terminal)V0.01
parent
d0fb1383
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
5 deletions
+21
-5
mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt
.../kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt
+7
-2
mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt
...e/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt
+6
-3
mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleUI.kt
...src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleUI.kt
+8
-0
No files found.
mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt
View file @
758ea29c
...
@@ -44,6 +44,11 @@ import kotlin.system.exitProcess
...
@@ -44,6 +44,11 @@ import kotlin.system.exitProcess
object
MiraiConsoleTerminalUI
:
MiraiConsoleUI
{
object
MiraiConsoleTerminalUI
:
MiraiConsoleUI
{
val
cacheLogSize
=
50
val
cacheLogSize
=
50
var
mainTitle
=
"Mirai Console v0.01 Core v0.15"
override
fun
pushVersion
(
consoleVersion
:
String
,
consoleBuild
:
String
,
coreVersion
:
String
)
{
mainTitle
=
"Mirai Console(Terminal) $consoleVersion $consoleBuild Core $coreVersion"
}
override
fun
pushLog
(
identity
:
Long
,
message
:
String
)
{
override
fun
pushLog
(
identity
:
Long
,
message
:
String
)
{
log
[
identity
]
!!
.
push
(
message
)
log
[
identity
]
!!
.
push
(
message
)
...
@@ -70,7 +75,7 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
...
@@ -70,7 +75,7 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
override
suspend
fun
requestInput
(
question
:
String
):
String
{
override
suspend
fun
requestInput
(
question
:
String
):
String
{
requesting
=
true
requesting
=
true
while
(
requesting
)
{
while
(
requesting
)
{
Thread
.
sleep
(
100
)
//不然会卡死 迷惑吧
delay
(
100
)
//不然会卡死 迷惑吧
}
}
return
requestResult
!!
return
requestResult
!!
}
}
...
@@ -96,6 +101,7 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
...
@@ -96,6 +101,7 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
val
log
=
ConcurrentHashMap
<
Long
,
LimitLinkedQueue
<
String
>>().
also
{
val
log
=
ConcurrentHashMap
<
Long
,
LimitLinkedQueue
<
String
>>().
also
{
it
[
0L
]
=
LimitLinkedQueue
(
cacheLogSize
)
it
[
0L
]
=
LimitLinkedQueue
(
cacheLogSize
)
}
}
val
botAdminCount
=
ConcurrentHashMap
<
Long
,
Int
>()
val
botAdminCount
=
ConcurrentHashMap
<
Long
,
Int
>()
private
val
screens
=
mutableListOf
(
0L
)
private
val
screens
=
mutableListOf
(
0L
)
...
@@ -294,7 +300,6 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
...
@@ -294,7 +300,6 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
val
height
=
terminal
.
terminalSize
.
rows
val
height
=
terminal
.
terminalSize
.
rows
terminal
.
setBackgroundColor
(
TextColor
.
ANSI
.
DEFAULT
)
terminal
.
setBackgroundColor
(
TextColor
.
ANSI
.
DEFAULT
)
val
mainTitle
=
"Mirai Console v0.01 Core v0.15"
textGraphics
.
foregroundColor
=
TextColor
.
ANSI
.
WHITE
textGraphics
.
foregroundColor
=
TextColor
.
ANSI
.
WHITE
textGraphics
.
backgroundColor
=
TextColor
.
ANSI
.
GREEN
textGraphics
.
backgroundColor
=
TextColor
.
ANSI
.
GREEN
textGraphics
.
putString
((
width
-
mainTitle
.
length
)
/
2
,
1
,
mainTitle
,
SGR
.
BOLD
)
textGraphics
.
putString
((
width
-
mainTitle
.
length
)
/
2
,
1
,
mainTitle
,
SGR
.
BOLD
)
...
...
mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt
View file @
758ea29c
...
@@ -45,8 +45,8 @@ object MiraiConsole {
...
@@ -45,8 +45,8 @@ object MiraiConsole {
var
path
:
String
=
System
.
getProperty
(
"user.dir"
)
var
path
:
String
=
System
.
getProperty
(
"user.dir"
)
val
version
=
"0.01"
val
version
=
"
v
0.01"
var
coreVersion
=
"
0.15
"
var
coreVersion
=
"
v0.15.1
"
val
build
=
"Beta"
val
build
=
"Beta"
lateinit
var
frontEnd
:
MiraiConsoleUI
lateinit
var
frontEnd
:
MiraiConsoleUI
...
@@ -54,7 +54,10 @@ object MiraiConsole {
...
@@ -54,7 +54,10 @@ object MiraiConsole {
frontEnd
:
MiraiConsoleUI
frontEnd
:
MiraiConsoleUI
)
{
)
{
this
.
frontEnd
=
frontEnd
this
.
frontEnd
=
frontEnd
logger
(
"Mirai-console [v$version $build | core version v$coreVersion] is still in testing stage, majority feature is available"
)
frontEnd
.
pushVersion
(
version
,
build
,
coreVersion
)
logger
(
"Mirai-console [$version $build | core version $coreVersion] is still in testing stage, majority feature is available"
)
logger
(
logger
(
"Mirai-console now running under "
+
System
.
getProperty
(
"Mirai-console now running under "
+
System
.
getProperty
(
"user.dir"
"user.dir"
...
...
mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleUI.kt
View file @
758ea29c
...
@@ -32,6 +32,13 @@ interface MiraiConsoleUI {
...
@@ -32,6 +32,13 @@ interface MiraiConsoleUI {
bot
:
Bot
bot
:
Bot
)
)
fun
pushVersion
(
consoleVersion
:
String
,
consoleBuild
:
String
,
coreVersion
:
String
)
/**
/**
* 让UI层提供一个Input
* 让UI层提供一个Input
* 这个Input 不 等于 Command
* 这个Input 不 等于 Command
...
@@ -41,6 +48,7 @@ interface MiraiConsoleUI {
...
@@ -41,6 +48,7 @@ interface MiraiConsoleUI {
question
:
String
question
:
String
):
String
):
String
/**
/**
* 让UI层更新BOT管理员的数据
* 让UI层更新BOT管理员的数据
*/
*/
...
...
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