From 08b333501b9b309e0811fdac45d0338485fed5eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A2=96=E9=80=B8?= <49649786+Zuoqiu-Yingyi@users.noreply.github.com> Date: Wed, 17 May 2023 15:27:32 +0800 Subject: [PATCH] :art: Widgets search supports symlink subdirectory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * :art: bazaar resource directories support symlink * :art: bazaar resource directories support symlink * Squashed commit of the following: commit a335101d49382de3db8981f6a2476435580c4bd6 Author: Liang Ding Date: Tue May 16 12:53:33 2023 +0800 :bookmark: Release v2.8.8 commit 6a6dec05f3b74e91254faa526ca71ed782fb2495 Author: Liang Ding Date: Tue May 16 11:30:33 2023 +0800 :memo: Update changelogs commit a819656c0aa033234a61487a942fab534906778d Author: Liang Ding Date: Tue May 16 11:15:53 2023 +0800 :memo: Update changelogs commit 56a2c368d96de1e845ad3e287e566c4fc76a972b Author: Liang Ding Date: Tue May 16 11:11:54 2023 +0800 :bug: Remove inconsistent scroll IAL commit 8b6abec8e90b1518220e6178d51fab8ec6dc41e5 Author: Liang Ding Date: Tue May 16 10:39:48 2023 +0800 :art: Bazaar resource directories support symlink https://github.com/siyuan-note/siyuan/pull/8263 commit 945508682061a0db7b4f7be485ec135a4d88dc1b Author: Liang Ding Date: Tue May 16 10:35:46 2023 +0800 :memo: Update changelogs commit fdbfe6b8487cf5848332f3219f2b897d615ff1d1 Author: 颖逸 <49649786+Zuoqiu-Yingyi@users.noreply.github.com> Date: Tue May 16 10:34:38 2023 +0800 Bazaar resource directories support symlink (#8263) * :art: bazaar resource directories support symlink * :art: bazaar resource directories support symlink commit 85496345ef7b52e753ec247e5ced633232a8f66c Author: Vanessa Date: Tue May 16 10:31:01 2023 +0800 :sparkles: enable plugin commit f3d1acd166c1747d8522b276910a89da56723335 Author: Liang Ding Date: Tue May 16 09:39:01 2023 +0800 :memo: Update changelogs commit bf4b88a00770fd130e0b174d27f7ce3b06836e75 Author: Liang Ding Date: Tue May 16 09:38:50 2023 +0800 :art: Plugin hot load commit 516276db49388e7c1bf94ffa3de12b71431e003d Author: Liang Ding Date: Tue May 16 09:09:31 2023 +0800 :art: Data sync connectivity check supports redirection Fix https://github.com/siyuan-note/siyuan/issues/8264 commit d24f5ae3cfe9e9ae7a1acfec0043882ce21dcaf3 Author: Vanessa Date: Tue May 16 00:05:18 2023 +0800 :rotating_light: commit 1ac623ebb1a272ffdc63a8d02f9f6916669b4005 Author: Vanessa Date: Tue May 16 00:04:25 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/8258 commit fdf9f0d9e4af6dbc2aa03ae54d96a421a1648a28 Author: Vanessa Date: Mon May 15 22:33:36 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/5066 removeData commit 7c7f3db0b8f1fdfddea1e0dd5d1a9d867cb95199 Author: Vanessa Date: Mon May 15 22:26:11 2023 +0800 :bug: fix https://github.com/siyuan-note/siyuan/issues/8259 commit ba4e5e8eede49d3e349ac89390a8349147e3fec2 Author: Vanessa Date: Mon May 15 19:59:13 2023 +0800 :lipstick: fix https://github.com/siyuan-note/siyuan/issues/8260 commit 4f099bd99086bb815780f124e2b594243039e1cb Merge: b892fadd 856c7e09 Author: Vanessa Date: Mon May 15 19:35:33 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit b892fadd19cfce2ed0ea957eda8a77f134a18c15 Author: Vanessa Date: Mon May 15 19:35:19 2023 +0800 :lipstick: commit 856c7e0973ce153b57b4a586d13195ff1c8e47c4 Author: Liang Ding Date: Mon May 15 18:48:33 2023 +0800 :memo: Improve initialization data sync interaction https://github.com/siyuan-note/siyuan/issues/8220 commit ab6cb335e495f4a97b7514108fabd3c9475d7ee7 Author: Liang Ding Date: Mon May 15 18:41:51 2023 +0800 :memo: Improve initialization data sync interaction https://github.com/siyuan-note/siyuan/issues/8220 commit a759936208de16515885d62d7b677262f1ab9357 Author: Liang Ding Date: Mon May 15 16:02:58 2023 +0800 :memo: Improve initialization data sync interaction https://github.com/siyuan-note/siyuan/issues/8220 commit 2513cbc31de29bf936408952dbdb88ec6c2bd5a1 Author: Liang Ding Date: Mon May 15 15:53:46 2023 +0800 :memo: Improve initialization data sync interaction https://github.com/siyuan-note/siyuan/issues/8220 commit 9a03f1e73667092241b88d29e43f2e54fa47b68a Author: Liang Ding Date: Mon May 15 15:52:00 2023 +0800 :memo: Update changelogs commit 4cb952361eafe82f0b7330c0cf0292ce1b192d55 Author: Vanessa Date: Mon May 15 15:51:31 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/8220 commit 7d58ab0607963c06b17d3404e03a319c39698480 Merge: 6ca68174 0a102851 Author: Vanessa Date: Mon May 15 15:43:33 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 6ca6817465ba739fbc958cc4dbe8314d01fefd4b Author: Vanessa Date: Mon May 15 15:43:16 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/8220 commit 0a10285167e45fb5a1e7d849ff1dcf1e5de230d0 Author: Liang Ding Date: Mon May 15 14:56:12 2023 +0800 :art: Escape the notification message https://github.com/siyuan-note/siyuan/issues/7811 commit 7dbfa43de471b8df263f919bcc96239da45872e2 Author: Vanessa Date: Mon May 15 13:59:50 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/8220 commit 15141dde1fc09048656262661649cbeb062dc238 Author: Vanessa Date: Mon May 15 13:54:30 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/8220 commit dc1941da3c74039d9a4b25e3c4e7b8b8fb4656de Author: Vanessa Date: Mon May 15 12:11:45 2023 +0800 :art: catch plugin load commit e7288185beaa6edb8c8e3fe457829f9a0bbc5557 Author: Vanessa Date: Mon May 15 12:04:22 2023 +0800 :art: catch plugin load commit 6690084caa56b07a90ae6793d283c753c64dfe6a Author: Vanessa Date: Mon May 15 11:46:51 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/8256 commit 53a95ffbf708909ad683dde2894437330339a484 Author: Vanessa Date: Mon May 15 00:27:27 2023 +0800 :lipstick: account commit 4c7fe248e45e112e7a52272948cf3b256a3069fd Merge: 3674e834 2cf8a819 Author: Vanessa Date: Mon May 15 00:11:08 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 3674e834284a08551f43071a5ba4df376a2f1471 Author: Vanessa Date: Mon May 15 00:10:46 2023 +0800 :lipstick: account commit 2cf8a8191a33f4ad396fe9d28ae0f09aa78a977a Author: Liang Ding Date: Sun May 14 23:21:32 2023 +0800 :art: Improve images render in the marketplace package https://github.com/siyuan-note/bazaar/issues/1119 commit 7572db4012843b3befa2b04477ac92fc05f837e0 Author: Vanessa Date: Sun May 14 12:10:47 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/8216 commit 18071638cfffab481ab41f402aaf03bb9d9c9a4d Author: Vanessa Date: Sun May 14 12:09:52 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/8216 commit 300a60aa4521900ba8f0808782614a8fe39d9437 Merge: 0b001595 a6ecb981 Author: Vanessa Date: Sun May 14 11:50:55 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 0b001595115b942af58c23bd33836fa36e63c37d Author: Vanessa Date: Sun May 14 11:50:41 2023 +0800 :bug: open new window commit a6ecb981b2cd4742c68118bca7b628a5b2400a64 Author: Liang Ding Date: Sun May 14 11:43:54 2023 +0800 :art: Sponsorship through the Open Collective is no longer supported commit 6c3c8d44ade083ed02279638a3ef26311bcf6d5d Author: Liang Ding Date: Sun May 14 10:44:39 2023 +0800 :art: When multiple windows exist, each window should be isolated using the `Optimize Typesetting` https://github.com/siyuan-note/siyuan/issues/8216 commit 3edd8230d33e351ee075a9ff12065546b8827d2d Author: Vanessa Date: Sun May 14 10:34:48 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/8216 commit f8412a49c42a146d00d979592bb1746cf81c4f60 Author: Vanessa Date: Sun May 14 10:27:16 2023 +0800 :bug: fix https://github.com/siyuan-note/siyuan/issues/8187 commit a74ee348f737902e3d1f60766e3af2d11733d2ad Author: Vanessa Date: Sun May 14 10:17:43 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/8242 commit 518ce9491252fed4a40a023b15b3ee06576b2622 Author: Vanessa Date: Sun May 14 10:09:11 2023 +0800 :lipstick: bazaar commit e6923bdebce702cab742f9eb902566cb06d824ea Author: Vanessa Date: Sun May 14 09:55:50 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/8245?utm_source=ld246.com * :art: widgets search support symlink directory * :art: templates directory support symlink * Update template.go --- kernel/model/template.go | 11 ++++++++--- kernel/model/widget.go | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/kernel/model/template.go b/kernel/model/template.go index ad6a2858c..a4e295fd8 100644 --- a/kernel/model/template.go +++ b/kernel/model/template.go @@ -70,6 +70,10 @@ func SearchTemplate(keyword string) (ret []*Block) { ret = []*Block{} templates := filepath.Join(util.DataDir, "templates") + if !util.IsPathRegularDirOrSymlinkDir(templates) { + return + } + groups, err := os.ReadDir(templates) if nil != err { logging.LogErrorf("read templates failed: %s", err) @@ -89,10 +93,11 @@ func SearchTemplate(keyword string) (ret []*Block) { if group.IsDir() { var templateBlocks []*Block templateDir := filepath.Join(templates, group.Name()) - filepath.Walk(templateDir, func(path string, info fs.FileInfo, err error) error { - name := strings.ToLower(info.Name()) + // filepath.Walk 与 filepath.WalkDir 均不支持跟踪符号链接 + filepath.WalkDir(templateDir, func(path string, entry fs.DirEntry, err error) error { + name := strings.ToLower(entry.Name()) if strings.HasPrefix(name, ".") { - if info.IsDir() { + if entry.IsDir() { return filepath.SkipDir } return nil diff --git a/kernel/model/widget.go b/kernel/model/widget.go index 937d7aeb7..fdcc6f2b2 100644 --- a/kernel/model/widget.go +++ b/kernel/model/widget.go @@ -37,7 +37,7 @@ func SearchWidget(keyword string) (ret []*Block) { k := strings.ToLower(keyword) for _, entry := range entries { - if !entry.IsDir() { + if !util.IsDirRegularOrSymlink(entry) { continue }