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

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

Browse source
This commit is contained in:
Vanessa 2022-07-30 16:29:24 +08:00
commit e6f11c5f1a
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/filesys/tree.go
View file

@ -74,13 +74,13 @@ func LoadTree(boxID, p string, luteEngine *lute.Lute) (ret *parse.Tree, err erro
parentPath = filepath.Join(util.DataDir, boxID, parentPath) parentPath = filepath.Join(util.DataDir, boxID, parentPath)
parentData, readErr := filelock.LockFileRead(parentPath) parentData, readErr := filelock.LockFileRead(parentPath)
if nil != readErr { if nil != readErr {
logging.LogWarnf("read tree data [%s] failed: %s", parentPath, readErr) logging.LogWarnf("read parent tree data [%s] failed: %s", parentPath, readErr)
hPathBuilder.WriteString("Untitled/") hPathBuilder.WriteString("Untitled/")
continue continue
} }
parentTree, parseErr := protyle.ParseJSONWithoutFix(luteEngine, parentData) parentTree, parseErr := protyle.ParseJSONWithoutFix(luteEngine, parentData)
if nil != parseErr { if nil != parseErr {
logging.LogWarnf("parse tree [%s] failed: %s", parentPath, parseErr) logging.LogWarnf("parse parent tree [%s] failed: %s", parentPath, parseErr)
hPathBuilder.WriteString("Untitled/") hPathBuilder.WriteString("Untitled/")
continue continue
} }