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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-04-02 12:03:48 +08:00
commit f70ea553f2
3 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kernel/api/av.go
View file

@ -35,5 +35,11 @@ func renderAttributeView(c *gin.Context) {
}
id := arg["id"].(string)
ret.Data = model.RenderAttributeView(id)
data, err := model.RenderAttributeView(id)
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
ret.Data = data
}

4
kernel/model/attribute_view.go
View file

@ -28,7 +28,9 @@ import (
"github.com/siyuan-note/siyuan/kernel/treenode"
)
func RenderAttributeView(avID string) (dom string) {
func RenderAttributeView(avID string) (dom string, err error) {
waitForSyncingStorages()
attrView, err := av.ParseAttributeView(avID)
if nil != err {
logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err)

9
kernel/model/repository.go
View file

@ -771,6 +771,15 @@ func IndexRepo(memo string) (err error) {
var syncingFiles = sync.Map{}
var syncingStorages = false
func waitForSyncingStorages() {
for i := 0; i < 30; i++ {
if syncingStorages {
return
}
time.Sleep(time.Second)
}
}
func IsSyncingFile(rootID string) (ret bool) {
_, ret = syncingFiles.Load(rootID)
return