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

🎨 改进 工作空间列表 https://github.com/siyuan-note/siyuan/issues/7067

Browse source
This commit is contained in:
Liang Ding 2023-01-13 16:26:24 +08:00
parent 32ab7b52af
commit 99261db73a
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
kernel/api/workspace.go
View file

@ -27,7 +27,7 @@ import (
"github.com/88250/gulu"
"github.com/gin-gonic/gin"
"github.com/gofrs/flock"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/model"
"github.com/siyuan-note/siyuan/kernel/util"
)
@ -89,6 +89,11 @@ func removeWorkspaceDir(c *gin.Context) {
path := arg["path"].(string)
if util.IsWorkspaceLocked(path) {
logging.LogWarnf("skip remove workspace [%s] because it is locked", path)
return
}
workspacePaths, err := util.ReadWorkspacePaths()
if nil != err {
ret.Code = -1
@ -127,14 +132,7 @@ func getWorkspaces(c *gin.Context) {
var workspaces []*Workspace
for _, p := range workspacePaths {
closed := false
f := flock.New(filepath.Join(p, ".lock"))
ok, _ := f.TryLock()
if ok {
closed = true
}
f.Unlock()
closed := !util.IsWorkspaceLocked(p)
workspaces = append(workspaces, &Workspace{Path: p, Closed: closed})
}
ret.Data = workspaces