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

🐛 工作空间列表中出现多个相同的路径 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

76
kernel/util/working.go
View file

@ -18,7 +18,9 @@ package util
import (
"bytes"
"errors"
"flag"
"fmt"
"log"
"math/rand"
"mime"
@ -216,20 +218,7 @@ func initWorkspaceDir(workspaceArg string) {
}
workspacePaths = append(workspacePaths, WorkspaceDir)
} else {
data, err := os.ReadFile(workspaceConf)
if err = gulu.JSON.UnmarshalJSON(data, &workspacePaths); nil != err {
log.Printf("unmarshal workspace conf [%s] failed: %s", workspaceConf, err)
}
var tmp []string
for _, d := range workspacePaths {
d = strings.TrimRight(d, " \t\n") // 去掉工作空间路径尾部空格 https://github.com/siyuan-note/siyuan/issues/6353
if gulu.File.IsDir(d) {
tmp = append(tmp, d)
}
}
workspacePaths = tmp
workspacePaths, _ = ReadWorkspacePaths()
if 0 < len(workspacePaths) {
WorkspaceDir = workspacePaths[len(workspacePaths)-1]
if "" != workspaceArg {
@ -253,12 +242,8 @@ func initWorkspaceDir(workspaceArg string) {
}
}
if data, err := gulu.JSON.MarshalJSON(workspacePaths); nil == err {
if err = os.WriteFile(workspaceConf, data, 0644); nil != err {
log.Fatalf("write workspace conf [%s] failed: %s", workspaceConf, err)
}
} else {
log.Fatalf("marshal workspace conf [%s] failed: %s", workspaceConf, err)
if err := WriteWorkspacePaths(workspacePaths); nil != err {
log.Fatalf("write workspace conf [%s] failed: %s", workspaceConf, err)
}
ConfDir = filepath.Join(WorkspaceDir, "conf")
@ -281,6 +266,57 @@ func initWorkspaceDir(workspaceArg string) {
SnippetsPath = filepath.Join(DataDir, "snippets")
}
func ReadWorkspacePaths() (ret []string, err error) {
ret = []string{}
workspaceConf := filepath.Join(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
}
ret = gulu.Str.RemoveDuplicatedElem(ret)
var tmp []string
for _, d := range ret {
d = strings.TrimRight(d, " \t\n") // 去掉工作空间路径尾部空格 https://github.com/siyuan-note/siyuan/issues/6353
if gulu.File.IsDir(d) {
tmp = append(tmp, d)
}
}
ret = tmp
return
}
func WriteWorkspacePaths(workspacePaths []string) (err error) {
workspacePaths = gulu.Str.RemoveDuplicatedElem(workspacePaths)
workspaceConf := filepath.Join(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
}
var (
ServerPort = "0" // HTTP/WebSocket 端口，0 为使用随机端口
ReadOnly bool