:art: Widgets search supports symlink subdirectory · 08b333501b - 0ct0pu5/siyuan

🎨 Widgets search supports symlink subdirectory

* 🎨 bazaar resource directories support symlink

* 🎨 bazaar resource directories support symlink

* Squashed commit of the following:

commit a335101d49
Author: Liang Ding <d@b3log.org>
Date:   Tue May 16 12:53:33 2023 +0800

    🔖 Release v2.8.8

commit 6a6dec05f3
Author: Liang Ding <d@b3log.org>
Date:   Tue May 16 11:30:33 2023 +0800

    📝 Update changelogs

commit a819656c0a
Author: Liang Ding <d@b3log.org>
Date:   Tue May 16 11:15:53 2023 +0800

    📝 Update changelogs

commit 56a2c368d9
Author: Liang Ding <d@b3log.org>
Date:   Tue May 16 11:11:54 2023 +0800

    🐛 Remove inconsistent scroll IAL

commit 8b6abec8e9
Author: Liang Ding <d@b3log.org>
Date:   Tue May 16 10:39:48 2023 +0800

    🎨 Bazaar resource directories support symlink https://github.com/siyuan-note/siyuan/pull/8263

commit 9455086820
Author: Liang Ding <d@b3log.org>
Date:   Tue May 16 10:35:46 2023 +0800

    📝 Update changelogs

commit fdbfe6b848
Author: 颖逸 <49649786+Zuoqiu-Yingyi@users.noreply.github.com>
Date:   Tue May 16 10:34:38 2023 +0800

    Bazaar resource directories support symlink (#8263)

    * 🎨 bazaar resource directories support symlink

    * 🎨 bazaar resource directories support symlink

commit 85496345ef
Author: Vanessa <lly219@gmail.com>
Date:   Tue May 16 10:31:01 2023 +0800

    ✨ enable plugin

commit f3d1acd166
Author: Liang Ding <d@b3log.org>
Date:   Tue May 16 09:39:01 2023 +0800

    📝 Update changelogs

commit bf4b88a007
Author: Liang Ding <d@b3log.org>
Date:   Tue May 16 09:38:50 2023 +0800

    🎨 Plugin hot load

commit 516276db49
Author: Liang Ding <d@b3log.org>
Date:   Tue May 16 09:09:31 2023 +0800

    🎨 Data sync connectivity check supports redirection Fix https://github.com/siyuan-note/siyuan/issues/8264

commit d24f5ae3cf
Author: Vanessa <lly219@gmail.com>
Date:   Tue May 16 00:05:18 2023 +0800

    🚨

commit 1ac623ebb1
Author: Vanessa <lly219@gmail.com>
Date:   Tue May 16 00:04:25 2023 +0800

    🎨 fix https://github.com/siyuan-note/siyuan/issues/8258

commit fdf9f0d9e4
Author: Vanessa <lly219@gmail.com>
Date:   Mon May 15 22:33:36 2023 +0800

    🎨 https://github.com/siyuan-note/siyuan/issues/5066 removeData

commit 7c7f3db0b8
Author: Vanessa <lly219@gmail.com>
Date:   Mon May 15 22:26:11 2023 +0800

    🐛 fix https://github.com/siyuan-note/siyuan/issues/8259

commit ba4e5e8eed
Author: Vanessa <lly219@gmail.com>
Date:   Mon May 15 19:59:13 2023 +0800

    💄 fix https://github.com/siyuan-note/siyuan/issues/8260

commit 4f099bd990
Merge: b892fadd 856c7e09
Author: Vanessa <lly219@gmail.com>
Date:   Mon May 15 19:35:33 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit b892fadd19
Author: Vanessa <lly219@gmail.com>
Date:   Mon May 15 19:35:19 2023 +0800

    💄

commit 856c7e0973
Author: Liang Ding <d@b3log.org>
Date:   Mon May 15 18:48:33 2023 +0800

    📝 Improve initialization data sync interaction https://github.com/siyuan-note/siyuan/issues/8220

commit ab6cb335e4
Author: Liang Ding <d@b3log.org>
Date:   Mon May 15 18:41:51 2023 +0800

    📝 Improve initialization data sync interaction https://github.com/siyuan-note/siyuan/issues/8220

commit a759936208
Author: Liang Ding <d@b3log.org>
Date:   Mon May 15 16:02:58 2023 +0800

    📝 Improve initialization data sync interaction https://github.com/siyuan-note/siyuan/issues/8220

commit 2513cbc31d
Author: Liang Ding <d@b3log.org>
Date:   Mon May 15 15:53:46 2023 +0800

    📝 Improve initialization data sync interaction https://github.com/siyuan-note/siyuan/issues/8220

commit 9a03f1e736
Author: Liang Ding <d@b3log.org>
Date:   Mon May 15 15:52:00 2023 +0800

    📝 Update changelogs

commit 4cb952361e
Author: Vanessa <lly219@gmail.com>
Date:   Mon May 15 15:51:31 2023 +0800

    🎨 https://github.com/siyuan-note/siyuan/issues/8220

commit 7d58ab0607
Merge: 6ca68174 0a102851
Author: Vanessa <lly219@gmail.com>
Date:   Mon May 15 15:43:33 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 6ca6817465
Author: Vanessa <lly219@gmail.com>
Date:   Mon May 15 15:43:16 2023 +0800

    🎨 https://github.com/siyuan-note/siyuan/issues/8220

commit 0a10285167
Author: Liang Ding <d@b3log.org>
Date:   Mon May 15 14:56:12 2023 +0800

    🎨 Escape the notification message https://github.com/siyuan-note/siyuan/issues/7811

commit 7dbfa43de4
Author: Vanessa <lly219@gmail.com>
Date:   Mon May 15 13:59:50 2023 +0800

    🎨 https://github.com/siyuan-note/siyuan/issues/8220

commit 15141dde1f
Author: Vanessa <lly219@gmail.com>
Date:   Mon May 15 13:54:30 2023 +0800

    🎨 https://github.com/siyuan-note/siyuan/issues/8220

commit dc1941da3c
Author: Vanessa <lly219@gmail.com>
Date:   Mon May 15 12:11:45 2023 +0800

    🎨 catch plugin load

commit e7288185be
Author: Vanessa <lly219@gmail.com>
Date:   Mon May 15 12:04:22 2023 +0800

    🎨 catch plugin load

commit 6690084caa
Author: Vanessa <lly219@gmail.com>
Date:   Mon May 15 11:46:51 2023 +0800

    🎨 fix https://github.com/siyuan-note/siyuan/issues/8256

commit 53a95ffbf7
Author: Vanessa <lly219@gmail.com>
Date:   Mon May 15 00:27:27 2023 +0800

    💄 account

commit 4c7fe248e4
Merge: 3674e834 2cf8a819
Author: Vanessa <lly219@gmail.com>
Date:   Mon May 15 00:11:08 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 3674e83428
Author: Vanessa <lly219@gmail.com>
Date:   Mon May 15 00:10:46 2023 +0800

    💄 account

commit 2cf8a8191a
Author: Liang Ding <d@b3log.org>
Date:   Sun May 14 23:21:32 2023 +0800

    🎨 Improve images render in the marketplace package https://github.com/siyuan-note/bazaar/issues/1119

commit 7572db4012
Author: Vanessa <lly219@gmail.com>
Date:   Sun May 14 12:10:47 2023 +0800

    🎨 fix https://github.com/siyuan-note/siyuan/issues/8216

commit 18071638cf
Author: Vanessa <lly219@gmail.com>
Date:   Sun May 14 12:09:52 2023 +0800

    🎨 fix https://github.com/siyuan-note/siyuan/issues/8216

commit 300a60aa45
Merge: 0b001595 a6ecb981
Author: Vanessa <lly219@gmail.com>
Date:   Sun May 14 11:50:55 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 0b00159511
Author: Vanessa <lly219@gmail.com>
Date:   Sun May 14 11:50:41 2023 +0800

    🐛 open new window

commit a6ecb981b2
Author: Liang Ding <d@b3log.org>
Date:   Sun May 14 11:43:54 2023 +0800

    🎨 Sponsorship through the Open Collective is no longer supported

commit 6c3c8d44ad
Author: Liang Ding <d@b3log.org>
Date:   Sun May 14 10:44:39 2023 +0800

    🎨 When multiple windows exist, each window should be isolated using the `Optimize Typesetting` https://github.com/siyuan-note/siyuan/issues/8216

commit 3edd8230d3
Author: Vanessa <lly219@gmail.com>
Date:   Sun May 14 10:34:48 2023 +0800

    🎨 https://github.com/siyuan-note/siyuan/issues/8216

commit f8412a49c4
Author: Vanessa <lly219@gmail.com>
Date:   Sun May 14 10:27:16 2023 +0800

    🐛 fix https://github.com/siyuan-note/siyuan/issues/8187

commit a74ee348f7
Author: Vanessa <lly219@gmail.com>
Date:   Sun May 14 10:17:43 2023 +0800

    🎨 fix https://github.com/siyuan-note/siyuan/issues/8242

commit 518ce94912
Author: Vanessa <lly219@gmail.com>
Date:   Sun May 14 10:09:11 2023 +0800

    💄 bazaar

commit e6923bdebc
Author: Vanessa <lly219@gmail.com>
Date:   Sun May 14 09:55:50 2023 +0800

    🎨 https://github.com/siyuan-note/siyuan/issues/8245?utm_source=ld246.com

* 🎨 widgets search support symlink directory

* 🎨 templates directory support symlink

* Update template.go

This commit is contained in:

颖逸

2023-05-17 15:27:32 +08:00

• committed by

GitHub

parent c12547f6fd

commit 08b333501b

No known key found for this signature in database

GPG key ID: 4AEE18F83AFDEB23

2 changed files with 9 additions and 4 deletions

									
										11

kernel/model/template.go
									
										View file
										
				@ -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

									
										2

kernel/model/widget.go
									
										View file
										
				@ -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

						}

Rows
Columns

🎨 Widgets search supports symlink subdirectory

11 kernel/model/template.go Unescape Escape View file

2 kernel/model/widget.go Unescape Escape View file

11

kernel/model/template.go

View file

2

kernel/model/widget.go

View file