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

♻️ 潜在的文件锁问题 https://github.com/siyuan-note/siyuan/issues/5191

Browse source
This commit is contained in:
Liang Ding 2022-06-15 23:56:47 +08:00
parent 4170f50dc6
commit 102d9364fd
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
25 changed files with 118 additions and 398 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kernel/api/filetree.go
View file

@ -17,6 +17,7 @@
package api
import (
"errors"
"fmt"
"net/http"
"path"
@ -26,7 +27,7 @@ import (
"github.com/88250/gulu"
"github.com/gin-gonic/gin"
"github.com/siyuan-note/siyuan/kernel/filesys"
"github.com/siyuan-note/filelock"
"github.com/siyuan-note/siyuan/kernel/model"
"github.com/siyuan-note/siyuan/kernel/util"
)
@ -592,7 +593,7 @@ func getDoc(c *gin.Context) {
}
blockCount, content, parentID, parent2ID, rootID, typ, eof, boxID, docPath, err := model.GetDoc(id, index, keyword, mode, size)
if filesys.ErrUnableLockFile == err {
if errors.Is(err, filelock.ErrUnableLockFile) {
ret.Code = 2
ret.Data = id
return