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

kernel/model/index.go

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

kernel/sql/queue.go

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

kernel/sql/queue_history.go

@@ -59,7 +59,13 @@ func FlushHistoryQueue() {
 	defer txLock.Unlock()
 	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 {
 		if util.IsExiting {
 			return
@@ -70,9 +76,10 @@ func FlushHistoryQueue() {
 			return
 		}
 
-		context := map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar}
-		context["current"] = i
-		context["total"] = total
+		groupOpsCurrent[op.action]++
+		context["current"] = groupOpsCurrent[op.action]
+		context["total"] = groupOpsTotal[op.action]
+
 		if err = execHistoryOp(op, tx, context); nil != err {
 			tx.Rollback()
 			logging.LogErrorf("queue operation failed: %s", err)