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

Revert "🧑‍💻 Improve kernel API /api/block/updateBlock and /api/block/batchUpdateBlock https://github.com/siyuan-note/siyuan/issues/15301"

Browse source 
This reverts commit d7c95e1b49f753ab5231d4ba98c2dcf3578067da.
This commit is contained in:
Daniel 2025-07-16 10:01:37 +08:00
parent 858c7e7618
commit 0d3df5d449
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
12 changed files with 149 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/assets.go
View file

@ -321,7 +321,7 @@ func NetAssets2LocalAssets(rootID string, onlyImg bool, originalURL string) (err
util.PushClearMsg(msgId)
if 0 < files {
msgId = util.PushMsg(Conf.Language(113), 7000)
if err = WriteTreeUpsertQueue(tree); err != nil {
if err = writeTreeUpsertQueue(tree); err != nil {
return
}
util.PushUpdateMsg(msgId, fmt.Sprintf(Conf.Language(120), files), 5000)

4
kernel/model/bookmark.go
View file

@ -66,7 +66,7 @@ func RemoveBookmark(bookmark string) (err error) {
}
util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), util.EscapeHTML(tree.Root.IALAttr("title"))))
if err = WriteTreeUpsertQueue(tree); err != nil {
if err = writeTreeUpsertQueue(tree); err != nil {
util.ClearPushProgress(100)
return
}
@ -124,7 +124,7 @@ func RenameBookmark(oldBookmark, newBookmark string) (err error) {
}
util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), util.EscapeHTML(tree.Root.IALAttr("title"))))
if err = WriteTreeUpsertQueue(tree); err != nil {
if err = writeTreeUpsertQueue(tree); err != nil {
util.ClearPushProgress(100)
return
}

29
kernel/model/export.go
View file

@ -310,7 +310,7 @@ func Export2Liandi(id string) (err error) {
articleId = result.Data.(string)
tree, _ = LoadTreeByBlockID(id) // 这里必须重新加载，因为前面导出时已经修改了树结构
tree.Root.SetIALAttr(liandiArticleIdAttrName, articleId)
if err = WriteTreeUpsertQueue(tree); err != nil {
if err = writeTreeUpsertQueue(tree); err != nil {
return
}
}
@ -1994,7 +1994,7 @@ func ExportMarkdownContent(id string, refMode, embedMode int, addYfm, fillCSSVar
}
func exportMarkdownContent(id, ext string, exportRefMode int, defBlockIDs []string, singleFile bool, treeCache *map[string]*parse.Tree) (tree *parse.Tree, exportedMd string, isEmpty bool) {
tree, err := LoadTreeWithCache(id, treeCache)
tree, err := loadTreeWithCache(id, treeCache)
if err != nil {
logging.LogErrorf("load tree by block id [%s] failed: %s", id, err)
return
@ -2788,7 +2788,7 @@ func resolveFootnotesDefs(refFootnotes *[]*refAsFootnotes, currentTree *parse.Tr
footnotesDefBlock = &ast.Node{Type: ast.NodeFootnotesDefBlock}
var rendered []string
for _, foot := range *refFootnotes {
t, err := LoadTreeWithCache(foot.defID, treeCache)
t, err := loadTreeWithCache(foot.defID, treeCache)
if nil != err {
return
}
@ -2924,7 +2924,7 @@ func blockLink2Ref(currentTree *parse.Tree, id string, treeCache *map[string]*pa
if nil == b {
return
}
t, err := LoadTreeWithCache(b.RootID, treeCache)
t, err := loadTreeWithCache(b.RootID, treeCache)
if nil != err {
return
}
@ -2974,7 +2974,7 @@ func collectFootnotesDefs(currentTree *parse.Tree, id string, refFootnotes *[]*r
if nil == b {
return
}
t, err := LoadTreeWithCache(b.RootID, treeCache)
t, err := loadTreeWithCache(b.RootID, treeCache)
if nil != err {
return
}
@ -3265,7 +3265,7 @@ func prepareExportTrees(docPaths []string) (defBlockIDs []string, trees *map[str
continue
}
tree, err := LoadTreeWithCache(rootID, treeCache)
tree, err := loadTreeWithCache(rootID, treeCache)
if err != nil {
continue
}
@ -3307,7 +3307,7 @@ func exportRefTrees(tree *parse.Tree, defBlockIDs *[]string, retTrees, treeCache
if (*treeCache)[defBlock.RootID] != nil {
defTree = (*treeCache)[defBlock.RootID]
} else {
defTree, err = LoadTreeWithCache(defBlock.RootID, treeCache)
defTree, err = loadTreeWithCache(defBlock.RootID, treeCache)
if err != nil {
return ast.WalkSkipChildren
}
@ -3331,7 +3331,7 @@ func exportRefTrees(tree *parse.Tree, defBlockIDs *[]string, retTrees, treeCache
if (*treeCache)[defBlock.RootID] != nil {
defTree = (*treeCache)[defBlock.RootID]
} else {
defTree, err = LoadTreeWithCache(defBlock.RootID, treeCache)
defTree, err = loadTreeWithCache(defBlock.RootID, treeCache)
if err != nil {
return ast.WalkSkipChildren
}
@ -3370,7 +3370,7 @@ func exportRefTrees(tree *parse.Tree, defBlockIDs *[]string, retTrees, treeCache
if (*treeCache)[defBlock.RootID] != nil {
defTree = (*treeCache)[defBlock.RootID]
} else {
defTree, err = LoadTreeWithCache(defBlock.RootID, treeCache)
defTree, err = loadTreeWithCache(defBlock.RootID, treeCache)
if err != nil {
continue
}
@ -3387,6 +3387,17 @@ func exportRefTrees(tree *parse.Tree, defBlockIDs *[]string, retTrees, treeCache
*defBlockIDs = gulu.Str.RemoveDuplicatedElem(*defBlockIDs)
}
func loadTreeWithCache(id string, treeCache *map[string]*parse.Tree) (tree *parse.Tree, err error) {
if tree = (*treeCache)[id]; nil != tree {
return
}
tree, err = LoadTreeByBlockID(id)
if nil == err && nil != tree {
(*treeCache)[id] = tree
}
return
}
func getAttrViewTable(attrView *av.AttributeView, view *av.View, query string) (ret *av.Table) {
switch view.LayoutType {
case av.LayoutTypeGallery:

4
kernel/model/file.go
View file

@ -922,7 +922,7 @@ func loadNodesByMode(node *ast.Node, inputIndex, mode, size int, isDoc, isHeadin
return
}
func WriteTreeUpsertQueue(tree *parse.Tree) (err error) {
func writeTreeUpsertQueue(tree *parse.Tree) (err error) {
size, err := filesys.WriteTree(tree)
if err != nil {
return
@ -944,7 +944,7 @@ func indexWriteTreeIndexQueue(tree *parse.Tree) (err error) {
func indexWriteTreeUpsertQueue(tree *parse.Tree) (err error) {
treenode.UpsertBlockTree(tree)
return WriteTreeUpsertQueue(tree)
return writeTreeUpsertQueue(tree)
}
func renameWriteJSONQueue(tree *parse.Tree) (err error) {

2
kernel/model/format.go
View file

@ -68,7 +68,7 @@ func AutoSpace(rootID string) (err error) {
newTree.Path = tree.Path
newTree.HPath = tree.HPath
newTree.Box = tree.Box
err = WriteTreeUpsertQueue(newTree)
err = writeTreeUpsertQueue(newTree)
if err != nil {
return
}

2
kernel/model/search.go
View file

@ -932,7 +932,7 @@ func FindReplace(keyword, replacement string, replaceTypes map[string]bool, ids
}
}
if err = WriteTreeUpsertQueue(tree); err != nil {
if err = writeTreeUpsertQueue(tree); err != nil {
return
}
updateNodes[id] = node

4
kernel/model/tag.go
View file

@ -96,7 +96,7 @@ func RemoveTag(label string) (err error) {
n.Unlink()
}
util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), util.EscapeHTML(tree.Root.IALAttr("title"))))
if err = WriteTreeUpsertQueue(tree); err != nil {
if err = writeTreeUpsertQueue(tree); err != nil {
util.ClearPushProgress(100)
return
}
@ -195,7 +195,7 @@ func RenameTag(oldLabel, newLabel string) (err error) {
updateNodes[node.ID] = node
}
util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), util.EscapeHTML(tree.Root.IALAttr("title"))))
if err = WriteTreeUpsertQueue(tree); err != nil {
if err = writeTreeUpsertQueue(tree); err != nil {
util.ClearPushProgress(100)
return
}

2
kernel/model/transaction.go
View file

@ -1553,7 +1553,7 @@ func (tx *Transaction) begin() (err error) {
func (tx *Transaction) commit() (err error) {
for _, tree := range tx.trees {
if err = WriteTreeUpsertQueue(tree); err != nil {
if err = writeTreeUpsertQueue(tree); err != nil {
return
}

11
kernel/model/tree.go
View file

@ -207,17 +207,6 @@ func LoadTreeByBlockIDWithReindex(id string) (ret *parse.Tree, err error) {
return
}
func LoadTreeWithCache(id string, treeCache *map[string]*parse.Tree) (tree *parse.Tree, err error) {
if tree = (*treeCache)[id]; nil != tree {
return
}
tree, err = LoadTreeByBlockID(id)
if nil == err && nil != tree {
(*treeCache)[id] = tree
}
return
}
func LoadTreeByBlockID(id string) (ret *parse.Tree, err error) {
if !ast.IsNodeIDPattern(id) {
stack := logging.ShortStack()