Merge remote-tracking branch 'origin/dev' into dev

kernel/model/history.go

@@ -33,6 +33,7 @@ import (
 	"github.com/88250/lute/ast"
 	"github.com/88250/lute/parse"
 	"github.com/88250/lute/render"
+	"github.com/siyuan-note/eventbus"
 	"github.com/siyuan-note/filelock"
 	"github.com/siyuan-note/logging"
 	"github.com/siyuan-note/siyuan/kernel/conf"
@@ -691,3 +692,13 @@ func fromSQLHistories(sqlHistories []*sql.History) (ret []*HistoryItem) {
 	}
 	return
 }
+
+func init() {
+	subscribeSQLHistoryEvents()
+}
+
+func subscribeSQLHistoryEvents() {
+	eventbus.Subscribe(util.EvtSQLHistoryRebuild, func() {
+		ReindexHistory()
+	})
+}

kernel/sql/queue_history.go

@@ -83,7 +83,7 @@ func FlushHistoryQueue() {
 		if err = execHistoryOp(op, tx, context); nil != err {
 			tx.Rollback()
 			logging.LogErrorf("queue operation failed: %s", err)
-			util.PushMsg("History database index failed, please try to manually rebuild it in [Data history - File history]", 5000)
+			eventbus.Publish(util.EvtSQLHistoryRebuild)
 			return
 		}
 

kernel/util/runtime.go

@@ -404,4 +404,6 @@ func existAvailabilityStatus(workspaceAbsPath string) bool {
 
 const (
 	EvtConfPandocInitialized = "conf.pandoc.initialized"
+
+	EvtSQLHistoryRebuild = "sql.history.rebuild"
 )