From 0b7c6a851e08fddf0d807484ca0c5da3ac8985ae Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Thu, 13 Oct 2022 12:00:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E6=8F=90?=
 =?UTF-8?q?=E5=8F=8A=E5=92=8C=E8=99=9A=E6=8B=9F=E5=BC=95=E7=94=A8=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=88=86=E8=AF=8D=20Fix=20https://github.com/siyuan-n?=
 =?UTF-8?q?ote/siyuan/issues/6176?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/backlink.go |  5 +++++
 kernel/model/search.go   | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/kernel/model/backlink.go b/kernel/model/backlink.go
index 37a3e71d3..877c63817 100644
--- a/kernel/model/backlink.go
+++ b/kernel/model/backlink.go
@@ -791,10 +791,15 @@ func searchBackmention(mentionKeywords []string, keyword string, excludeBacklink
 
 		text := textBuf.String()
 		text = strings.ToLower(text)
+		text = luteEngine.Space(text)
 		var contain bool
 		for _, mentionKeyword := range mentionKeywords {
 			parts := strings.Split(text, " ")
 			for _, part := range parts {
+				if "" == part {
+					continue
+				}
+
 				if gulu.Str.IsASCII(mentionKeyword) {
 					if part == mentionKeyword {
 						contain = true
diff --git a/kernel/model/search.go b/kernel/model/search.go
index b02220a22..57afce85a 100644
--- a/kernel/model/search.go
+++ b/kernel/model/search.go
@@ -649,8 +649,14 @@ func markReplaceSpan(text string, keywords []string, replacementStart, replaceme
 
 		for _, k := range keywords {
 			if gulu.Str.IsASCII(k) {
-				if part == k {
-					parts[i] = replacementStart + k + replacementEnd
+				if gulu.Str.IsASCII(part) {
+					if part == k {
+						parts[i] = replacementStart + k + replacementEnd
+					}
+				} else {
+					if strings.Contains(part, k) {
+						parts[i] = strings.ReplaceAll(part, k, replacementStart+k+replacementEnd)
+					}
 				}
 			} else {
 				if strings.Contains(part, k) {

From e35d9eb84b24e8ec65c9c6c04b44e596d0d9dcd3 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Thu, 13 Oct 2022 12:05:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?:art:=20=E6=A1=8C=E9=9D=A2=E7=AB=AF?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0=E5=AE=89=E8=A3=85=E5=8C=85?=
 =?UTF-8?q?=E4=B8=8D=E8=BF=9B=E8=A1=8C=E5=B9=B6=E5=8F=91=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=20Fix=20https://github.com/siyuan-note/siyuan/issues/6175?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/updater.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel/model/updater.go b/kernel/model/updater.go
index a94c083b9..0ba434d08 100644
--- a/kernel/model/updater.go
+++ b/kernel/model/updater.go
@@ -156,8 +156,10 @@ func downloadInstallPkg(pkgURL, checksum string) {
 	logging.LogInfof("downloading install package [%s]", pkgURL)
 	msgId := util.PushMsg(Conf.Language(103), 60*1000*10)
 	client := req.C().SetTLSHandshakeTimeout(7 * time.Second).SetTimeout(10 * time.Minute)
-	err = client.NewParallelDownload(pkgURL).SetConcurrency(8).SetSegmentSize(1024 * 1024 * 2).
-		SetOutputFile(savePath).Do()
+	callback := func(info req.DownloadInfo) {
+		//logging.LogDebugf("downloading install package [%s %.2f%%]", pkgURL, float64(info.DownloadedSize)/float64(info.Response.ContentLength)*100.0)
+	}
+	_, err = client.R().SetOutputFile(savePath).SetDownloadCallback(callback).Get(pkgURL)
 	if nil != err {
 		logging.LogErrorf("download install package failed: %s", err)
 		util.PushUpdateMsg(msgId, Conf.Language(104), 7000)