github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-04 06:11:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 启动时移除处于网盘路径下的工作空间 https://github.com/siyuan-note/siyuan/issues/7790

Browse Source
This commit is contained in:
Liang Ding 2023-03-27 15:25:51 +08:00
parent 1e7cf8917b
commit b7b8ae998f
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/util/working.go
View File

@ -207,6 +207,7 @@ func initWorkspaceDir(workspaceArg string) {
} }
var workspacePaths []string var workspacePaths []string
var cloudDrive bool // 启动时移除处于网盘路径下的工作空间 https://github.com/siyuan-note/siyuan/issues/7790
if !gulu.File.IsExist(workspaceConf) { if !gulu.File.IsExist(workspaceConf) {
WorkspaceDir = defaultWorkspaceDir WorkspaceDir = defaultWorkspaceDir
if "" != workspaceArg { if "" != workspaceArg {
@ -214,11 +215,11 @@ func initWorkspaceDir(workspaceArg string) {
} }
} else { } else {
workspacePaths, _ = ReadWorkspacePaths() workspacePaths, _ = ReadWorkspacePaths()
// 启动时移除处于网盘路径下的工作空间 https://github.com/siyuan-note/siyuan/issues/7790
var tmp []string var tmp []string
for _, workspacePath := range workspacePaths { for _, workspacePath := range workspacePaths {
if IsCloudDrivePath(workspacePath) { if IsCloudDrivePath(workspacePath) {
logging.LogWarnf("skip the cloud drive path [%s]", workspacePath) logging.LogWarnf("skip the cloud drive path [%s]", workspacePath)
cloudDrive = true
continue continue
} }
tmp = append(tmp, workspacePath) tmp = append(tmp, workspacePath)
@ -248,6 +249,10 @@ func initWorkspaceDir(workspaceArg string) {
os.Exit(logging.ExitCodeInitWorkspaceErr) os.Exit(logging.ExitCodeInitWorkspaceErr)
} }
if cloudDrive {
os.Exit(logging.ExitCodeFileSysErr)
}
ConfDir = filepath.Join(WorkspaceDir, "conf") ConfDir = filepath.Join(WorkspaceDir, "conf")
DataDir = filepath.Join(WorkspaceDir, "data") DataDir = filepath.Join(WorkspaceDir, "data")
RepoDir = filepath.Join(WorkspaceDir, "repo") RepoDir = filepath.Join(WorkspaceDir, "repo")