Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-09-22 00:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve the status bar index creation information prompt https://github.com/siyuan-note/siyuan/issues/15390

Browse source
This commit is contained in:
Daniel 2025-08-01 16:01:32 +08:00
parent 16d3b65b2a
commit 55bc708582
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/model/box.go
View file

@ -677,10 +677,10 @@ func FullReindex() {
} }
func fullReindex() { func fullReindex() {
pushSQLInsertBlocksFTSMsg = true pushSQLInsertBlocksFTSMsg, pushSQLDeleteBlocksMsg = true, true
defer func() { defer func() {
sql.FlushQueue() sql.FlushQueue()
pushSQLInsertBlocksFTSMsg = false pushSQLInsertBlocksFTSMsg, pushSQLDeleteBlocksMsg = false, false
}() }()
util.PushEndlessProgress(Conf.language(35)) util.PushEndlessProgress(Conf.language(35))

9
kernel/model/index.go
View file

@ -359,7 +359,10 @@ func init() {
subscribeSQLEvents() subscribeSQLEvents()
} }
var pushSQLInsertBlocksFTSMsg bool var (
pushSQLInsertBlocksFTSMsg bool
pushSQLDeleteBlocksMsg bool
)
func subscribeSQLEvents() { func subscribeSQLEvents() {
// 使用下面的 EvtSQLInsertBlocksFTS 就可以了 // 使用下面的 EvtSQLInsertBlocksFTS 就可以了
@ -371,8 +374,6 @@ func subscribeSQLEvents() {
//}) //})
eventbus.Subscribe(eventbus.EvtSQLInsertBlocksFTS, func(context map[string]interface{}, blockCount int, hash string) { eventbus.Subscribe(eventbus.EvtSQLInsertBlocksFTS, func(context map[string]interface{}, blockCount int, hash string) {
if !pushSQLInsertBlocksFTSMsg { if !pushSQLInsertBlocksFTSMsg {
// 如果不是全量重建索引，则不显示进度信息
// Improve status bar index creation information prompt https://github.com/siyuan-note/siyuan/issues/15390
return return
} }
@ -383,7 +384,7 @@ func subscribeSQLEvents() {
util.ContextPushMsg(context, msg) util.ContextPushMsg(context, msg)
}) })
eventbus.Subscribe(eventbus.EvtSQLDeleteBlocks, func(context map[string]interface{}, rootID string) { eventbus.Subscribe(eventbus.EvtSQLDeleteBlocks, func(context map[string]interface{}, rootID string) {
if util.ContainerAndroid == util.Container || util.ContainerIOS == util.Container || util.ContainerHarmony == util.Container { if !pushSQLDeleteBlocksMsg {
return return
} }