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

🎨 Improve boot

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2025-12-09 20:40:54 +08:00
parent 4ee7497afd
commit d34cd984d8
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
kernel/util/working.go
View file

@ -339,8 +339,6 @@ func ReadWorkspacePaths() (ret []string, err error) {
return
}
logging.LogInfof("read data [%s] from workspace conf [%s]", string(data), workspaceConf)
if err = gulu.JSON.UnmarshalJSON(data, &ret); err != nil {
msg := fmt.Sprintf("unmarshal workspace conf [%s] failed: %s", workspaceConf, err)
logging.LogErrorf(msg)
@ -349,10 +347,18 @@ func ReadWorkspacePaths() (ret []string, err error) {
}
var tmp []string
workspaceBaseDir := filepath.Dir(HomeDir)
for _, d := range ret {
if ContainerIOS == Container && strings.Contains(d, "/Documents/") {
d = d[strings.Index(d, "/Documents/")+len("/Documents/"):]
d = filepath.Join(workspaceBaseDir, d)
}
d = strings.TrimRight(d, " \t\n") // 去掉工作空间路径尾部空格 https://github.com/siyuan-note/siyuan/issues/6353
if gulu.File.IsDir(d) {
tmp = append(tmp, d)
} else {
logging.LogWarnf("workspace path [%s] is not a dir", d)
}
}
ret = tmp

1
kernel/util/working_mobile.go
View file

@ -129,7 +129,6 @@ func initWorkspaceDirMobile(workspaceBaseDir string) {
workspacePaths = append(workspacePaths, WorkspaceDir)
} else {
workspacePaths, _ = ReadWorkspacePaths()
logging.LogInfof("1 read workspace paths [%s]", strings.Join(workspacePaths, ","))
if 0 < len(workspacePaths) {
WorkspaceDir = workspacePaths[len(workspacePaths)-1]