github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-21 11:30:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Automatically loads and indexes from the file system when a block is not found https://github.com/siyuan-note/siyuan/issues/10772

Browse Source
This commit is contained in:
Daniel 2024-03-28 11:27:02 +08:00
parent e75c926782
commit b3d581718b
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017
1 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
kernel/model/tree.go
View File

@ -18,8 +18,8 @@ package model
import (
"errors"
"github.com/siyuan-note/siyuan/kernel/task"
"io/fs"
"os"
"path"
"path/filepath"
"strings"
@ -31,6 +31,8 @@ import (
"github.com/siyuan-note/filelock"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/filesys"
"github.com/siyuan-note/siyuan/kernel/sql"
"github.com/siyuan-note/siyuan/kernel/task"
"github.com/siyuan-note/siyuan/kernel/treenode"
"github.com/siyuan-note/siyuan/kernel/util"
)
@ -162,10 +164,64 @@ func LoadTreeByBlockID(id string) (ret *parse.Tree, err error) {
return
}
return nil, ErrBlockNotFound
// 尝试从文件系统加载
searchTreeInFilesystem(id)
bt = treenode.GetBlockTree(id)
if nil == bt {
return nil, ErrTreeNotFound
}
}
luteEngine := util.NewLute()
ret, err = filesys.LoadTree(bt.BoxID, bt.Path, luteEngine)
return
}
func searchTreeInFilesystem(rootID string) {
msdID := util.PushMsg(Conf.language(45), 7000)
defer util.PushClearMsg(msdID)
var treePath string
filepath.Walk(util.DataDir, func(path string, info fs.FileInfo, err error) error {
if info.IsDir() {
if strings.HasPrefix(info.Name(), ".") {
return filepath.SkipDir
}
return nil
}
if !strings.HasSuffix(info.Name(), ".sy") {
return nil
}
baseName := filepath.Base(path)
if rootID+".sy" != baseName {
return nil
}
treePath = path
return filepath.SkipAll
})
if "" == treePath {
return
}
boxID := strings.TrimPrefix(treePath, util.DataDir)
boxID = boxID[1:]
boxID = boxID[:strings.Index(boxID, string(os.PathSeparator))]
treePath = strings.TrimPrefix(treePath, util.DataDir)
treePath = strings.TrimPrefix(treePath, string(os.PathSeparator))
treePath = strings.TrimPrefix(treePath, boxID)
treePath = filepath.ToSlash(treePath)
tree, err := filesys.LoadTree(boxID, treePath, util.NewLute())
if nil != err {
logging.LogErrorf("load tree [%s] failed: %s", treePath, err)
return
}
treenode.IndexBlockTree(tree)
sql.IndexTreeQueue(tree)
sql.WaitForWritingDatabase()
}