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

⚡ 改进多个功能点的性能 https://github.com/siyuan-note/siyuan/issues/7177

Browse source
This commit is contained in:
Liang Ding 2023-01-27 18:07:06 +08:00
parent 5da5ae8818
commit 2b09ea75f0
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
7 changed files with 56 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

26
kernel/api/block.go
View file

@ -27,7 +27,6 @@ import (
"github.com/siyuan-note/filelock"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/model"
"github.com/siyuan-note/siyuan/kernel/sql"
"github.com/siyuan-note/siyuan/kernel/util"
)
@ -155,7 +154,19 @@ func checkBlockFold(c *gin.Context) {
}
id := arg["id"].(string)
ret.Data = sql.IsBlockFolded(id)
b, err := model.GetBlock(id, nil)
if errors.Is(err, filelock.ErrUnableAccessFile) {
ret.Code = 2
ret.Data = id
return
}
if errors.Is(err, model.ErrIndexing) {
ret.Code = 0
ret.Data = false
return
}
ret.Data = nil != b && "1" == b.IAL["fold"]
}
func checkBlockExist(c *gin.Context) {
@ -168,7 +179,7 @@ func checkBlockExist(c *gin.Context) {
}
id := arg["id"].(string)
b, err := model.GetBlock(id)
b, err := model.GetBlock(id, nil)
if errors.Is(err, filelock.ErrUnableAccessFile) {
ret.Code = 2
ret.Data = id
@ -376,7 +387,8 @@ func getBlockInfo(c *gin.Context) {
}
id := arg["id"].(string)
block, err := model.GetBlock(id)
tree, err := model.LoadTreeByID(id)
if errors.Is(err, filelock.ErrUnableAccessFile) {
ret.Code = 2
ret.Data = id
@ -387,6 +399,8 @@ func getBlockInfo(c *gin.Context) {
ret.Msg = model.Conf.Language(56)
return
}
block, _ := model.GetBlock(id, tree)
if nil == block {
ret.Code = -1
ret.Msg = fmt.Sprintf(model.Conf.Language(15), id)
@ -401,13 +415,13 @@ func getBlockInfo(c *gin.Context) {
rootChildID = b.ID
break
}
if b, _ = model.GetBlock(parentID); nil == b {
if b, _ = model.GetBlock(parentID, tree); nil == b {
logging.LogErrorf("not found parent")
break
}
}
root, err := model.GetBlock(block.RootID)
root, err := model.GetBlock(block.RootID, tree)
if errors.Is(err, filelock.ErrUnableAccessFile) {
ret.Code = 2
ret.Data = id

2
kernel/api/block_op.go
View file

@ -190,7 +190,7 @@ func updateBlock(c *gin.Context) {
return
}
block, err := model.GetBlock(id)
block, err := model.GetBlock(id, nil)
if nil != err {
ret.Code = -1
ret.Msg = "get block failed: " + err.Error()

23
kernel/api/filetree.go
View file

@ -327,7 +327,7 @@ func duplicateDoc(c *gin.Context) {
}
id := arg["id"].(string)
newTree, err := model.DuplicateDoc(id)
tree, err := model.LoadTreeByID(id)
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
@ -335,24 +335,17 @@ func duplicateDoc(c *gin.Context) {
return
}
block, _ := model.GetBlock(id)
p := block.Path
notebook := block.Box
p := tree.Path
notebook := tree.Box
box := model.Conf.Box(notebook)
tree, err := model.LoadTree(box.ID, p)
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
model.DuplicateDoc(tree)
pushCreate(box, p, tree.Root.ID, arg)
ret.Data = map[string]interface{}{
"id": newTree.Root.ID,
"id": tree.Root.ID,
"notebook": notebook,
"path": newTree.Path,
"hPath": newTree.HPath,
"path": tree.Path,
"hPath": tree.HPath,
}
}
@ -478,7 +471,7 @@ func createDocWithMd(c *gin.Context) {
ret.Data = id
box := model.Conf.Box(notebook)
b, _ := model.GetBlock(id)
b, _ := model.GetBlock(id, nil)
p := b.Path
pushCreate(box, p, id, arg)
}