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

🐛 工作空间列表中出现多个相同的路径 Fix https://github.com/siyuan-note/siyuan/issues/7061

Browse source
This commit is contained in:
Liang Ding 2023-01-12 21:58:15 +08:00
parent 8468982005
commit ee72b848dd
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 66 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

55
kernel/api/workspace.go
View file

@ -17,7 +17,6 @@
package api
import (
"errors"
"fmt"
"net/http"
"os"
@ -29,7 +28,6 @@ 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"
)
@ -64,7 +62,7 @@ func createWorkspaceDir(c *gin.Context) {
return
}
workspacePaths, err := readWorkspacePaths()
workspacePaths, err := util.ReadWorkspacePaths()
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
@ -73,7 +71,7 @@ func createWorkspaceDir(c *gin.Context) {
workspacePaths = append(workspacePaths, absPath)
if err = writeWorkspacePaths(workspacePaths); nil != err {
if err = util.WriteWorkspacePaths(workspacePaths); nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
@ -91,7 +89,7 @@ func removeWorkspaceDir(c *gin.Context) {
path := arg["path"].(string)
workspacePaths, err := readWorkspacePaths()
workspacePaths, err := util.ReadWorkspacePaths()
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
@ -100,7 +98,7 @@ func removeWorkspaceDir(c *gin.Context) {
workspacePaths = gulu.Str.RemoveElem(workspacePaths, path)
if err = writeWorkspacePaths(workspacePaths); nil != err {
if err = util.WriteWorkspacePaths(workspacePaths); nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
@ -120,7 +118,7 @@ func getWorkspaces(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
workspacePaths, err := readWorkspacePaths()
workspacePaths, err := util.ReadWorkspacePaths()
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
@ -169,7 +167,7 @@ func setWorkspaceDir(c *gin.Context) {
}
}
workspacePaths, err := readWorkspacePaths()
workspacePaths, err := util.ReadWorkspacePaths()
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
@ -181,7 +179,7 @@ func setWorkspaceDir(c *gin.Context) {
workspacePaths = gulu.Str.RemoveElem(workspacePaths, path)
workspacePaths = append(workspacePaths, path) // 切换的工作空间固定放在最后一个
if err = writeWorkspacePaths(workspacePaths); nil != err {
if err = util.WriteWorkspacePaths(workspacePaths); nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
@ -194,45 +192,6 @@ func setWorkspaceDir(c *gin.Context) {
}
}
func readWorkspacePaths() (ret []string, err error) {
ret = []string{}
workspaceConf := filepath.Join(util.HomeDir, ".config", "siyuan", "workspace.json")
data, err := os.ReadFile(workspaceConf)
if nil != err {
msg := fmt.Sprintf("read workspace conf [%s] failed: %s", workspaceConf, err)
logging.LogErrorf(msg)
err = errors.New(msg)
return
}
if err = gulu.JSON.UnmarshalJSON(data, &ret); nil != err {
msg := fmt.Sprintf("unmarshal workspace conf [%s] failed: %s", workspaceConf, err)
logging.LogErrorf(msg)
err = errors.New(msg)
return
}
return
}
func writeWorkspacePaths(workspacePaths []string) (err error) {
workspaceConf := filepath.Join(util.HomeDir, ".config", "siyuan", "workspace.json")
data, err := gulu.JSON.MarshalJSON(workspacePaths)
if nil != err {
msg := fmt.Sprintf("marshal workspace conf [%s] failed: %s", workspaceConf, err)
logging.LogErrorf(msg)
err = errors.New(msg)
return
}
if err = os.WriteFile(workspaceConf, data, 0644); nil != err {
msg := fmt.Sprintf("write workspace conf [%s] failed: %s", workspaceConf, err)
logging.LogErrorf(msg)
err = errors.New(msg)
return
}
return
}
func isInvalidWorkspacePath(absPath string) bool {
if "" == absPath {
return true