🎨 改进同步

app/appearance/langs/en_US.json

@@ -794,8 +794,8 @@
     "36": "TODO",
     "37": "Do not include spaces and special symbols in the name of the cloud sync directory",
     "38": "The number of mentioned keywords [%d] is too many, currently only supports up to [512] keywords",
-    "39": "TODO",
-    "40": "TODO",
+    "39": "Deleting index [%s]",
+    "40": "Inserting index [%s]",
     "41": "Upload completed",
     "42": "The setting is complete, the application will be closed automatically, please restart later...",
     "43": "The maximum storage capacity of cloud space [%s] has been exceeded, and data upload cannot continue",

app/appearance/langs/es_ES.json

@@ -794,8 +794,8 @@
     "36": "TODO",
     "37": "No incluyas espacios ni símbolos especiales en el nombre del directorio de sincronización con la nube",
     "38": "El número de palabras clave mencionadas [%d] son demasiados, actualmente solo admite hasta [512] palabras clave",
-    "39": "TODO",
-    "40": "TODO",
+    "39": "Eliminando índice [%s]",
+    "40": "Insertando índice [%s]",
     "41": "Carga completada",
     "42": "La configuración se ha completado, la aplicación se cerrará automáticamente, por favor reinicie más tarde...",
     "43": "Se ha superado la capacidad máxima de almacenamiento del espacio en la nube [%s] y la carga de datos no puede continuar",

app/appearance/langs/fr_FR.json

@@ -794,8 +794,8 @@
     "36": "TODO",
     "37": "N'incluez pas d'espaces et de symboles spéciaux dans le nom du répertoire de synchronisation cloud",
     "38": "Le nombre de mots-clés mentionnés [%d] est trop élevé, ne prend actuellement en charge que jusqu'à [512] mots-clés",
-    "39": "TODO",
-    "40": "TODO",
+    "39": "Suppression de l'index [%s]",
+    "40": "Insertion de l'index [%s]",
     "41": "Transfert complété",
     "42": "Le paramétrage est terminé, l'application se fermera automatiquement, merci de redémarrer plus tard...",
     "43": "La capacité de stockage maximale de l'espace cloud [%s] a été dépassée et le téléchargement des données ne peut pas continuer",

app/appearance/langs/zh_CHT.json

@@ -794,8 +794,8 @@
     "36": "TODO",
     "37": "雲端同步目錄的名稱請勿包含空格和特殊符號",
     "38": "提及關鍵字數量 [%d] 過多，目前最多僅支援搜索 [512] 個關鍵字",
-    "39": "TODO",
-    "40": "TODO",
+    "39": "正在刪除索引 [%s]",
+    "40": "正在插入索引 [%s]",
     "41": "上傳完畢",
     "42": "設置完成，即將自動關閉應用，請稍後重新啟動...",
     "43": "已超過雲端空間最大存儲容量 [%s]，無法繼續上傳數據",

app/appearance/langs/zh_CN.json

@@ -795,8 +795,8 @@
     "36": "TODO",
     "37": "云端同步目录的名称请勿包含空格和特殊符号",
     "38": "提及关键字数量 [%d] 过多，目前最多仅支持搜索 [512] 个关键字",
-    "39": "TODO",
-    "40": "TODO",
+    "39": "正在删除索引 [%s]",
+    "40": "正在插入索引 [%s]",
     "41": "上传完毕",
     "42": "设置完成，即将自动关闭应用，请稍后重新启动...",
     "43": "已超过云端空间最大存储容量 [%s]，无法继续上传数据",

kernel/model/sync.go

@@ -125,6 +125,11 @@ func SyncData(boot, exit, byHand bool) {
 func incReindex(upserts, removes []string) {
 	needPushRemoveProgress := 32 < len(removes)
 	needPushUpsertProgress := 32 < len(upserts)
+	msg := fmt.Sprintf(Conf.Language(35))
+	util.PushStatusBar(msg)
+	if needPushRemoveProgress || needPushUpsertProgress {
+		util.PushEndlessProgress(msg)
+	}
 
 	// 先执行 remove，否则移动文档时 upsert 会被忽略，导致未被索引
 
@@ -138,7 +143,7 @@ func incReindex(upserts, removes []string) {
 		if nil != block {
 			treenode.RemoveBlockTreesByRootID(block.RootID)
 			sql.RemoveTreeQueue(block.BoxID, block.RootID)
-			msg := fmt.Sprintf("Sync remove tree [%s]", block.RootID)
+			msg = fmt.Sprintf(Conf.Language(39), block.RootID)
 			util.PushStatusBar(msg)
 			if needPushRemoveProgress {
 				util.PushEndlessProgress(msg)
@@ -146,6 +151,13 @@ func incReindex(upserts, removes []string) {
 		}
 	}
 
+	msg = fmt.Sprintf(Conf.Language(35))
+	util.PushStatusBar(msg)
+	if needPushRemoveProgress || needPushUpsertProgress {
+		util.PushEndlessProgress(msg)
+	}
+	sql.WaitForWritingDatabase()
+
 	for _, upsertFile := range upserts {
 		if !strings.HasSuffix(upsertFile, ".sy") {
 			continue
@@ -169,15 +181,16 @@ func incReindex(upserts, removes []string) {
 		}
 		treenode.ReindexBlockTree(tree)
 		sql.UpsertTreeQueue(tree)
-		msg := fmt.Sprintf("Sync reindex tree [%s]", tree.ID)
+		msg = fmt.Sprintf(Conf.Language(40), tree.ID)
 		util.PushStatusBar(msg)
 		if needPushUpsertProgress {
 			util.PushEndlessProgress(msg)
 		}
 	}
 
+	util.PushStatusBar(Conf.Language(58))
 	if needPushRemoveProgress || needPushUpsertProgress {
-		util.PushClearProgress()
+		util.PushEndlessProgress(Conf.Language(58))
 	}
 }