Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 14:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 Database index content/markdown values no longer contain zero-width spaces https://github.com/siyuan-note/siyuan/issues/15204

Browse source
This commit is contained in:
Daniel 2025-07-03 10:01:04 +08:00
parent 2673ae343f
commit 286223db84
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/blockial.go
View file

@ -24,6 +24,7 @@ import (
"github.com/88250/gulu" "github.com/88250/gulu"
"github.com/88250/lute/ast" "github.com/88250/lute/ast"
"github.com/88250/lute/editor"
"github.com/88250/lute/lex" "github.com/88250/lute/lex"
"github.com/88250/lute/parse" "github.com/88250/lute/parse"
"github.com/araddon/dateparse" "github.com/araddon/dateparse"
@ -69,6 +70,7 @@ func SetBlockReminder(id string, timed string) (err error) {
} }
content := sql.NodeStaticContent(node, nil, false, false, false) content := sql.NodeStaticContent(node, nil, false, false, false)
content = gulu.Str.SubStr(content, 128) content = gulu.Str.SubStr(content, 128)
content = strings.ReplaceAll(content, editor.Zwsp, "")
err = SetCloudBlockReminder(id, content, timedMills) err = SetCloudBlockReminder(id, content, timedMills)
if err != nil { if err != nil {
return return

2
kernel/model/virutalref.go
View file

@ -26,6 +26,7 @@ import (
"github.com/88250/gulu" "github.com/88250/gulu"
"github.com/88250/lute" "github.com/88250/lute"
"github.com/88250/lute/ast" "github.com/88250/lute/ast"
"github.com/88250/lute/editor"
"github.com/88250/lute/parse" "github.com/88250/lute/parse"
"github.com/ClarkThan/ahocorasick" "github.com/ClarkThan/ahocorasick"
"github.com/dgraph-io/ristretto" "github.com/dgraph-io/ristretto"
@ -54,6 +55,7 @@ func getBlockVirtualRefKeywords(root *ast.Node) (ret []string) {
} }
content := sql.NodeStaticContent(n, nil, false, false, false) content := sql.NodeStaticContent(n, nil, false, false, false)
content = strings.ReplaceAll(content, editor.Zwsp, "")
buf.WriteString(content) buf.WriteString(content)
return ast.WalkContinue return ast.WalkContinue
}) })

2
kernel/sql/block.go
View file

@ -23,6 +23,7 @@ import (
"github.com/88250/gulu" "github.com/88250/gulu"
"github.com/88250/lute/ast" "github.com/88250/lute/ast"
"github.com/88250/lute/editor"
"github.com/88250/lute/html" "github.com/88250/lute/html"
"github.com/88250/lute/parse" "github.com/88250/lute/parse"
"github.com/siyuan-note/logging" "github.com/siyuan-note/logging"
@ -117,6 +118,7 @@ func indexNode(tx *sql.Tx, id string) (err error) {
} }
content := NodeStaticContent(node, nil, true, indexAssetPath, true) content := NodeStaticContent(node, nil, true, indexAssetPath, true)
content = strings.ReplaceAll(content, editor.Zwsp, "")
stmt := "UPDATE blocks SET content = ? WHERE id = ?" stmt := "UPDATE blocks SET content = ? WHERE id = ?"
if err = execStmtTx(tx, stmt, content, id); err != nil { if err = execStmtTx(tx, stmt, content, id); err != nil {
tx.Rollback() tx.Rollback()

6
kernel/sql/database.go
View file

@ -36,6 +36,7 @@ import (
"github.com/88250/gulu" "github.com/88250/gulu"
"github.com/88250/lute/ast" "github.com/88250/lute/ast"
"github.com/88250/lute/editor"
"github.com/88250/lute/html" "github.com/88250/lute/html"
"github.com/88250/lute/parse" "github.com/88250/lute/parse"
"github.com/mattn/go-sqlite3" "github.com/mattn/go-sqlite3"
@ -867,6 +868,11 @@ func buildBlockFromNode(n *ast.Node, tree *parse.Tree) (block *Block, attributes
length = utf8.RuneCountInString(content) length = utf8.RuneCountInString(content)
} }
// 剔除零宽空格 Database index content/markdown values no longer contain zero-width spaces https://github.com/siyuan-note/siyuan/issues/15204
fcontent = strings.ReplaceAll(fcontent, editor.Zwsp, "")
content = strings.ReplaceAll(content, editor.Zwsp, "")
markdown = strings.ReplaceAll(markdown, editor.Zwsp, "")
block = &Block{ block = &Block{
ID: n.ID, ID: n.ID,
ParentID: parentID, ParentID: parentID,