Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 22:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 Reduce the probability of tree not found when deleting/renaming tags https://github.com/siyuan-note/siyuan/issues/14591

Browse source
This commit is contained in:
Daniel 2025-04-13 17:47:40 +08:00
parent b66558059d
commit 6c60a3726f
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/model/tag.go
View file

@ -53,7 +53,7 @@ func RemoveTag(label string) (err error) {
updateNodes := map[string]*ast.Node{} updateNodes := map[string]*ast.Node{}
for treeID, blocks := range treeBlocks { for treeID, blocks := range treeBlocks {
util.PushEndlessProgress("[" + treeID + "]") util.PushEndlessProgress("[" + treeID + "]")
tree, e := LoadTreeByBlockID(treeID) tree, e := LoadTreeByBlockIDWithReindex(treeID)
if nil != e { if nil != e {
util.ClearPushProgress(100) util.ClearPushProgress(100)
return e return e
@ -154,7 +154,7 @@ func RenameTag(oldLabel, newLabel string) (err error) {
for treeID, blocks := range treeBlocks { for treeID, blocks := range treeBlocks {
util.PushEndlessProgress("[" + treeID + "]") util.PushEndlessProgress("[" + treeID + "]")
tree, e := LoadTreeByBlockID(treeID) tree, e := LoadTreeByBlockIDWithReindex(treeID)
if nil != e { if nil != e {
util.ClearPushProgress(100) util.ClearPushProgress(100)
return e return e

9
kernel/model/tree.go
View file

@ -178,8 +178,6 @@ var (
) )
func LoadTreeByBlockIDWithReindex(id string) (ret *parse.Tree, err error) { func LoadTreeByBlockIDWithReindex(id string) (ret *parse.Tree, err error) {
// 仅提供给 getBlockInfo 接口使用
if "" == id { if "" == id {
logging.LogWarnf("block id is empty") logging.LogWarnf("block id is empty")
return nil, ErrTreeNotFound return nil, ErrTreeNotFound
@ -192,8 +190,9 @@ func LoadTreeByBlockIDWithReindex(id string) (ret *parse.Tree, err error) {
return return
} }
// 尝试从文件系统加载 // 尝试从文件系统加载并建立索引
searchTreeInFilesystem(id) indexTreeInFilesystem(id)
bt = treenode.GetBlockTree(id) bt = treenode.GetBlockTree(id)
if nil == bt { if nil == bt {
if "dev" == util.Mode { if "dev" == util.Mode {
@ -243,7 +242,7 @@ func loadTreeByBlockTree(bt *treenode.BlockTree) (ret *parse.Tree, err error) {
var searchTreeLimiter = rate.NewLimiter(rate.Every(3*time.Second), 1) var searchTreeLimiter = rate.NewLimiter(rate.Every(3*time.Second), 1)
func searchTreeInFilesystem(rootID string) { func indexTreeInFilesystem(rootID string) {
if !searchTreeLimiter.Allow() { if !searchTreeLimiter.Allow() {
return return
} }