mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-02-28 05:32:52 +00:00
🎨 Improve workspace dir checking https://github.com/siyuan-note/siyuan/issues/13789
This commit is contained in:
@@ -297,6 +297,19 @@ func setWorkspaceDir(c *gin.Context) {
|
||||
}
|
||||
}
|
||||
|
||||
// 检查路径是否在已有的工作空间路径中
|
||||
pathIsWorkspace := util.IsWorkspaceDir(path)
|
||||
if !pathIsWorkspace {
|
||||
for p := filepath.Dir(path); "" != p; p = filepath.Dir(p) {
|
||||
if util.IsWorkspaceDir(p) {
|
||||
ret.Code = -1
|
||||
ret.Msg = fmt.Sprintf(model.Conf.Language(256), path, p)
|
||||
ret.Data = map[string]interface{}{"closeTimeout": 7000}
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
workspacePaths, err := util.ReadWorkspacePaths()
|
||||
if err != nil {
|
||||
ret.Code = -1
|
||||
|
||||
Reference in New Issue
Block a user