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

:file: 移除文件锁 https://github.com/siyuan-note/siyuan/issues/6010

Browse source
This commit is contained in:
Liang Ding 2022-09-29 21:52:01 +08:00
parent 56129699b9
commit 69a9713776
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
38 changed files with 193 additions and 438 deletions
Download patch file Download diff file Expand all files Collapse all files

10
kernel/model/mount.go
View file

@ -29,7 +29,6 @@ import (
"github.com/88250/lute/ast"
"github.com/siyuan-note/filelock"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/filesys"
"github.com/siyuan-note/siyuan/kernel/treenode"
"github.com/siyuan-note/siyuan/kernel/util"
)
@ -79,7 +78,6 @@ func RemoveBox(boxID string) (err error) {
return errors.New(fmt.Sprintf("can not remove [%s] caused by it is not a dir", boxID))
}
filelock.ReleaseFileLocks(localPath)
if !IsUserGuide(boxID) {
var historyDir string
historyDir, err = GetHistoryDir(HistoryOpDelete)
@ -89,7 +87,7 @@ func RemoveBox(boxID string) (err error) {
}
p := strings.TrimPrefix(localPath, util.DataDir)
historyPath := filepath.Join(historyDir, p)
if err = gulu.File.Copy(localPath, historyPath); nil != err {
if err = filelock.Copy(localPath, historyPath); nil != err {
logging.LogErrorf("gen sync history failed: %s", err)
return
}
@ -98,7 +96,7 @@ func RemoveBox(boxID string) (err error) {
}
unmount0(boxID)
if err = filesys.RemoveAll(localPath); nil != err {
if err = filelock.Remove(localPath); nil != err {
return
}
IncSync()
@ -144,12 +142,12 @@ func Mount(boxID string) (alreadyMount bool, err error) {
reMountGuide = true
}
if err = os.RemoveAll(localPath); nil != err {
if err = filelock.Remove(localPath); nil != err {
return
}
p := filepath.Join(util.WorkingDir, "guide", boxID)
if err = gulu.File.Copy(p, localPath); nil != err {
if err = filelock.Copy(p, localPath); nil != err {
return
}