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

🎨 Improve HTML clipping https://github.com/siyuan-note/siyuan/issues/14202

Browse source
This commit is contained in:
Daniel 2025-02-25 23:18:07 +08:00
parent 33f8def8ce
commit 42585be285
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 55 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

97
kernel/api/extension.go
View file

@ -60,9 +60,27 @@ func extensionCopy(c *gin.Context) {
return
}
clippingSym := false
symArticleHref := ""
if nil != form.Value["href"] {
// 剪藏链滴帖子时直接使用 Markdown 接口的返回
// https://ld246.com/article/raw/1724850322251
symArticleHref = form.Value["href"][0]
if strings.HasPrefix(symArticleHref, "https://ld246.com/article/") || strings.HasPrefix(symArticleHref, "https://liuyun.io/article/") {
symArticleHref = strings.ReplaceAll(symArticleHref, "https://ld246.com/article/", "https://ld246.com/article/raw/")
symArticleHref = strings.ReplaceAll(symArticleHref, "https://liuyun.io/article/", "https://liuyun.io/article/raw/")
clippingSym = true
}
}
uploaded := map[string]string{}
for originalName, file := range form.File {
oName, err := url.PathUnescape(originalName)
if clippingSym && strings.Contains(oName, "img-loading.svg") {
continue
}
if err != nil {
if strings.Contains(originalName, "%u") {
originalName = strings.ReplaceAll(originalName, "%u", "\\u")
@ -134,52 +152,47 @@ func extensionCopy(c *gin.Context) {
luteEngine.SetHTMLTag2TextMark(true)
var md string
var withMath bool
if nil != form.Value["href"] {
if href := form.Value["href"][0]; strings.HasPrefix(href, "https://ld246.com/article/") || strings.HasPrefix(href, "https://liuyun.io/article/") {
// 剪藏链滴帖子时直接使用 Markdown 接口的返回
// https://ld246.com/article/raw/1724850322251
href = strings.ReplaceAll(href, "https://ld246.com/article/", "https://ld246.com/article/raw/")
href = strings.ReplaceAll(href, "https://liuyun.io/article/", "https://liuyun.io/article/raw/")
resp, err := httpclient.NewCloudRequest30s().Get(href)
if err != nil {
logging.LogWarnf("get [%s] failed: %s", href, err)
} else {
bodyData, readErr := io.ReadAll(resp.Body)
if nil != readErr {
ret.Code = -1
ret.Msg = "read response body failed: " + readErr.Error()
return
}
md = string(bodyData)
luteEngine.SetIndentCodeBlock(true) // 链滴支持缩进代码块，因此需要开启
tree := parse.Parse("", []byte(md), luteEngine.ParseOptions)
ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
if ast.NodeInlineMath == n.Type {
withMath = true
return ast.WalkStop
} else if ast.NodeCodeBlock == n.Type {
if !n.IsFencedCodeBlock {
// 将缩进代码块转换为围栏代码块
n.IsFencedCodeBlock = true
n.CodeBlockFenceChar = '`'
n.PrependChild(&ast.Node{Type: ast.NodeCodeBlockFenceInfoMarker})
n.PrependChild(&ast.Node{Type: ast.NodeCodeBlockFenceOpenMarker, Tokens: []byte("```"), CodeBlockFenceLen: 3})
n.LastChild.InsertAfter(&ast.Node{Type: ast.NodeCodeBlockFenceCloseMarker, Tokens: []byte("```"), CodeBlockFenceLen: 3})
code := n.ChildByType(ast.NodeCodeBlockCode)
if nil != code {
code.Tokens = bytes.TrimPrefix(code.Tokens, []byte(" "))
code.Tokens = bytes.ReplaceAll(code.Tokens, []byte("\n "), []byte("\n"))
code.Tokens = bytes.TrimPrefix(code.Tokens, []byte("\t"))
code.Tokens = bytes.ReplaceAll(code.Tokens, []byte("\n\t"), []byte("\n"))
}
if clippingSym {
resp, err := httpclient.NewCloudRequest30s().Get(symArticleHref)
if err != nil {
logging.LogWarnf("get [%s] failed: %s", symArticleHref, err)
} else {
bodyData, readErr := io.ReadAll(resp.Body)
if nil != readErr {
ret.Code = -1
ret.Msg = "read response body failed: " + readErr.Error()
return
}
md = string(bodyData)
luteEngine.SetIndentCodeBlock(true) // 链滴支持缩进代码块，因此需要开启
tree := parse.Parse("", []byte(md), luteEngine.ParseOptions)
ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
if ast.NodeInlineMath == n.Type {
withMath = true
return ast.WalkStop
} else if ast.NodeCodeBlock == n.Type {
if !n.IsFencedCodeBlock {
// 将缩进代码块转换为围栏代码块
n.IsFencedCodeBlock = true
n.CodeBlockFenceChar = '`'
n.PrependChild(&ast.Node{Type: ast.NodeCodeBlockFenceInfoMarker})
n.PrependChild(&ast.Node{Type: ast.NodeCodeBlockFenceOpenMarker, Tokens: []byte("```"), CodeBlockFenceLen: 3})
n.LastChild.InsertAfter(&ast.Node{Type: ast.NodeCodeBlockFenceCloseMarker, Tokens: []byte("```"), CodeBlockFenceLen: 3})
code := n.ChildByType(ast.NodeCodeBlockCode)
if nil != code {
code.Tokens = bytes.TrimPrefix(code.Tokens, []byte(" "))
code.Tokens = bytes.ReplaceAll(code.Tokens, []byte("\n "), []byte("\n"))
code.Tokens = bytes.TrimPrefix(code.Tokens, []byte("\t"))
code.Tokens = bytes.ReplaceAll(code.Tokens, []byte("\n\t"), []byte("\n"))
}
}
return ast.WalkContinue
})
}
return ast.WalkContinue
})
md, _ = lute.FormatNodeSync(tree.Root, luteEngine.ParseOptions, luteEngine.RenderOptions)
}
md, _ = lute.FormatNodeSync(tree.Root, luteEngine.ParseOptions, luteEngine.RenderOptions)
}
}