Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BUG FIX] 国际象棋插件 bug 修复 #722

Merged
merged 2 commits into from
Sep 2, 2023
Merged

[BUG FIX] 国际象棋插件 bug 修复 #722

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19eda72
只有正确安装 inkscape 时才需要清理临时文件
aimerneige Sep 2, 2023
2bb15c1
fix lint && bug
aimerneige Sep 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 31 additions & 21 deletions plugin/chess/core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/FloatTech/floatbox/file"
"github.com/FloatTech/gg"
"github.com/FloatTech/zbputils/control"
"github.com/FloatTech/zbputils/img/text"
"github.com/RomiChan/syncx"
"github.com/jinzhu/gorm"
"github.com/notnil/chess"
Expand Down Expand Up @@ -103,9 +104,11 @@ func draw(groupCode, senderUin int64) message.Message {
eloString = elo
}
replyMsg := textWithAt(senderUin, "接受和棋，游戏结束。\n"+eloString+chessString)
if err := cleanTempFiles(groupCode); err != nil {
log.Debugln("[chess]", "Fail to clean temp files", err)
return message.Message{message.Text("ERROR: ", err)}
if inkscapeExists() {
if err := cleanTempFiles(groupCode); err != nil {
log.Debugln("[chess]", "Fail to clean temp files", err)
return message.Message{message.Text("ERROR: ", err)}
}
}
chessRoomMap.Delete(groupCode)
return replyMsg
Expand Down Expand Up @@ -169,9 +172,11 @@ func resign(groupCode, senderUin int64) message.Message {
replyMsg = textWithAt(senderUin, "对手认输，游戏结束，你胜利了。\n"+eloString+chessString)
}
// 删除临时文件
if err := cleanTempFiles(groupCode); err != nil {
log.Debugln("[chess]", "Fail to clean temp files", err)
return message.Message{message.Text("ERROR: ", err)}
if inkscapeExists() {
if err := cleanTempFiles(groupCode); err != nil {
log.Debugln("[chess]", "Fail to clean temp files", err)
return message.Message{message.Text("ERROR: ", err)}
}
}
chessRoomMap.Delete(groupCode)
return replyMsg
Expand Down Expand Up @@ -231,9 +236,11 @@ func play(senderUin int64, groupCode int64, moveStr string) message.Message {
chessString := getChessString(*room)
replyMsg := textWithAt(senderUin, "违例两次，游戏结束。\n"+chessString)
// 删除临时文件
if err := cleanTempFiles(groupCode); err != nil {
log.Debugln("[chess]", "Fail to clean temp files", err)
return message.Message{message.Text("ERROR: ", err)}
if inkscapeExists() {
if err := cleanTempFiles(groupCode); err != nil {
log.Debugln("[chess]", "Fail to clean temp files", err)
return message.Message{message.Text("ERROR: ", err)}
}
}
chessRoomMap.Delete(groupCode)
return replyMsg
Expand Down Expand Up @@ -309,9 +316,11 @@ func play(senderUin int64, groupCode int64, moveStr string) message.Message {
if !room.isBlindfold {
replyMsg = append(replyMsg, boardImgEle)
}
if err := cleanTempFiles(groupCode); err != nil {
log.Debugln("[chess]", "Fail to clean temp files", err)
return message.Message{message.Text("ERROR: ", err)}
if inkscapeExists() {
if err := cleanTempFiles(groupCode); err != nil {
log.Debugln("[chess]", "Fail to clean temp files", err)
return message.Message{message.Text("ERROR: ", err)}
}
}
chessRoomMap.Delete(groupCode)
return replyMsg
Expand Down Expand Up @@ -445,9 +454,11 @@ func abortGame(room chessRoom, groupCode int64, hint string) message.Message {
return message.Message{message.Text("ERROR: ", err)}
}
}
if err := cleanTempFiles(groupCode); err != nil {
log.Debugln("[chess]", "Fail to clean temp files", err)
return message.Message{message.Text("ERROR: ", err)}
if inkscapeExists() {
if err := cleanTempFiles(groupCode); err != nil {
log.Debugln("[chess]", "Fail to clean temp files", err)
return message.Message{message.Text("ERROR: ", err)}
}
}
chessRoomMap.Delete(groupCode)
msg := simpleText(hint)
Expand All @@ -470,7 +481,7 @@ func getBoardElement(groupCode int64) (message.MessageSegment, bool, string) {
}
// 未安装 inkscape 直接返回对局字符串
// TODO: 使用原生 go 库渲染 svg
if !commandExists("inkscape") {
if !inkscapeExists() {
boardString := room.chessGame.Position().Board().Draw()
boardImageB64, err := generateCharBoardImage(boardString)
if err != nil {
Expand Down Expand Up @@ -618,8 +629,7 @@ func generateCharBoardImage(boardString string) (string, error) {
dc.SetRGB(1, 1, 1)
dc.Clear()
dc.SetRGB(0, 0, 0)
// fnt := text.GNUUnifontFontFile
fontdata, err := file.GetLazyData("text.GNUUnifontFontFile", control.Md5File, true)
fontdata, err := file.GetLazyData(text.GNUUnifontFontFile, control.Md5File, true)
if err != nil {
// TODO: err solve
panic(err)
Expand Down Expand Up @@ -694,9 +704,9 @@ func getELORate(whiteUin, blackUin int64, dbService *chessDBService) (whiteRate
return
}

// commandExists 判断 指令是否存在
func commandExists(cmd string) bool {
_, err := exec.LookPath(cmd)
// inkscapeExists 判断 inkscape 是否存在
func inkscapeExists() bool {
_, err := exec.LookPath("inkscape")
return err == nil
}

Expand Down
Loading