Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-01 10:20:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 Remove Unicode PUA characters https://github.com/siyuan-note/siyuan/issues/13291

Browse source
This commit is contained in:
Daniel 2024-11-27 20:13:22 +08:00
parent 18f68ac715
commit 7446599c0f
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
18 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/util/file.go
View file

@ -242,7 +242,7 @@ func FilterFileName(name string) string {
name = strings.ReplaceAll(name, ">", "_")
name = strings.ReplaceAll(name, "|", "_")
name = strings.TrimSpace(name)
name = gulu.Str.RemoveInvisible(name) // Remove invisible characters from file names when uploading assets https://github.com/siyuan-note/siyuan/issues/11683
name = RemoveInvalid(name) // Remove invisible characters from file names when uploading assets https://github.com/siyuan-note/siyuan/issues/11683
return name
}

3
kernel/util/misc.go
View file

@ -26,7 +26,6 @@ import (
"time"
"unicode"
"github.com/88250/gulu"
"github.com/88250/lute/html"
)
@ -133,7 +132,7 @@ func RemoveRedundantSpace(str string) string {
}
func Convert2Float(s string) (float64, bool) {
s = gulu.Str.RemoveInvisible(s)
s = RemoveInvalid(s)
s = strings.ReplaceAll(s, " ", "")
s = strings.ReplaceAll(s, ",", "")
buf := bytes.Buffer{}

4
kernel/util/ocr.go
View file

@ -248,7 +248,7 @@ func Tesseract(imgAbsPath string) (ret []map[string]interface{}) {
ret = append(ret, dataMap)
}
tsv = gulu.Str.RemoveInvisible(tsv)
tsv = RemoveInvalid(tsv)
tsv = RemoveRedundantSpace(tsv)
msg := fmt.Sprintf("OCR [%s] [%s]", html.EscapeString(info.Name()), html.EscapeString(GetOcrJsonText(ret)))
PushStatusBar(msg)
@ -266,7 +266,7 @@ func GetOcrJsonText(jsonData []map[string]interface{}) (ret string) {
}
}
}
ret = gulu.Str.RemoveInvisible(ret)
ret = RemoveInvalid(ret)
ret = RemoveRedundantSpace(ret)
return ret
}

8
kernel/util/rune.go
View file

@ -56,6 +56,12 @@ var emojiRegex = regexp.MustCompile(`/([0-9#][\x{20E3}])|` +
func RemoveEmojiInvisible(text string) (ret string) {
ret = emojiRegex.ReplaceAllString(text, "")
ret = gulu.Str.RemoveInvisible(ret)
ret = RemoveInvalid(ret)
return
}
func RemoveInvalid(text string) (ret string) {
ret = gulu.Str.RemoveInvisible(text)
ret = gulu.Str.RemovePUA(text)
return
}