From e6fa3fc6e38265138d1f74e9c525f5da39a06dc3 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 3 Nov 2022 14:52:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:art:=20=E6=96=87=E6=A1=A3=E6=A0=91?= =?UTF-8?q?=E6=94=AF=E6=8C=81=20`Ctrl+Click`=20=E5=92=8C=20`Shift+?= =?UTF-8?q?=E2=86=91/=E2=86=93`=20=E8=BF=9B=E8=A1=8C=E5=A4=9A=E9=80=89=20h?= =?UTF-8?q?ttps://github.com/siyuan-note/siyuan/issues/1359?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/box.go | 1 + kernel/model/file.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/model/box.go b/kernel/model/box.go index f19a89f25..6e5e0854a 100644 --- a/kernel/model/box.go +++ b/kernel/model/box.go @@ -547,6 +547,7 @@ func TryAccessFileByBlockID(id string) (ok bool) { } func getBoxesByPaths(paths []string) (ret map[string]*Box) { + ret = map[string]*Box{} for _, p := range paths { id := strings.TrimSuffix(path.Base(p), ".sy") bt := treenode.GetBlockTree(id) diff --git a/kernel/model/file.go b/kernel/model/file.go index 6f5b07cc5..ca7554fab 100644 --- a/kernel/model/file.go +++ b/kernel/model/file.go @@ -1075,8 +1075,8 @@ func filterSelfChildDocs(paths []string) (ret []string) { for _, fromPath := range paths { dir := strings.TrimSuffix(fromPath, ".sy") existParent := false - for _, d := range dirs { - if strings.HasPrefix(d, fromPath) { + for d, _ := range dirs { + if strings.HasPrefix(fromPath, d) { existParent = true break } From 27951d45ec3f992aa81d6bccbcf6820fa6e8dde0 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 3 Nov 2022 14:54:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:art:=20=E6=96=87=E6=A1=A3=E6=A0=91?= =?UTF-8?q?=E6=94=AF=E6=8C=81=20`Ctrl+Click`=20=E5=92=8C=20`Shift+?= =?UTF-8?q?=E2=86=91/=E2=86=93`=20=E8=BF=9B=E8=A1=8C=E5=A4=9A=E9=80=89=20h?= =?UTF-8?q?ttps://github.com/siyuan-note/siyuan/issues/1359?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/file.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kernel/model/file.go b/kernel/model/file.go index ca7554fab..e6b48d09f 100644 --- a/kernel/model/file.go +++ b/kernel/model/file.go @@ -1218,12 +1218,7 @@ func RemoveDocs(paths []string) (err error) { util.PushEndlessProgress(Conf.Language(116)) paths = filterSelfChildDocs(paths) - var ids []string - for _, p := range paths { - ids = append(ids, strings.TrimSuffix(path.Base(p), ".sy")) - } - - pathsBoxes := getBoxesByPaths(ids) + pathsBoxes := getBoxesByPaths(paths) WaitForWritingFiles() for p, box := range pathsBoxes { err = removeDoc(box, p)