From c1ff45f4a405163ee6c9eb9c95f4dcb7f3bda939 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Thu, 26 Jan 2023 00:11:06 +0800
Subject: [PATCH 1/7] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E5=86=85?=
 =?UTF-8?q?=E6=A0=B8=E4=BB=BB=E5=8A=A1=E8=B0=83=E5=BA=A6=E6=9C=BA=E5=88=B6?=
 =?UTF-8?q?=E6=8F=90=E5=8D=87=E7=A8=B3=E5=AE=9A=E6=80=A7=20https://github.?=
 =?UTF-8?q?com/siyuan-note/siyuan/issues/7113?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/appearance/langs/en_US.json  |  4 ++--
 app/appearance/langs/es_ES.json  |  4 ++--
 app/appearance/langs/fr_FR.json  |  4 ++--
 app/appearance/langs/zh_CHT.json |  4 ++--
 app/appearance/langs/zh_CN.json  |  4 ++--
 kernel/model/index.go            | 24 ++++++++++++--------
 kernel/sql/database.go           |  6 +++--
 kernel/sql/queue.go              | 39 ++++++++++----------------------
 kernel/sql/upsert.go             | 28 +++++++++++------------
 9 files changed, 54 insertions(+), 63 deletions(-)

diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index 6ab437075..024516666 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -975,8 +975,8 @@
     "86": "Please configure [Settings - About - Access authorization code]",
     "87": "Cannot move to this location",
     "88": "Finished parsing [%d] data files, remaining to be processed [%d]",
-    "89": "Created [%d] of data indexes of block-level elements [%s]",
-    "90": "Created [%d] of search indexes of block-level elements [%s]",
+    "89": "[%d/%d] Created [%d] of data indexes of block-level elements [%s]",
+    "90": "[%d/%d] Created [%d] of search indexes of block-level elements [%s]",
     "91": "Reading block tree data...",
     "92": "Parsing document tree [%s]",
     "93": "TODO",
diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
index c3798ce80..d9911406f 100644
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@@ -975,8 +975,8 @@
     "86": "Por favor, configure [Configuración - Acerca de - Código de autorización de acceso]",
     "87": "No se puede mover a esta ubicación",
     "88": "Se ha terminado de analizar [%d] archivos de datos, quedan por procesar [%d]",
-    "89": "Creado [%d] de índices de datos de elementos a nivel de bloque [%s]",
-    "90": "Creado [%d] de índices de búsqueda de elementos a nivel de bloque [%s]",
+    "89": "[%d/%d] Creado [%d] de índices de datos de elementos a nivel de bloque [%s]",
+    "90": "[%d/%d] Creado [%d] de índices de búsqueda de elementos a nivel de bloque [%s]",
     "91": "Leyendo datos del árbol de bloques...",
     "92": "Analizando el árbol del documento [%s]",
     "93": "TODO",
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index 56d33ad79..223e82401 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -975,8 +975,8 @@
     "86": "Veuillez configurer [Paramètres - A propos de - Code d'autorisation d'accès]",
     "87": "Impossible de se déplacer vers cet endroit",
     "88": "Fin de l'analyse des fichiers de données [%d], restant à traiter [%d]",
-    "89": "Créé [%d] d'index de données d'éléments de niveau bloc [%s]",
-    "90": "Création de [%d] index de recherche d'éléments de niveau bloc [%s]",
+    "89": "[%d/%d] Créé [%d] d'index de données d'éléments de niveau bloc [%s]",
+    "90": "[%d/%d] Création de [%d] index de recherche d'éléments de niveau bloc [%s]",
     "91": "Lecture des données de l'arborescence des blocs...",
     "92": "Analyse de l'arborescence du document [%s]",
     "93": "TODO",
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index e42bacddf..6bf35f1f7 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -975,8 +975,8 @@
     "86": "請先配置 [設置 - 關於 - 存取授權碼]",
     "87": "無法移動到該位置",
     "88": "已完成解析 [%d] 個數據文件，剩餘待處理 [%d]",
-    "89": "已經建立 [%d] 個塊級元素的數據索引 [%s]",
-    "90": "已經建立 [%d] 個塊級元素的搜索索引 [%s]",
+    "89": "[%d/%d] 已經建立 [%d] 個塊級元素的數據索引 [%s]",
+    "90": "[%d/%d] 已經建立 [%d] 個塊級元素的搜索索引 [%s]",
     "91": "正在讀取塊樹數據...",
     "92": "正在解析文檔樹 [%s]",
     "93": "TODO",
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index e75df9ae2..47569c511 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -975,8 +975,8 @@
     "86": "请先配置 [设置 - 关于 - 访问授权码]",
     "87": "无法移动到该位置",
     "88": "已完成解析 [%d] 个数据文件，剩余待处理 [%d]",
-    "89": "已经建立 [%d] 个块级元素的数据索引 [%s]",
-    "90": "已经建立 [%d] 个块级元素的搜索索引 [%s]",
+    "89": "[%d/%d] 已经建立 [%d] 个块级元素的数据索引 [%s]",
+    "90": "[%d/%d] 已经建立 [%d] 个块级元素的搜索索引 [%s]",
     "91": "正在读取块树数据...",
     "92": "正在解析文档树 [%s]",
     "93": "TODO",
diff --git a/kernel/model/index.go b/kernel/model/index.go
index 2b4477579..7be3a7642 100644
--- a/kernel/model/index.go
+++ b/kernel/model/index.go
@@ -187,23 +187,27 @@ func IndexRefs() {
 }
 
 func init() {
-	eventbus.Subscribe(eventbus.EvtSQLInsertBlocks, func(context map[string]interface{}, blockCount int, hash string) {
+	//eventbus.Subscribe(eventbus.EvtSQLInsertBlocks, func(context map[string]interface{}, current, total, blockCount int, hash string) {
+	//	if util.ContainerAndroid == util.Container || util.ContainerIOS == util.Container {
+	//		// Android/iOS 端不显示数据索引和搜索索引状态提示 https://github.com/siyuan-note/siyuan/issues/6392
+	//		return
+	//	}
+	//
+	//	msg := fmt.Sprintf(Conf.Language(89), current, total, blockCount, hash)
+	//	util.SetBootDetails(msg)
+	//	util.ContextPushMsg(context, msg)
+	//})
+	eventbus.Subscribe(eventbus.EvtSQLInsertBlocksFTS, func(context map[string]interface{}, current, total, blockCount int, hash string) {
 		if util.ContainerAndroid == util.Container || util.ContainerIOS == util.Container {
 			// Android/iOS 端不显示数据索引和搜索索引状态提示 https://github.com/siyuan-note/siyuan/issues/6392
 			return
 		}
 
-		msg := fmt.Sprintf(Conf.Language(89), blockCount, hash)
-		util.SetBootDetails(msg)
-		util.ContextPushMsg(context, msg)
-	})
-	eventbus.Subscribe(eventbus.EvtSQLInsertBlocksFTS, func(context map[string]interface{}, blockCount int, hash string) {
-		if util.ContainerAndroid == util.Container || util.ContainerIOS == util.Container {
-			// Android/iOS 端不显示数据索引和搜索索引状态提示 https://github.com/siyuan-note/siyuan/issues/6392
-			return
+		if (1 > current && 1 == total) || current == total-1 {
+			current = total
 		}
 
-		msg := fmt.Sprintf(Conf.Language(90), blockCount, hash)
+		msg := fmt.Sprintf(Conf.Language(90), current, total, blockCount, hash)
 		util.SetBootDetails(msg)
 		util.ContextPushMsg(context, msg)
 	})
diff --git a/kernel/sql/database.go b/kernel/sql/database.go
index 2c971234c..bef9bd5ee 100644
--- a/kernel/sql/database.go
+++ b/kernel/sql/database.go
@@ -180,9 +180,10 @@ func initHistoryDBConnection() {
 
 	dsn := util.HistoryDBPath + "?_journal_mode=OFF" +
 		"&_synchronous=OFF" +
+		"&_mmap_size=2684354560" +
 		"&_secure_delete=OFF" +
 		"&_cache_size=-20480" +
-		"&_page_size=8192" +
+		"&_page_size=32768" +
 		"&_busy_timeout=7000" +
 		"&_ignore_check_constraints=ON" +
 		"&_temp_store=MEMORY" +
@@ -212,9 +213,10 @@ func initDBConnection() {
 	}
 	dsn := util.DBPath + "?_journal_mode=WAL" +
 		"&_synchronous=OFF" +
+		"&_mmap_size=2684354560" +
 		"&_secure_delete=OFF" +
 		"&_cache_size=-20480" +
-		"&_page_size=8192" +
+		"&_page_size=32768" +
 		"&_busy_timeout=7000" +
 		"&_ignore_check_constraints=ON" +
 		"&_temp_store=MEMORY" +
diff --git a/kernel/sql/queue.go b/kernel/sql/queue.go
index 57c118282..2291f7dd4 100644
--- a/kernel/sql/queue.go
+++ b/kernel/sql/queue.go
@@ -101,57 +101,42 @@ func FlushQueue() {
 	txLock.Lock()
 	defer txLock.Unlock()
 	start := time.Now()
-	tx, err := beginTx()
-	if nil != err {
-		return
-	}
 
-	var execOps int
 	context := map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar}
+	total := len(ops)
 	for i, op := range ops {
 		if util.IsExiting {
 			return
 		}
 
-		err = execOp(op, tx, context)
-		execOps++
-
+		tx, err := beginTx()
 		if nil != err {
+			return
+		}
+
+		if err = execOp(op, tx, i, total, context); nil != err {
 			logging.LogErrorf("queue operation failed: %s", err)
 			return
 		}
 
-		if 0 < i && 0 == execOps%128 {
-			if err = commitTx(tx); nil != err {
-				logging.LogErrorf("commit tx failed: %s", err)
-				return
-			}
-
-			execOps = 0
-			tx, err = beginTx()
-			if nil != err {
-				return
-			}
-		}
-	}
-
-	if 0 < execOps {
 		if err = commitTx(tx); nil != err {
 			logging.LogErrorf("commit tx failed: %s", err)
+			return
 		}
 	}
+
 	elapsed := time.Now().Sub(start).Milliseconds()
 	if 5000 < elapsed {
 		logging.LogInfof("op tx [%dms]", elapsed)
 	}
 }
 
-func execOp(op *dbQueueOperation, tx *sql.Tx, context map[string]interface{}) (err error) {
+func execOp(op *dbQueueOperation, tx *sql.Tx, current, total int, context map[string]interface{}) (err error) {
 	switch op.action {
 	case "index":
-		err = indexTree(tx, op.box, op.indexPath, context)
+		err = indexTree(tx, op.box, op.indexPath, current, total, context)
 	case "upsert":
-		err = upsertTree(tx, op.upsertTree, context)
+		err = upsertTree(tx, op.upsertTree, current, total, context)
 	case "delete":
 		err = batchDeleteByPathPrefix(tx, op.removeTreeBox, op.removeTreePath)
 	case "delete_id":
@@ -171,7 +156,7 @@ func execOp(op *dbQueueOperation, tx *sql.Tx, context map[string]interface{}) (e
 	case "update_refs":
 		err = upsertRefs(tx, op.upsertTree)
 	default:
-		msg := fmt.Sprint("unknown operation [%s]", op.action)
+		msg := fmt.Sprintf("unknown operation [%s]", op.action)
 		logging.LogErrorf(msg)
 		err = errors.New(msg)
 	}
diff --git a/kernel/sql/upsert.go b/kernel/sql/upsert.go
index f0d9875a7..7fb710610 100644
--- a/kernel/sql/upsert.go
+++ b/kernel/sql/upsert.go
@@ -51,7 +51,7 @@ const (
 	FileAnnotationRefsPlaceholder = "(?, ?, ?, ?, ?, ?, ?, ?, ?)"
 )
 
-func insertBlocks(tx *sql.Tx, blocks []*Block, context map[string]interface{}) (err error) {
+func insertBlocks(tx *sql.Tx, blocks []*Block, current, total int, context map[string]interface{}) (err error) {
 	if 1 > len(blocks) {
 		return
 	}
@@ -63,20 +63,20 @@ func insertBlocks(tx *sql.Tx, blocks []*Block, context map[string]interface{}) (
 			continue
 		}
 
-		if err = insertBlocks0(tx, bulk, context); nil != err {
+		if err = insertBlocks0(tx, bulk, current, total, context); nil != err {
 			return
 		}
 		bulk = []*Block{}
 	}
 	if 0 < len(bulk) {
-		if err = insertBlocks0(tx, bulk, context); nil != err {
+		if err = insertBlocks0(tx, bulk, current, total, context); nil != err {
 			return
 		}
 	}
 	return
 }
 
-func insertBlocks0(tx *sql.Tx, bulk []*Block, context map[string]interface{}) (err error) {
+func insertBlocks0(tx *sql.Tx, bulk []*Block, current, total int, context map[string]interface{}) (err error) {
 	valueStrings := make([]string, 0, len(bulk))
 	valueArgs := make([]interface{}, 0, len(bulk)*strings.Count(BlocksPlaceholder, "?"))
 	hashBuf := bytes.Buffer{}
@@ -114,7 +114,7 @@ func insertBlocks0(tx *sql.Tx, bulk []*Block, context map[string]interface{}) (e
 	}
 	hashBuf.WriteString("blocks")
 	evtHash := fmt.Sprintf("%x", sha256.Sum256(hashBuf.Bytes()))[:7]
-	eventbus.Publish(eventbus.EvtSQLInsertBlocks, context, len(bulk), evtHash)
+	//eventbus.Publish(eventbus.EvtSQLInsertBlocks, context, current, total, len(bulk), evtHash)
 
 	stmt = fmt.Sprintf(BlocksFTSInsert, strings.Join(valueStrings, ","))
 	if err = prepareExecInsertTx(tx, stmt, valueArgs); nil != err {
@@ -129,7 +129,7 @@ func insertBlocks0(tx *sql.Tx, bulk []*Block, context map[string]interface{}) (e
 	}
 	hashBuf.WriteString("fts")
 	evtHash = fmt.Sprintf("%x", sha256.Sum256(hashBuf.Bytes()))[:7]
-	eventbus.Publish(eventbus.EvtSQLInsertBlocksFTS, context, len(bulk), evtHash)
+	eventbus.Publish(eventbus.EvtSQLInsertBlocksFTS, context, current, total, len(bulk), evtHash)
 	return
 }
 
@@ -393,24 +393,24 @@ func insertRefs(tx *sql.Tx, tree *parse.Tree) (err error) {
 	return err
 }
 
-func indexTree(tx *sql.Tx, box, p string, context map[string]interface{}) (err error) {
+func indexTree(tx *sql.Tx, box, p string, current, total int, context map[string]interface{}) (err error) {
 	tree, err := filesys.LoadTree(box, p, luteEngine)
 	if nil != err {
 		return
 	}
 
-	err = insertTree(tx, tree, context)
+	err = insertTree(tx, tree, current, total, context)
 	return
 }
 
-func insertTree(tx *sql.Tx, tree *parse.Tree, context map[string]interface{}) (err error) {
+func insertTree(tx *sql.Tx, tree *parse.Tree, current, total int, context map[string]interface{}) (err error) {
 	blocks, spans, assets, attributes := fromTree(tree.Root, tree)
 	refs, fileAnnotationRefs := refsFromTree(tree)
-	err = insertTree0(tx, tree, context, blocks, spans, assets, attributes, refs, fileAnnotationRefs)
+	err = insertTree0(tx, tree, current, total, context, blocks, spans, assets, attributes, refs, fileAnnotationRefs)
 	return
 }
 
-func upsertTree(tx *sql.Tx, tree *parse.Tree, context map[string]interface{}) (err error) {
+func upsertTree(tx *sql.Tx, tree *parse.Tree, current, total int, context map[string]interface{}) (err error) {
 	oldBlockHashes := queryBlockHashes(tree.ID)
 	blocks, spans, assets, attributes := fromTree(tree.Root, tree)
 	newBlockHashes := map[string]string{}
@@ -460,16 +460,16 @@ func upsertTree(tx *sql.Tx, tree *parse.Tree, context map[string]interface{}) (e
 	}
 
 	refs, fileAnnotationRefs := refsFromTree(tree)
-	if err = insertTree0(tx, tree, context, blocks, spans, assets, attributes, refs, fileAnnotationRefs); nil != err {
+	if err = insertTree0(tx, tree, current, total, context, blocks, spans, assets, attributes, refs, fileAnnotationRefs); nil != err {
 		return
 	}
 	return err
 }
 
-func insertTree0(tx *sql.Tx, tree *parse.Tree, context map[string]interface{},
+func insertTree0(tx *sql.Tx, tree *parse.Tree, current, total int, context map[string]interface{},
 	blocks []*Block, spans []*Span, assets []*Asset, attributes []*Attribute,
 	refs []*Ref, fileAnnotationRefs []*FileAnnotationRef) (err error) {
-	if err = insertBlocks(tx, blocks, context); nil != err {
+	if err = insertBlocks(tx, blocks, current, total, context); nil != err {
 		return
 	}
 

From 7d1b50116b7d97826f7ba929c527fe4b3791e231 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Thu, 26 Jan 2023 00:47:14 +0800
Subject: [PATCH 2/7] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E5=86=85?=
 =?UTF-8?q?=E6=A0=B8=E4=BB=BB=E5=8A=A1=E8=B0=83=E5=BA=A6=E6=9C=BA=E5=88=B6?=
 =?UTF-8?q?=E6=8F=90=E5=8D=87=E7=A8=B3=E5=AE=9A=E6=80=A7=20https://github.?=
 =?UTF-8?q?com/siyuan-note/siyuan/issues/7113?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/appearance/langs/en_US.json  |  5 +++--
 app/appearance/langs/es_ES.json  |  5 +++--
 app/appearance/langs/fr_FR.json  |  5 +++--
 app/appearance/langs/zh_CHT.json |  5 +++--
 app/appearance/langs/zh_CN.json  |  5 +++--
 kernel/model/box.go              | 10 ++++------
 kernel/model/history.go          |  2 ++
 kernel/model/import.go           |  8 +-------
 kernel/model/index.go            |  8 +++-----
 kernel/model/repository.go       |  8 ++++++--
 kernel/model/sync.go             |  5 -----
 kernel/sql/queue.go              | 10 ++++++----
 kernel/sql/upsert.go             | 26 +++++++++++++-------------
 kernel/task/queue.go             |  1 +
 14 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index 024516666..695142b39 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -873,7 +873,8 @@
     "task.database.index.fix": "Execute database index fix",
     "task.ocr.image": "Execute image OCR to extract text",
     "task.history.generateDoc": "Execute GenerateDoc History",
-    "task.database.index.embedBlock": "Execute database index embed block"
+    "task.database.index.embedBlock": "Execute database index embed block",
+    "task.reload.ui": "Execute reload UI"
   },
   "_trayMenu": {
     "showWindow": "Show Window",
@@ -944,7 +945,7 @@
     "55": "Indexed references of [%d] documents",
     "56": "Reindexing, please wait until rebuilding is complete before trying to open",
     "57": "Failed to create temp key",
-    "58": "After the index is rebuilt, the interface will be automatically refreshed later...",
+    "58": "TODO",
     "59": "Failed to set sync ignore list",
     "60": "Failed to get the update package: %s",
     "61": "⬆️ The new version installation package is ready, do you want to install the new version now?",
diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
index d9911406f..ab6f57240 100644
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@@ -873,7 +873,8 @@
     "task.database.index.fix": "Ejecutar corrección del índice de la base de datos",
     "task.ocr.image": "Ejecutar OCR de imagen para extraer texto",
     "task.history.generateDoc": "Ejecutar Historial GenerateDoc",
-    "task.database.index.embedBlock": "Ejecutar bloque de incrustación de índice de base de datos"
+    "task.database.index.embedBlock": "Ejecutar bloque de incrustación de índice de base de datos",
+    "task.reload.ui": "IU de recarga de tareas"
   },
   "_trayMenu": {
     "showWindow": "Mostrar ventana",
@@ -944,7 +945,7 @@
     "55": "Referencias indexadas de [%d] documentos",
     "56": "Reindexando, espere hasta que se complete la reconstrucción antes de intentar abrir",
     "57": "Fallo en la creación de la clave temporal",
-    "58": "Después de reconstruir el índice, la interfaz se actualizará automáticamente más tarde...",
+    "58": "TODO",
     "59": " Falló la configuración de sincronización de la lista de ignorados",
     "60": "Fallo al obtener el paquete de actualización: %s",
     "61": "⬆️ El paquete de instalación de la nueva versión está listo, ¿quieres instalar la nueva versión ahora?",
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index 223e82401..ef641a34f 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -873,7 +873,8 @@
     "task.database.index.fix": "Effectuer la correction de l'index de la base de données",
     "task.ocr.image": "Exécute l'OCR d'image pour extraire le texte",
     "task.history.generateDoc": "Exécuter l'historique de GenerateDoc",
-    "task.database.index.embedBlock": "Exécuter le bloc d'intégration d'index de base de données"
+    "task.database.index.embedBlock": "Exécuter le bloc d'intégration d'index de base de données",
+    "task.reload.ui": "Interface utilisateur de rechargement de tâche"
   },
   "_trayMenu": {
     "showWindow": "Afficher la fenêtre principale",
@@ -944,7 +945,7 @@
     "55": "Références indexées de [%d] documents",
     "56": "Réindexation, veuillez attendre que la reconstruction soit terminée avant d'essayer d'ouvrir",
     "57": "Échec de la création d'une clé temporaire",
-    "58": "Une fois l'index reconstruit, l'interface sera automatiquement rafraîchie ultérieurement...",
+    "58": "TODO",
     "59": "Échec de la définition de la liste des ignores de synchronisation",
     "60": "Échec de la récupération du paquet de mise à jour : %s",
     "61": "⬆️ Le package d'installation de la nouvelle version est prêt, voulez-vous installer la nouvelle version maintenant ?",
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index 6bf35f1f7..5bfa6fc5a 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -873,7 +873,8 @@
     "task.database.index.fix": "執行數據庫索引訂正",
     "task.ocr.image": "執行圖片 OCR 提取文本",
     "task.history.generateDoc": "執行生成文件歷史",
-    "task.database.index.embedBlock": "執行數據庫索引嵌入塊"
+    "task.database.index.embedBlock": "執行數據庫索引嵌入塊",
+    "task.reload.ui": "執行重載界面"
   },
   "_trayMenu": {
     "showWindow": "顯示主窗口",
@@ -944,7 +945,7 @@
     "55": "已完成索引 [%d] 篇文檔的引用關係",
     "56": "正在重建索引，請等重建索引完畢後再嘗試打開",
     "57": "創建臨時金鑰失敗",
-    "58": "重建索引完畢，稍後將自動重新整理介面...",
+    "58": "TODO",
     "59": "設置同步忽略列表失敗",
     "60": "獲取更新包失敗：%s",
     "61": "⬆️ 新版本安裝包已經準備就緒，是否現在安裝新版本？",
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index 47569c511..a7f4dd4fa 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -873,7 +873,8 @@
     "task.database.index.fix": "执行数据库索引订正",
     "task.ocr.image": "执行图片 OCR 提取文本",
     "task.history.generateDoc": "执行生成文件历史",
-    "task.database.index.embedBlock": "执行数据库索引嵌入块"
+    "task.database.index.embedBlock": "执行数据库索引嵌入块",
+    "task.reload.ui": "执行重载界面"
   },
   "_trayMenu": {
     "showWindow": "显示主窗口",
@@ -944,7 +945,7 @@
     "55": "已完成索引 [%d] 篇文档的引用关系",
     "56": "正在重建索引，请等重建索引完毕后再尝试打开",
     "57": "创建临时密钥失败",
-    "58": "重建索引完毕，稍后将自动刷新界面...",
+    "58": "TODO",
     "59": "设置同步忽略列表失败",
     "60": "获取更新包失败：%s",
     "61": "⬆️ 新版本安装包已经准备就绪，是否现在安装新版本？",
diff --git a/kernel/model/box.go b/kernel/model/box.go
index 163860adb..c2efb576a 100644
--- a/kernel/model/box.go
+++ b/kernel/model/box.go
@@ -497,6 +497,10 @@ func genTreeID(tree *parse.Tree) {
 	return
 }
 
+func ReloadUI() {
+	task.AppendTask(task.ReloadUI, util.ReloadUI)
+}
+
 func FullReindex() {
 	task.PrependTask(task.DatabaseIndexFull, fullReindex)
 	task.AppendTask(task.DatabaseIndexRef, IndexRefs)
@@ -518,12 +522,6 @@ func fullReindex() {
 	}
 	treenode.SaveBlockTree(true)
 	LoadFlashcards()
-
-	util.PushMsg(Conf.Language(58), 7000)
-	go func() {
-		time.Sleep(1 * time.Second)
-		util.ReloadUI()
-	}()
 }
 
 func ChangeBoxSort(boxIDs []string) {
diff --git a/kernel/model/history.go b/kernel/model/history.go
index 476e18614..5ac0ecafa 100644
--- a/kernel/model/history.go
+++ b/kernel/model/history.go
@@ -243,6 +243,7 @@ func RollbackDocHistory(boxID, historyPath string) (err error) {
 
 	FullReindex()
 	IncSync()
+	ReloadUI()
 	return nil
 }
 
@@ -298,6 +299,7 @@ func RollbackNotebookHistory(historyPath string) (err error) {
 
 	FullReindex()
 	IncSync()
+	ReloadUI()
 	return nil
 }
 
diff --git a/kernel/model/import.go b/kernel/model/import.go
index 2edcd3be4..941cc1ab1 100644
--- a/kernel/model/import.go
+++ b/kernel/model/import.go
@@ -441,6 +441,7 @@ func ImportData(zipPath string) (err error) {
 
 	IncSync()
 	FullReindex()
+	ReloadUI()
 	return
 }
 
@@ -706,13 +707,6 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) {
 			return
 		}
 		IncSync()
-		sql.WaitForWritingDatabase()
-
-		util.PushEndlessProgress(Conf.Language(58))
-		go func() {
-			time.Sleep(2 * time.Second)
-			util.ReloadUI()
-		}()
 	}
 	debug.FreeOSMemory()
 	IncSync()
diff --git a/kernel/model/index.go b/kernel/model/index.go
index 7be3a7642..aa1a3815b 100644
--- a/kernel/model/index.go
+++ b/kernel/model/index.go
@@ -197,16 +197,14 @@ func init() {
 	//	util.SetBootDetails(msg)
 	//	util.ContextPushMsg(context, msg)
 	//})
-	eventbus.Subscribe(eventbus.EvtSQLInsertBlocksFTS, func(context map[string]interface{}, current, total, blockCount int, hash string) {
+	eventbus.Subscribe(eventbus.EvtSQLInsertBlocksFTS, func(context map[string]interface{}, blockCount int, hash string) {
 		if util.ContainerAndroid == util.Container || util.ContainerIOS == util.Container {
 			// Android/iOS 端不显示数据索引和搜索索引状态提示 https://github.com/siyuan-note/siyuan/issues/6392
 			return
 		}
 
-		if (1 > current && 1 == total) || current == total-1 {
-			current = total
-		}
-
+		current := context["current"]
+		total := context["total"]
 		msg := fmt.Sprintf(Conf.Language(90), current, total, blockCount, hash)
 		util.SetBootDetails(msg)
 		util.ContextPushMsg(context, msg)
diff --git a/kernel/model/repository.go b/kernel/model/repository.go
index 2f43befb8..3ad7d4577 100644
--- a/kernel/model/repository.go
+++ b/kernel/model/repository.go
@@ -540,6 +540,7 @@ func checkoutRepo(id string) {
 	}
 
 	FullReindex()
+	ReloadUI()
 
 	if syncEnabled {
 		func() {
@@ -1025,12 +1026,15 @@ func syncRepo(exit, byHand bool) (err error) {
 	cache.ClearDocsIAL()              // 同步后文档树文档图标没有更新 https://github.com/siyuan-note/siyuan/issues/4939
 	if needFullReindex(upsertTrees) { // 改进同步后全量重建索引判断 https://github.com/siyuan-note/siyuan/issues/5764
 		FullReindex()
+		if !exit {
+			ReloadUI()
+		}
 		return
 	}
-	incReindex(upserts, removes)
 
+	incReindex(upserts, removes)
 	if !exit {
-		util.ReloadUI()
+		ReloadUI()
 	}
 
 	elapsed = time.Since(start)
diff --git a/kernel/model/sync.go b/kernel/model/sync.go
index ff2ff2309..170491c76 100644
--- a/kernel/model/sync.go
+++ b/kernel/model/sync.go
@@ -251,11 +251,6 @@ func incReindex(upserts, removes []string) {
 		treenode.IndexBlockTree(tree)
 		sql.UpsertTreeQueue(tree)
 	}
-
-	util.PushStatusBar(Conf.Language(58))
-	if needPushRemoveProgress || needPushUpsertProgress {
-		util.PushEndlessProgress(Conf.Language(58))
-	}
 }
 
 func SetCloudSyncDir(name string) {
diff --git a/kernel/sql/queue.go b/kernel/sql/queue.go
index 2291f7dd4..88bffb347 100644
--- a/kernel/sql/queue.go
+++ b/kernel/sql/queue.go
@@ -114,7 +114,9 @@ func FlushQueue() {
 			return
 		}
 
-		if err = execOp(op, tx, i, total, context); nil != err {
+		context["current"] = i
+		context["total"] = total
+		if err = execOp(op, tx, context); nil != err {
 			logging.LogErrorf("queue operation failed: %s", err)
 			return
 		}
@@ -131,12 +133,12 @@ func FlushQueue() {
 	}
 }
 
-func execOp(op *dbQueueOperation, tx *sql.Tx, current, total int, context map[string]interface{}) (err error) {
+func execOp(op *dbQueueOperation, tx *sql.Tx, context map[string]interface{}) (err error) {
 	switch op.action {
 	case "index":
-		err = indexTree(tx, op.box, op.indexPath, current, total, context)
+		err = indexTree(tx, op.box, op.indexPath, context)
 	case "upsert":
-		err = upsertTree(tx, op.upsertTree, current, total, context)
+		err = upsertTree(tx, op.upsertTree, context)
 	case "delete":
 		err = batchDeleteByPathPrefix(tx, op.removeTreeBox, op.removeTreePath)
 	case "delete_id":
diff --git a/kernel/sql/upsert.go b/kernel/sql/upsert.go
index 7fb710610..2eeecbc89 100644
--- a/kernel/sql/upsert.go
+++ b/kernel/sql/upsert.go
@@ -51,7 +51,7 @@ const (
 	FileAnnotationRefsPlaceholder = "(?, ?, ?, ?, ?, ?, ?, ?, ?)"
 )
 
-func insertBlocks(tx *sql.Tx, blocks []*Block, current, total int, context map[string]interface{}) (err error) {
+func insertBlocks(tx *sql.Tx, blocks []*Block, context map[string]interface{}) (err error) {
 	if 1 > len(blocks) {
 		return
 	}
@@ -63,20 +63,20 @@ func insertBlocks(tx *sql.Tx, blocks []*Block, current, total int, context map[s
 			continue
 		}
 
-		if err = insertBlocks0(tx, bulk, current, total, context); nil != err {
+		if err = insertBlocks0(tx, bulk, context); nil != err {
 			return
 		}
 		bulk = []*Block{}
 	}
 	if 0 < len(bulk) {
-		if err = insertBlocks0(tx, bulk, current, total, context); nil != err {
+		if err = insertBlocks0(tx, bulk, context); nil != err {
 			return
 		}
 	}
 	return
 }
 
-func insertBlocks0(tx *sql.Tx, bulk []*Block, current, total int, context map[string]interface{}) (err error) {
+func insertBlocks0(tx *sql.Tx, bulk []*Block, context map[string]interface{}) (err error) {
 	valueStrings := make([]string, 0, len(bulk))
 	valueArgs := make([]interface{}, 0, len(bulk)*strings.Count(BlocksPlaceholder, "?"))
 	hashBuf := bytes.Buffer{}
@@ -129,7 +129,7 @@ func insertBlocks0(tx *sql.Tx, bulk []*Block, current, total int, context map[st
 	}
 	hashBuf.WriteString("fts")
 	evtHash = fmt.Sprintf("%x", sha256.Sum256(hashBuf.Bytes()))[:7]
-	eventbus.Publish(eventbus.EvtSQLInsertBlocksFTS, context, current, total, len(bulk), evtHash)
+	eventbus.Publish(eventbus.EvtSQLInsertBlocksFTS, context, len(bulk), evtHash)
 	return
 }
 
@@ -393,24 +393,24 @@ func insertRefs(tx *sql.Tx, tree *parse.Tree) (err error) {
 	return err
 }
 
-func indexTree(tx *sql.Tx, box, p string, current, total int, context map[string]interface{}) (err error) {
+func indexTree(tx *sql.Tx, box, p string, context map[string]interface{}) (err error) {
 	tree, err := filesys.LoadTree(box, p, luteEngine)
 	if nil != err {
 		return
 	}
 
-	err = insertTree(tx, tree, current, total, context)
+	err = insertTree(tx, tree, context)
 	return
 }
 
-func insertTree(tx *sql.Tx, tree *parse.Tree, current, total int, context map[string]interface{}) (err error) {
+func insertTree(tx *sql.Tx, tree *parse.Tree, context map[string]interface{}) (err error) {
 	blocks, spans, assets, attributes := fromTree(tree.Root, tree)
 	refs, fileAnnotationRefs := refsFromTree(tree)
-	err = insertTree0(tx, tree, current, total, context, blocks, spans, assets, attributes, refs, fileAnnotationRefs)
+	err = insertTree0(tx, tree, context, blocks, spans, assets, attributes, refs, fileAnnotationRefs)
 	return
 }
 
-func upsertTree(tx *sql.Tx, tree *parse.Tree, current, total int, context map[string]interface{}) (err error) {
+func upsertTree(tx *sql.Tx, tree *parse.Tree, context map[string]interface{}) (err error) {
 	oldBlockHashes := queryBlockHashes(tree.ID)
 	blocks, spans, assets, attributes := fromTree(tree.Root, tree)
 	newBlockHashes := map[string]string{}
@@ -460,16 +460,16 @@ func upsertTree(tx *sql.Tx, tree *parse.Tree, current, total int, context map[st
 	}
 
 	refs, fileAnnotationRefs := refsFromTree(tree)
-	if err = insertTree0(tx, tree, current, total, context, blocks, spans, assets, attributes, refs, fileAnnotationRefs); nil != err {
+	if err = insertTree0(tx, tree, context, blocks, spans, assets, attributes, refs, fileAnnotationRefs); nil != err {
 		return
 	}
 	return err
 }
 
-func insertTree0(tx *sql.Tx, tree *parse.Tree, current, total int, context map[string]interface{},
+func insertTree0(tx *sql.Tx, tree *parse.Tree, context map[string]interface{},
 	blocks []*Block, spans []*Span, assets []*Asset, attributes []*Attribute,
 	refs []*Ref, fileAnnotationRefs []*FileAnnotationRef) (err error) {
-	if err = insertBlocks(tx, blocks, current, total, context); nil != err {
+	if err = insertBlocks(tx, blocks, context); nil != err {
 		return
 	}
 
diff --git a/kernel/task/queue.go b/kernel/task/queue.go
index af3ff2f2f..b1b3afbc8 100644
--- a/kernel/task/queue.go
+++ b/kernel/task/queue.go
@@ -109,6 +109,7 @@ const (
 	OCRImage                = "task.ocr.image"                 // 图片 OCR 提取文本
 	HistoryGenerateDoc      = "task.history.generateDoc"       // 生成文件历史
 	DatabaseIndexEmbedBlock = "task.database.index.embedBlock" // 数据库索引嵌入块
+	ReloadUI                = "task.reload.ui"                 // 重载 UI
 )
 
 func ContainIndexTask() bool {

From 85481e50eea512040293d1d0d152d7a1ebe9a3dc Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Thu, 26 Jan 2023 00:51:17 +0800
Subject: [PATCH 3/7] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E5=86=85?=
 =?UTF-8?q?=E6=A0=B8=E4=BB=BB=E5=8A=A1=E8=B0=83=E5=BA=A6=E6=9C=BA=E5=88=B6?=
 =?UTF-8?q?=E6=8F=90=E5=8D=87=E7=A8=B3=E5=AE=9A=E6=80=A7=20https://github.?=
 =?UTF-8?q?com/siyuan-note/siyuan/issues/7113?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/index.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/model/index.go b/kernel/model/index.go
index aa1a3815b..424eedfee 100644
--- a/kernel/model/index.go
+++ b/kernel/model/index.go
@@ -203,7 +203,7 @@ func init() {
 			return
 		}
 
-		current := context["current"]
+		current := context["current"].(int) + 1
 		total := context["total"]
 		msg := fmt.Sprintf(Conf.Language(90), current, total, blockCount, hash)
 		util.SetBootDetails(msg)

From 2dec9f2434ac674218f4fb83c72394442ba603f5 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Thu, 26 Jan 2023 01:09:36 +0800
Subject: [PATCH 4/7] =?UTF-8?q?:bug:=20=E6=8A=98=E5=8F=A0=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E7=A7=BB=E5=8A=A8=E5=88=B0=E4=B8=8B=E6=96=B9=E5=90=8E?=
 =?UTF-8?q?=E8=A7=A6=E5=8F=91=E7=8A=B6=E6=80=81=E5=BC=82=E5=B8=B8=E5=B9=B6?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1=20https:?=
 =?UTF-8?q?//github.com/siyuan-note/siyuan/issues/7163?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/transaction.go | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/kernel/model/transaction.go b/kernel/model/transaction.go
index a858bb64b..a047fe519 100644
--- a/kernel/model/transaction.go
+++ b/kernel/model/transaction.go
@@ -310,6 +310,14 @@ func (tx *Transaction) doMove(operation *Operation) (ret *TxErr) {
 				targetNode = targetChildren[l-1]
 			}
 		}
+
+		for _, headingChild := range headingChildren {
+			if headingChild.ID == targetNode.ID {
+				// 不能将折叠标题移动到自己下方节点的前或后 https://github.com/siyuan-note/siyuan/issues/7163
+				return
+			}
+		}
+
 		for i := len(headingChildren) - 1; -1 < i; i-- {
 			c := headingChildren[i]
 			targetNode.InsertAfter(c)
@@ -352,6 +360,13 @@ func (tx *Transaction) doMove(operation *Operation) (ret *TxErr) {
 		return &TxErr{code: TxErrCodeBlockNotFound, id: targetParentID}
 	}
 
+	for _, headingChild := range headingChildren {
+		if headingChild.ID == targetNode.ID {
+			// 不能将折叠标题移动到自己下方节点的前或后 https://github.com/siyuan-note/siyuan/issues/7163
+			return
+		}
+	}
+
 	processed := false
 	if ast.NodeSuperBlock == targetNode.Type {
 		// 在布局节点后插入

From b3edfec60eed6ac902bb54a373831c694075ba9d Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Thu, 26 Jan 2023 01:16:01 +0800
Subject: [PATCH 5/7] =?UTF-8?q?:bug:=20=E6=8A=98=E5=8F=A0=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E7=A7=BB=E5=8A=A8=E5=88=B0=E4=B8=8B=E6=96=B9=E5=90=8E?=
 =?UTF-8?q?=E8=A7=A6=E5=8F=91=E7=8A=B6=E6=80=81=E5=BC=82=E5=B8=B8=E5=B9=B6?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1=20Fix=20?=
 =?UTF-8?q?https://github.com/siyuan-note/siyuan/issues/7163?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/transaction.go | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/kernel/model/transaction.go b/kernel/model/transaction.go
index a047fe519..9eaceedea 100644
--- a/kernel/model/transaction.go
+++ b/kernel/model/transaction.go
@@ -311,11 +311,8 @@ func (tx *Transaction) doMove(operation *Operation) (ret *TxErr) {
 			}
 		}
 
-		for _, headingChild := range headingChildren {
-			if headingChild.ID == targetNode.ID {
-				// 不能将折叠标题移动到自己下方节点的前或后 https://github.com/siyuan-note/siyuan/issues/7163
-				return
-			}
+		if isMovingFoldHeadingIntoSelf(targetNode, headingChildren) {
+			return
 		}
 
 		for i := len(headingChildren) - 1; -1 < i; i-- {
@@ -360,11 +357,8 @@ func (tx *Transaction) doMove(operation *Operation) (ret *TxErr) {
 		return &TxErr{code: TxErrCodeBlockNotFound, id: targetParentID}
 	}
 
-	for _, headingChild := range headingChildren {
-		if headingChild.ID == targetNode.ID {
-			// 不能将折叠标题移动到自己下方节点的前或后 https://github.com/siyuan-note/siyuan/issues/7163
-			return
-		}
+	if isMovingFoldHeadingIntoSelf(targetNode, headingChildren) {
+		return
 	}
 
 	processed := false
@@ -421,6 +415,16 @@ func (tx *Transaction) doMove(operation *Operation) (ret *TxErr) {
 	return
 }
 
+func isMovingFoldHeadingIntoSelf(targetNode *ast.Node, headingChildren []*ast.Node) bool {
+	for _, headingChild := range headingChildren {
+		if headingChild.ID == targetNode.ID {
+			// 不能将折叠标题移动到自己下方节点的前或后 https://github.com/siyuan-note/siyuan/issues/7163
+			return true
+		}
+	}
+	return false
+}
+
 func (tx *Transaction) doPrependInsert(operation *Operation) (ret *TxErr) {
 	var err error
 	block := treenode.GetBlockTree(operation.ParentID)

From 373f6b16e2088e1b60b6d21d524fa6c74d6c6590 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Thu, 26 Jan 2023 01:19:06 +0800
Subject: [PATCH 6/7] =?UTF-8?q?:bug:=20=E6=8A=98=E5=8F=A0=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E7=A7=BB=E5=8A=A8=E5=88=B0=E4=B8=8B=E6=96=B9=E5=90=8E?=
 =?UTF-8?q?=E8=A7=A6=E5=8F=91=E7=8A=B6=E6=80=81=E5=BC=82=E5=B8=B8=E5=B9=B6?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1=20Fix=20?=
 =?UTF-8?q?https://github.com/siyuan-note/siyuan/issues/7163?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/box.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/model/box.go b/kernel/model/box.go
index c2efb576a..176658520 100644
--- a/kernel/model/box.go
+++ b/kernel/model/box.go
@@ -507,7 +507,7 @@ func FullReindex() {
 }
 
 func fullReindex() {
-	util.PushMsg(Conf.Language(35), 60*1000*10)
+	util.PushMsg(Conf.Language(35), 7*1000)
 	WaitForWritingFiles()
 
 	if err := sql.InitDatabase(true); nil != err {

From 430bf34dfb056b525bbc504a284399d4e9f5110c Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Thu, 26 Jan 2023 01:33:21 +0800
Subject: [PATCH 7/7] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E5=86=85?=
 =?UTF-8?q?=E6=A0=B8=E4=BB=BB=E5=8A=A1=E8=B0=83=E5=BA=A6=E6=9C=BA=E5=88=B6?=
 =?UTF-8?q?=E6=8F=90=E5=8D=87=E7=A8=B3=E5=AE=9A=E6=80=A7=20https://github.?=
 =?UTF-8?q?com/siyuan-note/siyuan/issues/7113?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/sql/queue.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kernel/sql/queue.go b/kernel/sql/queue.go
index 88bffb347..1b8e5f6db 100644
--- a/kernel/sql/queue.go
+++ b/kernel/sql/queue.go
@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 	"path"
+	"runtime"
 	"sync"
 	"time"
 
@@ -125,6 +126,10 @@ func FlushQueue() {
 			logging.LogErrorf("commit tx failed: %s", err)
 			return
 		}
+
+		if 16 < i && 0 == i%256 {
+			runtime.GC()
+		}
 	}
 
 	elapsed := time.Now().Sub(start).Milliseconds()