0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 Improve getBlockInfo for reindexing https://github.com/siyuan-note/siyuan/issues/10772

Browse source
This commit is contained in:
Daniel 2024-04-02 19:58:03 +08:00
parent b6b0cf2e2c
commit 844fa8ef64
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kernel/api/block.go
View file

@ -465,7 +465,8 @@ func getBlockInfo(c *gin.Context) {
id := arg["id"].(string)
tree, err := model.LoadTreeByBlockID(id)
// 仅在此处使用带重建索引的加载函数，其他地方不要使用
tree, err := model.LoadTreeByBlockIDWithReindex(id)
if errors.Is(err, model.ErrIndexing) {
ret.Code = 3
ret.Msg = model.Conf.Language(56)

23
kernel/model/tree.go
View file

@ -153,7 +153,9 @@ var (
ErrIndexing = errors.New("indexing")
)
func LoadTreeByBlockID(id string) (ret *parse.Tree, err error) {
func LoadTreeByBlockIDWithReindex(id string) (ret *parse.Tree, err error) {
// 仅提供给 getBlockInfo 接口使用
if "" == id {
return nil, ErrTreeNotFound
}
@ -178,6 +180,25 @@ func LoadTreeByBlockID(id string) (ret *parse.Tree, err error) {
return
}
func LoadTreeByBlockID(id string) (ret *parse.Tree, err error) {
if "" == id {
return nil, ErrTreeNotFound
}
bt := treenode.GetBlockTree(id)
if nil == bt {
if task.Contain(task.DatabaseIndex, task.DatabaseIndexFull) {
err = ErrIndexing
return
}
return nil, ErrTreeNotFound
}
luteEngine := util.NewLute()
ret, err = filesys.LoadTree(bt.BoxID, bt.Path, luteEngine)
return
}
var searchTreeLimiter = rate.NewLimiter(rate.Every(3*time.Second), 1)
func searchTreeInFilesystem(rootID string) {