mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-17 07:00:12 +01:00
This commit is contained in:
parent
7bd973deca
commit
c1c6f435b6
7 changed files with 26 additions and 11 deletions
|
|
@ -1051,6 +1051,6 @@
|
||||||
"180": "Search content block does not exist",
|
"180": "Search content block does not exist",
|
||||||
"181": "The document has been shared to Liandi, <a href=\"%s\" target=\"_blank\">click to view</a>",
|
"181": "The document has been shared to Liandi, <a href=\"%s\" target=\"_blank\">click to view</a>",
|
||||||
"182": "Sharing document, please wait...",
|
"182": "Sharing document, please wait...",
|
||||||
"183": "Validating index document tree [%s]"
|
"183": "Validating index document tree [%d/%d %s]"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1051,6 +1051,6 @@
|
||||||
"180": "El bloque de contenido de búsqueda no existe",
|
"180": "El bloque de contenido de búsqueda no existe",
|
||||||
"181": "El documento ha sido compartido con Liandi, <a href=\"%s\" target=\"_blank\">haga clic para ver</a>",
|
"181": "El documento ha sido compartido con Liandi, <a href=\"%s\" target=\"_blank\">haga clic para ver</a>",
|
||||||
"182": "Compartiendo documento, por favor espere...",
|
"182": "Compartiendo documento, por favor espere...",
|
||||||
"183": "Validando el árbol del documento de índice [%s]"
|
"183": "Validando el árbol del documento de índice [%d/%d %s]"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1051,6 +1051,6 @@
|
||||||
"180": "Le bloc de contenu de recherche n'existe pas",
|
"180": "Le bloc de contenu de recherche n'existe pas",
|
||||||
"181": "Le document a été partagé avec Liandi, <a href=\"%s\" target=\"_blank\">cliquez pour afficher</a>",
|
"181": "Le document a été partagé avec Liandi, <a href=\"%s\" target=\"_blank\">cliquez pour afficher</a>",
|
||||||
"182": "Partage du document, veuillez patienter...",
|
"182": "Partage du document, veuillez patienter...",
|
||||||
"183": "Validation de l'arborescence du document d'index [%s]"
|
"183": "Validation de l'arborescence du document d'index [%d/%d %s]"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1051,6 +1051,6 @@
|
||||||
"180": "不存在符合條件的內容塊",
|
"180": "不存在符合條件的內容塊",
|
||||||
"181": "已分享文檔到鏈滴,<a href=\"%s\" target=\"_blank\">點擊查看</a>",
|
"181": "已分享文檔到鏈滴,<a href=\"%s\" target=\"_blank\">點擊查看</a>",
|
||||||
"182": "正在分享文檔,請稍等...",
|
"182": "正在分享文檔,請稍等...",
|
||||||
"183": "正在校驗索引文檔樹 [%s]"
|
"183": "正在校驗索引文檔樹 [%d/%d %s]"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1051,6 +1051,6 @@
|
||||||
"180": "不存在符合条件的内容块",
|
"180": "不存在符合条件的内容块",
|
||||||
"181": "已分享文档到链滴,<a href=\"%s\" target=\"_blank\">点击查看</a>",
|
"181": "已分享文档到链滴,<a href=\"%s\" target=\"_blank\">点击查看</a>",
|
||||||
"182": "正在分享文档,请稍等...",
|
"182": "正在分享文档,请稍等...",
|
||||||
"183": "正在校验索引文档树 [%s]"
|
"183": "正在校验索引文档树 [%d/%d %s]"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -523,7 +523,10 @@ func genTreeID(tree *parse.Tree) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var isFullReindexing = false
|
||||||
|
|
||||||
func FullReindex() {
|
func FullReindex() {
|
||||||
|
isFullReindexing = true
|
||||||
util.PushEndlessProgress(Conf.Language(35))
|
util.PushEndlessProgress(Conf.Language(35))
|
||||||
WaitForWritingFiles()
|
WaitForWritingFiles()
|
||||||
|
|
||||||
|
|
@ -542,6 +545,7 @@ func FullReindex() {
|
||||||
InitFlashcards()
|
InitFlashcards()
|
||||||
|
|
||||||
util.PushEndlessProgress(Conf.Language(58))
|
util.PushEndlessProgress(Conf.Language(58))
|
||||||
|
isFullReindexing = false
|
||||||
go func() {
|
go func() {
|
||||||
time.Sleep(1 * time.Second)
|
time.Sleep(1 * time.Second)
|
||||||
util.ReloadUI()
|
util.ReloadUI()
|
||||||
|
|
|
||||||
|
|
@ -1238,17 +1238,28 @@ func autoFixIndex() {
|
||||||
defer autoFixLock.Unlock()
|
defer autoFixLock.Unlock()
|
||||||
|
|
||||||
rootUpdated := treenode.GetRootUpdated()
|
rootUpdated := treenode.GetRootUpdated()
|
||||||
|
i := -1
|
||||||
|
size := len(rootUpdated)
|
||||||
for rootID, updated := range rootUpdated {
|
for rootID, updated := range rootUpdated {
|
||||||
|
if isFullReindexing {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
i++
|
||||||
|
if 0 < i && 0 == i%32 {
|
||||||
|
treenode.SaveBlockTree(true)
|
||||||
|
}
|
||||||
|
|
||||||
root := sql.GetBlock(rootID)
|
root := sql.GetBlock(rootID)
|
||||||
if nil == root {
|
if nil == root {
|
||||||
logging.LogWarnf("not found tree [%s] in database, reindex it", rootID)
|
logging.LogWarnf("not found tree [%s] in database, reindex it", rootID)
|
||||||
reindexTree(rootID)
|
reindexTree(rootID, i, size)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if "" == updated {
|
if "" == updated {
|
||||||
// BlockTree 迁移,v2.6.3 之前没有 updated 字段
|
// BlockTree 迁移,v2.6.3 之前没有 updated 字段
|
||||||
reindexTree(rootID)
|
reindexTree(rootID, i, size)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1256,7 +1267,7 @@ func autoFixIndex() {
|
||||||
dbUpdated, _ := time.Parse("20060102150405", root.Updated)
|
dbUpdated, _ := time.Parse("20060102150405", root.Updated)
|
||||||
if dbUpdated.Before(btUpdated.Add(-1 * time.Minute)) {
|
if dbUpdated.Before(btUpdated.Add(-1 * time.Minute)) {
|
||||||
logging.LogWarnf("tree [%s] is not up to date, reindex it", rootID)
|
logging.LogWarnf("tree [%s] is not up to date, reindex it", rootID)
|
||||||
reindexTree(rootID)
|
reindexTree(rootID, i, size)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1264,13 +1275,13 @@ func autoFixIndex() {
|
||||||
if 1 < len(roots) {
|
if 1 < len(roots) {
|
||||||
logging.LogWarnf("exist more than one tree [%s], reindex it", rootID)
|
logging.LogWarnf("exist more than one tree [%s], reindex it", rootID)
|
||||||
sql.RemoveTreeQueue(root.Box, rootID)
|
sql.RemoveTreeQueue(root.Box, rootID)
|
||||||
reindexTree(rootID)
|
reindexTree(rootID, i, size)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func reindexTree(rootID string) {
|
func reindexTree(rootID string, i, size int) {
|
||||||
root := treenode.GetBlockTree(rootID)
|
root := treenode.GetBlockTree(rootID)
|
||||||
if nil == root {
|
if nil == root {
|
||||||
logging.LogWarnf("root block not found", rootID)
|
logging.LogWarnf("root block not found", rootID)
|
||||||
|
|
@ -1284,5 +1295,5 @@ func reindexTree(rootID string) {
|
||||||
|
|
||||||
treenode.ReindexBlockTree(tree)
|
treenode.ReindexBlockTree(tree)
|
||||||
sql.UpsertTreeQueue(tree)
|
sql.UpsertTreeQueue(tree)
|
||||||
util.PushStatusBar(fmt.Sprintf(Conf.Language(183), path.Base(tree.HPath)))
|
util.PushStatusBar(fmt.Sprintf(Conf.Language(183), i, size, path.Base(tree.HPath)))
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue