Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-09-22 08:30:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 移动端支持多工作空间 Fix https://github.com/siyuan-note/siyuan/issues/4642

Browse source
This commit is contained in:
Liang Ding 2023-01-05 19:35:27 +08:00
parent 8a6c1688b6
commit b3d23b65f2
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
kernel/api/workspace.go
View file

@ -41,16 +41,23 @@ func createWorkspaceDir(c *gin.Context) {
return
}
path := arg["path"].(string)
if gulu.File.IsExist(path) {
absPath := arg["path"].(string)
absPath = gulu.Str.RemoveInvisible(absPath)
absPath = strings.TrimSpace(absPath)
if gulu.File.IsExist(absPath) {
ret.Code = -1
ret.Msg = model.Conf.Language(78)
return
}
if err := os.MkdirAll(path, 0755); nil != err {
if isInvalidWorkspacePath(absPath) {
ret.Code = -1
ret.Msg = fmt.Sprintf("create workspace dir [%s] failed: %s", path, err)
ret.Msg = "This workspace name is not allowed, please use another name"
return
}
if err := os.MkdirAll(absPath, 0755); nil != err {
ret.Code = -1
ret.Msg = fmt.Sprintf("create workspace dir [%s] failed: %s", absPath, err)
return
}
@ -61,7 +68,7 @@ func createWorkspaceDir(c *gin.Context) {
return
}
workspacePaths = append(workspacePaths, path)
workspacePaths = append(workspacePaths, absPath)
if err = writeWorkspacePaths(workspacePaths); nil != err {
ret.Code = -1
@ -211,3 +218,14 @@ func writeWorkspacePaths(workspacePaths []string) (err error) {
}
return
}
func isInvalidWorkspacePath(absPath string) bool {
if "" == absPath {
return true
}
name := filepath.Base(absPath)
if "" == name {
return true
}
return "siyuan" == name || "conf" == name || "home" == name || "data" == name || "temp" == name
}