Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 15:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 改进状态栏显示后台任务执行计数 Fix https://github.com/siyuan-note/siyuan/issues/7398

Browse source
This commit is contained in:
Liang Ding 2023-02-18 14:37:54 +08:00
parent dc63e56641
commit 7b41e698e1
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/model/index.go
View file

@ -268,7 +268,7 @@ func init() {
return return
} }
current := context["current"].(int) + 1 current := context["current"].(int)
total := context["total"] total := context["total"]
msg := fmt.Sprintf(Conf.Language(90), current, total, blockCount, hash) msg := fmt.Sprintf(Conf.Language(90), current, total, blockCount, hash)
util.SetBootDetails(msg) util.SetBootDetails(msg)
@ -280,7 +280,7 @@ func init() {
return return
} }
current := context["current"].(int) + 1 current := context["current"].(int)
total := context["total"] total := context["total"]
msg := fmt.Sprintf(Conf.Language(93), current, total, rootID) msg := fmt.Sprintf(Conf.Language(93), current, total, rootID)
util.SetBootDetails(msg) util.SetBootDetails(msg)
@ -292,7 +292,7 @@ func init() {
return return
} }
current := context["current"].(int) + 1 current := context["current"].(int)
total := context["total"] total := context["total"]
msg := fmt.Sprintf(Conf.Language(191), current, total) msg := fmt.Sprintf(Conf.Language(191), current, total)
util.SetBootDetails(msg) util.SetBootDetails(msg)

11
kernel/sql/queue.go
View file

@ -110,6 +110,12 @@ func FlushQueue() {
defer enableCache() defer enableCache()
} }
groupOpsTotal := map[string]int{}
for _, op := range ops {
groupOpsTotal[op.action]++
}
groupOpsCurrent := map[string]int{}
for i, op := range ops { for i, op := range ops {
if util.IsExiting { if util.IsExiting {
return return
@ -120,8 +126,9 @@ func FlushQueue() {
return return
} }
context["current"] = i groupOpsCurrent[op.action]++
context["total"] = total context["current"] = groupOpsCurrent[op.action]
context["total"] = groupOpsTotal[op.action]
if err = execOp(op, tx, context); nil != err { if err = execOp(op, tx, context); nil != err {
tx.Rollback() tx.Rollback()
logging.LogErrorf("queue operation failed: %s", err) logging.LogErrorf("queue operation failed: %s", err)

15
kernel/sql/queue_history.go
View file

@ -59,7 +59,13 @@ func FlushHistoryQueue() {
defer txLock.Unlock() defer txLock.Unlock()
start := time.Now() start := time.Now()
total := len(ops) groupOpsTotal := map[string]int{}
for _, op := range ops {
groupOpsTotal[op.action]++
}
context := map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar}
groupOpsCurrent := map[string]int{}
for i, op := range ops { for i, op := range ops {
if util.IsExiting { if util.IsExiting {
return return
@ -70,9 +76,10 @@ func FlushHistoryQueue() {
return return
} }
context := map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar} groupOpsCurrent[op.action]++
context["current"] = i context["current"] = groupOpsCurrent[op.action]
context["total"] = total context["total"] = groupOpsTotal[op.action]
if err = execHistoryOp(op, tx, context); nil != err { if err = execHistoryOp(op, tx, context); nil != err {
tx.Rollback() tx.Rollback()
logging.LogErrorf("queue operation failed: %s", err) logging.LogErrorf("queue operation failed: %s", err)