From 43359e92ec40468da6a2c12cd8e9918463d6a300 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Fri, 26 Apr 2024 18:34:47 +0800 Subject: [PATCH] :art: Supports specifying the notebook to save new docs https://github.com/siyuan-note/siyuan/issues/10671 --- kernel/api/filetree.go | 6 ------ kernel/api/notebook.go | 6 ------ kernel/api/setting.go | 6 ------ kernel/model/conf.go | 6 ------ 4 files changed, 24 deletions(-) diff --git a/kernel/api/filetree.go b/kernel/api/filetree.go index cb19a55b4..905580985 100644 --- a/kernel/api/filetree.go +++ b/kernel/api/filetree.go @@ -727,12 +727,6 @@ func getDocCreateSavePath(c *gin.Context) { docCreateSavePathTpl = model.Conf.FileTree.DocCreateSavePath } docCreateSavePathTpl = strings.TrimSpace(docCreateSavePathTpl) - if "../" == docCreateSavePathTpl { - docCreateSavePathTpl = "../Untitled" - } - if "/" == docCreateSavePathTpl { - docCreateSavePathTpl = "/Untitled" - } if docCreateSaveBox != notebook { if "" != docCreateSavePathTpl && !strings.HasPrefix(docCreateSavePathTpl, "/") { diff --git a/kernel/api/notebook.go b/kernel/api/notebook.go index 96eac7ea6..c1665e406 100644 --- a/kernel/api/notebook.go +++ b/kernel/api/notebook.go @@ -326,12 +326,6 @@ func setNotebookConf(c *gin.Context) { } boxConf.DocCreateSavePath = strings.TrimSpace(boxConf.DocCreateSavePath) - if "../" == boxConf.DocCreateSavePath { - boxConf.DocCreateSavePath = "../Untitled" - } - if "/" == boxConf.DocCreateSavePath { - boxConf.DocCreateSavePath = "/Untitled" - } box.SaveConf(boxConf) ret.Data = boxConf diff --git a/kernel/api/setting.go b/kernel/api/setting.go index 03f5593b3..733c4eefd 100644 --- a/kernel/api/setting.go +++ b/kernel/api/setting.go @@ -405,12 +405,6 @@ func setFiletree(c *gin.Context) { } fileTree.DocCreateSavePath = strings.TrimSpace(fileTree.DocCreateSavePath) - if "../" == fileTree.DocCreateSavePath { - fileTree.DocCreateSavePath = "../Untitled" - } - if "/" == fileTree.DocCreateSavePath { - fileTree.DocCreateSavePath = "/Untitled" - } if 1 > fileTree.MaxOpenTabCount { fileTree.MaxOpenTabCount = 8 diff --git a/kernel/model/conf.go b/kernel/model/conf.go index 1c1bbb322..e9928a0d1 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -217,12 +217,6 @@ func InitConf() { Conf.FileTree.MaxOpenTabCount = 32 } Conf.FileTree.DocCreateSavePath = strings.TrimSpace(Conf.FileTree.DocCreateSavePath) - if "../" == Conf.FileTree.DocCreateSavePath { - Conf.FileTree.DocCreateSavePath = "../Untitled" - } - if "/" == Conf.FileTree.DocCreateSavePath { - Conf.FileTree.DocCreateSavePath = "/Untitled" - } util.UseSingleLineSave = Conf.FileTree.UseSingleLineSave util.CurrentCloudRegion = Conf.CloudRegion