From d65bce4a17eb872e7e3f19783bc31139cca9f90b Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Mon, 16 Jan 2023 15:20:26 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E6=A1=8C=E9=9D=A2=E7=AB=AF=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=90=9C=E7=B4=A2=E5=9B=BE=E7=89=87=20OCR=20=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=20https://github.com/siyuan-note/siyuan/issues/3470?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/treenode/node.go | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/kernel/treenode/node.go b/kernel/treenode/node.go
index 1078326be..1a01071f3 100644
--- a/kernel/treenode/node.go
+++ b/kernel/treenode/node.go
@@ -106,20 +106,34 @@ func NodeStaticContent(node *ast.Node, excludeTypes []string) string {
 		}
 
 		switch n.Type {
-		case ast.NodeLinkText:
-			buf.Write(n.Tokens)
-
-			if nil != n.Parent && ast.NodeImage == n.Parent.Type {
-				destNode := n.Parent.ChildByType(ast.NodeLinkDest)
-				if nil != destNode {
-					// 桌面端支持搜索图片 OCR 文本 https://github.com/siyuan-note/siyuan/issues/3470
-					if text := util2.GetAssetText(destNode.TokensStr()); "" != text {
-						buf.WriteByte(' ')
-						buf.WriteString(text)
-					}
-				}
+		case ast.NodeImage:
+			linkDest := n.ChildByType(ast.NodeLinkDest)
+			var linkDestStr, ocrText string
+			if nil != linkDest {
+				linkDestStr = linkDest.TokensStr()
+				ocrText = util2.GetAssetText(linkDestStr)
 			}
 
+			linkText := n.ChildByType(ast.NodeLinkText)
+			if nil != linkText {
+				buf.Write(linkText.Tokens)
+				buf.WriteByte(' ')
+			}
+			if "" != ocrText {
+				buf.WriteString(ocrText)
+				buf.WriteByte(' ')
+			}
+			if nil != linkDest {
+				buf.Write(n.Tokens)
+				buf.WriteByte(' ')
+
+			}
+			if linkTitle := n.ChildByType(ast.NodeLinkTitle); nil != linkTitle {
+				buf.Write(linkTitle.Tokens)
+			}
+			return ast.WalkSkipChildren
+		case ast.NodeLinkText:
+			buf.Write(n.Tokens)
 			buf.WriteByte(' ')
 		case ast.NodeLinkDest:
 			buf.Write(n.Tokens)