0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🐛 Blockquote in list turn into paragraph causes internal error https://github.com/siyuan-note/siyuan/issues/9920

Browse source
This commit is contained in:
Daniel 2023-12-19 12:30:07 +08:00
parent afef0d799e
commit 106ffb292b
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
kernel/sql/database.go
View file

@ -798,15 +798,14 @@ func buildBlockFromNode(n *ast.Node, tree *parse.Tree) (block *Block, attributes
length = utf8.RuneCountInString(fcontent)
} else if n.IsContainerBlock() {
markdown = treenode.ExportNodeStdMd(n, luteEngine)
if !treenode.IsNodeOCRed(n) {
util.PushNodeOCRQueue(n.ID)
util.PushNodeOCRQueue(n)
}
content = treenode.NodeStaticContent(n, nil, true, indexAssetPath)
fc := treenode.FirstLeafBlock(n)
fc := treenode.FirstLeafBlock(n)
if !treenode.IsNodeOCRed(fc) {
util.PushNodeOCRQueue(fc.ID)
util.PushNodeOCRQueue(fc)
}
fcontent = treenode.NodeStaticContent(fc, nil, true, false)
@ -818,11 +817,9 @@ func buildBlockFromNode(n *ast.Node, tree *parse.Tree) (block *Block, attributes
length = utf8.RuneCountInString(fcontent)
} else {
markdown = treenode.ExportNodeStdMd(n, luteEngine)
if !treenode.IsNodeOCRed(n) {
util.PushNodeOCRQueue(n.ID)
util.PushNodeOCRQueue(n)
}
content = treenode.NodeStaticContent(n, nil, true, indexAssetPath)
parentID = n.Parent.ID

2
kernel/treenode/node.go
View file

@ -138,7 +138,7 @@ func ExportNodeStdMd(node *ast.Node, luteEngine *lute.Lute) string {
func IsNodeOCRed(node *ast.Node) (ret bool) {
if !util.TesseractEnabled || nil == node {
return
return true
}
ret = true

9
kernel/util/tesseract.go
View file

@ -30,6 +30,7 @@ import (
"time"
"github.com/88250/gulu"
"github.com/88250/lute/ast"
"github.com/88250/lute/html"
"github.com/dustin/go-humanize"
"github.com/siyuan-note/logging"
@ -279,8 +280,12 @@ var (
NodeOCRQueueLock = sync.Mutex{}
)
func PushNodeOCRQueue(id string) {
func PushNodeOCRQueue(n *ast.Node) {
if nil == n {
return
}
NodeOCRQueueLock.Lock()
defer NodeOCRQueueLock.Unlock()
NodeOCRQueue = append(NodeOCRQueue, id)
NodeOCRQueue = append(NodeOCRQueue, n.ID)
}