0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2024-10-20 21:48:47 +08:00
commit 9c159ae637
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kernel/model/file.go
View file

@ -118,14 +118,12 @@ func (box *Box) docIAL(p string) (ret map[string]string) {
filePath := filepath.Join(util.DataDir, box.ID, p)
filelock.Lock(filePath)
defer filelock.Unlock(filePath)
file, err := os.Open(filePath)
if err != nil {
logging.LogErrorf("open file [%s] failed: %s", p, err)
filelock.Unlock(filePath)
return nil
}
defer file.Close()
iter := jsoniter.Parse(jsoniter.ConfigCompatibleWithStandardLibrary, file, 512)
for field := iter.ReadObject(); field != ""; field = iter.ReadObject() {
@ -136,6 +134,8 @@ func (box *Box) docIAL(p string) (ret map[string]string) {
iter.Skip()
}
}
file.Close()
filelock.Unlock(filePath)
if 1 > len(ret) {
logging.LogWarnf("properties not found in file [%s]", p)