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

✨ 分享文档到链滴 https://github.com/siyuan-note/siyuan/issues/2004

Browse source
This commit is contained in:
Liang Ding 2023-01-02 23:26:01 +08:00
parent b3c9ec36bb
commit 145641cd06
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
4 changed files with 68 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/stage/protyle/js/lute/lute.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
kernel/go.mod
View file

@ -6,7 +6,7 @@ require (
github.com/88250/clipboard v0.1.5 github.com/88250/clipboard v0.1.5
github.com/88250/css v0.1.2 github.com/88250/css v0.1.2
github.com/88250/gulu v1.2.3-0.20221117052724-cd06804db798 github.com/88250/gulu v1.2.3-0.20221117052724-cd06804db798
github.com/88250/lute v1.7.5-0.20230102031759-0f971542008d github.com/88250/lute v1.7.5-0.20230102151014-ef1162fc6b41
github.com/88250/pdfcpu v0.3.13 github.com/88250/pdfcpu v0.3.13
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ConradIrwin/font v0.0.0-20210318200717-ce8d41cc0732 github.com/ConradIrwin/font v0.0.0-20210318200717-ce8d41cc0732

2
kernel/go.sum
View file

@ -21,6 +21,8 @@ github.com/88250/lute v1.7.5-0.20221230030827-df878c76f85d h1:EVKgCxsEpdCihMruXo
github.com/88250/lute v1.7.5-0.20221230030827-df878c76f85d/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA= github.com/88250/lute v1.7.5-0.20221230030827-df878c76f85d/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/lute v1.7.5-0.20230102031759-0f971542008d h1:mdtPSy6K9kfRbngWyzRftGd69nCHLqGNDS3drV8fIhU= github.com/88250/lute v1.7.5-0.20230102031759-0f971542008d h1:mdtPSy6K9kfRbngWyzRftGd69nCHLqGNDS3drV8fIhU=
github.com/88250/lute v1.7.5-0.20230102031759-0f971542008d/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA= github.com/88250/lute v1.7.5-0.20230102031759-0f971542008d/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/lute v1.7.5-0.20230102151014-ef1162fc6b41 h1:roNiHXpIjzhXP0+ZeqZ8RVCihtqU9PtSUhQggjI60ik=
github.com/88250/lute v1.7.5-0.20230102151014-ef1162fc6b41/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/pdfcpu v0.3.13 h1:touMWMZkCGalMIbEg9bxYp7rETM+zwb9hXjwhqi4I7Q= github.com/88250/pdfcpu v0.3.13 h1:touMWMZkCGalMIbEg9bxYp7rETM+zwb9hXjwhqi4I7Q=
github.com/88250/pdfcpu v0.3.13/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4= github.com/88250/pdfcpu v0.3.13/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY= github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=

87
kernel/model/export.go
View file

@ -60,8 +60,12 @@ func Export2Liandi(id string) (err error) {
sqlAssets := sql.QueryRootBlockAssets(id) sqlAssets := sql.QueryRootBlockAssets(id)
err = uploadCloud(sqlAssets) err = uploadCloud(sqlAssets)
if nil != err {
return
}
msgId := util.PushMsg(Conf.Language(182), 15000) msgId := util.PushMsg(Conf.Language(182), 15000)
defer util.PushClearMsg(msgId)
// 判断帖子是否已经存在，存在则使用更新接口 // 判断帖子是否已经存在，存在则使用更新接口
foundArticle := false foundArticle := false
@ -95,7 +99,11 @@ func Export2Liandi(id string) (err error) {
title := path.Base(tree.HPath) title := path.Base(tree.HPath)
tags := tree.Root.IALAttr("tags") tags := tree.Root.IALAttr("tags")
content := exportMarkdownContent0(tree, "https://b3logfile.com/siyuan/") content := exportMarkdownContent0(tree, "https://b3logfile.com/siyuan/",
4, 1, 0,
"#", "#",
"", "",
false)
var result = gulu.Ret.NewResult() var result = gulu.Ret.NewResult()
request := httpclient.NewCloudRequest30s() request := httpclient.NewCloudRequest30s()
request = request. request = request.
@ -125,6 +133,7 @@ func Export2Liandi(id string) (err error) {
if 0 != result.Code { if 0 != result.Code {
msg := fmt.Sprintf("send article to liandi failed [code=%d, msg=%s]", result.Code, result.Msg) msg := fmt.Sprintf("send article to liandi failed [code=%d, msg=%s]", result.Code, result.Msg)
logging.LogErrorf(msg) logging.LogErrorf(msg)
util.PushClearMsg(msgId)
return errors.New(result.Msg) return errors.New(result.Msg)
} }
@ -138,7 +147,7 @@ func Export2Liandi(id string) (err error) {
} }
msg := fmt.Sprintf(Conf.Language(181), util.LiandiServer+"/article/"+articleId) msg := fmt.Sprintf(Conf.Language(181), util.LiandiServer+"/article/"+articleId)
util.PushUpdateMsg(msgId, msg, 7000) util.PushMsg(msg, 7000)
return return
} }
@ -288,7 +297,11 @@ func exportData(exportFolder string) (zipPath string, err error) {
func Preview(id string) string { func Preview(id string) string {
tree, _ := loadTreeByBlockID(id) tree, _ := loadTreeByBlockID(id)
tree = exportTree(tree, false, false, false) tree = exportTree(tree, false, false, false,
Conf.Export.BlockRefMode, Conf.Export.BlockEmbedMode, Conf.Export.FileAnnotationRefMode,
Conf.Export.TagOpenMarker, Conf.Export.TagCloseMarker,
Conf.Export.BlockRefTextLeft, Conf.Export.BlockRefTextRight,
Conf.Export.AddTitle)
luteEngine := NewLute() luteEngine := NewLute()
luteEngine.SetFootnotes(true) luteEngine.SetFootnotes(true)
md := treenode.FormatNode(tree.Root, luteEngine) md := treenode.FormatNode(tree.Root, luteEngine)
@ -351,7 +364,11 @@ func ExportMarkdownHTML(id, savePath string, docx, merge bool) (name, dom string
} }
} }
tree = exportTree(tree, true, true, false) tree = exportTree(tree, true, true, false,
Conf.Export.BlockRefMode, Conf.Export.BlockEmbedMode, Conf.Export.FileAnnotationRefMode,
Conf.Export.TagOpenMarker, Conf.Export.TagCloseMarker,
Conf.Export.BlockRefTextLeft, Conf.Export.BlockRefTextRight,
Conf.Export.AddTitle)
name = path.Base(tree.HPath) name = path.Base(tree.HPath)
name = util.FilterFileName(name) // 导出 PDF、HTML 和 Word 时未移除不支持的文件名符号 https://github.com/siyuan-note/siyuan/issues/5614 name = util.FilterFileName(name) // 导出 PDF、HTML 和 Word 时未移除不支持的文件名符号 https://github.com/siyuan-note/siyuan/issues/5614
savePath = strings.TrimSpace(savePath) savePath = strings.TrimSpace(savePath)
@ -475,7 +492,11 @@ func ExportHTML(id, savePath string, pdf, image, keepFold, merge bool) (name, do
} }
} }
tree = exportTree(tree, true, true, keepFold) tree = exportTree(tree, true, true, keepFold,
Conf.Export.BlockRefMode, Conf.Export.BlockEmbedMode, Conf.Export.FileAnnotationRefMode,
Conf.Export.TagOpenMarker, Conf.Export.TagCloseMarker,
Conf.Export.BlockRefTextLeft, Conf.Export.BlockRefTextRight,
Conf.Export.AddTitle)
name = path.Base(tree.HPath) name = path.Base(tree.HPath)
name = util.FilterFileName(name) // 导出 PDF、HTML 和 Word 时未移除不支持的文件名符号 https://github.com/siyuan-note/siyuan/issues/5614 name = util.FilterFileName(name) // 导出 PDF、HTML 和 Word 时未移除不支持的文件名符号 https://github.com/siyuan-note/siyuan/issues/5614
@ -708,7 +729,11 @@ func ExportStdMarkdown(id string) string {
if IsSubscriber() { if IsSubscriber() {
cloudAssetsBase = "https://assets.b3logfile.com/siyuan/" cloudAssetsBase = "https://assets.b3logfile.com/siyuan/"
} }
return exportMarkdownContent0(tree, cloudAssetsBase) return exportMarkdownContent0(tree, cloudAssetsBase,
Conf.Export.BlockRefMode, Conf.Export.BlockEmbedMode, Conf.Export.FileAnnotationRefMode,
Conf.Export.TagOpenMarker, Conf.Export.TagCloseMarker,
Conf.Export.BlockRefTextLeft, Conf.Export.BlockRefTextRight,
Conf.Export.AddTitle)
} }
func ExportMarkdown(id string) (name, zipPath string) { func ExportMarkdown(id string) (name, zipPath string) {
@ -1142,12 +1167,24 @@ func exportMarkdownContent(id string) (hPath, exportedMd string) {
return return
} }
hPath = tree.HPath hPath = tree.HPath
exportedMd = exportMarkdownContent0(tree, "") exportedMd = exportMarkdownContent0(tree, "",
Conf.Export.BlockRefMode, Conf.Export.BlockEmbedMode, Conf.Export.FileAnnotationRefMode,
Conf.Export.TagOpenMarker, Conf.Export.TagCloseMarker,
Conf.Export.BlockRefTextLeft, Conf.Export.BlockRefTextRight,
Conf.Export.AddTitle)
return return
} }
func exportMarkdownContent0(tree *parse.Tree, cloudAssetsBase string) (ret string) { func exportMarkdownContent0(tree *parse.Tree, cloudAssetsBase string,
tree = exportTree(tree, false, true, false) blockRefMode, blockEmbedMode, fileAnnotationRefMode int,
tagOpenMarker, tagCloseMarker string,
blockRefTextLeft, blockRefTextRight string,
addTitle bool) (ret string) {
tree = exportTree(tree, false, true, false,
blockRefMode, blockEmbedMode, fileAnnotationRefMode,
tagOpenMarker, tagCloseMarker,
blockRefTextLeft, blockRefTextRight,
addTitle)
luteEngine := NewLute() luteEngine := NewLute()
luteEngine.SetFootnotes(true) luteEngine.SetFootnotes(true)
luteEngine.SetKramdownIAL(false) luteEngine.SetKramdownIAL(false)
@ -1215,7 +1252,11 @@ func processKaTexMacros(n *ast.Node) {
} }
} }
func exportTree(tree *parse.Tree, wysiwyg, expandKaTexMacros, keepFold bool) (ret *parse.Tree) { func exportTree(tree *parse.Tree, wysiwyg, expandKaTexMacros, keepFold bool,
blockRefMode, blockEmbedMode, fileAnnotationRefMode int,
tagOpenMarker, tagCloseMarker string,
blockRefTextLeft, blockRefTextRight string,
addTitle bool) (ret *parse.Tree) {
luteEngine := NewLute() luteEngine := NewLute()
ret = tree ret = tree
id := tree.Root.ID id := tree.Root.ID
@ -1245,7 +1286,7 @@ func exportTree(tree *parse.Tree, wysiwyg, expandKaTexMacros, keepFold bool) (re
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
lines := strings.Split(defMd, "\n") lines := strings.Split(defMd, "\n")
for i, line := range lines { for i, line := range lines {
if 0 == Conf.Export.BlockEmbedMode { // 原始文本 if 0 == blockEmbedMode { // 原始文本
buf.WriteString(line) buf.WriteString(line)
} else { // Blockquote } else { // Blockquote
buf.WriteString("> " + line) buf.WriteString("> " + line)
@ -1277,7 +1318,7 @@ func exportTree(tree *parse.Tree, wysiwyg, expandKaTexMacros, keepFold bool) (re
// 收集引用转脚注 // 收集引用转脚注
var refFootnotes []*refAsFootnotes var refFootnotes []*refAsFootnotes
if 4 == Conf.Export.BlockRefMode { // 块引转脚注 if 4 == blockRefMode { // 块引转脚注
treeCache := map[string]*parse.Tree{} treeCache := map[string]*parse.Tree{}
treeCache[id] = ret treeCache[id] = ret
depth := 0 depth := 0
@ -1307,13 +1348,13 @@ func exportTree(tree *parse.Tree, wysiwyg, expandKaTexMacros, keepFold bool) (re
return ast.WalkContinue return ast.WalkContinue
} else if n.IsTextMarkType("file-annotation-ref") { } else if n.IsTextMarkType("file-annotation-ref") {
refID := n.TextMarkFileAnnotationRefID refID := n.TextMarkFileAnnotationRefID
status := processFileAnnotationRef(refID, n) status := processFileAnnotationRef(refID, n, fileAnnotationRefMode)
unlinks = append(unlinks, n) unlinks = append(unlinks, n)
return status return status
} else if n.IsTextMarkType("tag") { } else if n.IsTextMarkType("tag") {
if !wysiwyg { if !wysiwyg {
n.Type = ast.NodeText n.Type = ast.NodeText
n.Tokens = []byte(Conf.Export.TagOpenMarker + n.TextMarkTextContent + Conf.Export.TagCloseMarker) n.Tokens = []byte(tagOpenMarker + n.TextMarkTextContent + tagCloseMarker)
return ast.WalkContinue return ast.WalkContinue
} }
} }
@ -1332,14 +1373,14 @@ func exportTree(tree *parse.Tree, wysiwyg, expandKaTexMacros, keepFold bool) (re
if Conf.Editor.BlockRefDynamicAnchorTextMaxLen < utf8.RuneCountInString(linkText) { if Conf.Editor.BlockRefDynamicAnchorTextMaxLen < utf8.RuneCountInString(linkText) {
linkText = gulu.Str.SubStr(linkText, Conf.Editor.BlockRefDynamicAnchorTextMaxLen) + "..." linkText = gulu.Str.SubStr(linkText, Conf.Editor.BlockRefDynamicAnchorTextMaxLen) + "..."
} }
linkText = Conf.Export.BlockRefTextLeft + linkText + Conf.Export.BlockRefTextRight linkText = blockRefTextLeft + linkText + blockRefTextRight
defTree, _ := loadTreeByBlockID(defID) defTree, _ := loadTreeByBlockID(defID)
if nil == defTree { if nil == defTree {
return ast.WalkContinue return ast.WalkContinue
} }
switch Conf.Export.BlockRefMode { switch blockRefMode {
case 2: // 锚文本块链 case 2: // 锚文本块链
var blockRefLink *ast.Node var blockRefLink *ast.Node
blockRefLink = &ast.Node{Type: ast.NodeLink} blockRefLink = &ast.Node{Type: ast.NodeLink}
@ -1368,13 +1409,13 @@ func exportTree(tree *parse.Tree, wysiwyg, expandKaTexMacros, keepFold bool) (re
n.Unlink() n.Unlink()
} }
if 4 == Conf.Export.BlockRefMode { // 块引转脚注 if 4 == blockRefMode { // 块引转脚注
if footnotesDefBlock := resolveFootnotesDefs(&refFootnotes, ret.Root.ID); nil != footnotesDefBlock { if footnotesDefBlock := resolveFootnotesDefs(&refFootnotes, ret.Root.ID, blockRefTextLeft, blockRefTextRight); nil != footnotesDefBlock {
ret.Root.AppendChild(footnotesDefBlock) ret.Root.AppendChild(footnotesDefBlock)
} }
} }
if Conf.Export.AddTitle { if addTitle {
if root, _ := getBlock(id); nil != root { if root, _ := getBlock(id); nil != root {
title := &ast.Node{Type: ast.NodeHeading, HeadingLevel: 1, KramdownIAL: parse.Map2IAL(root.IAL)} title := &ast.Node{Type: ast.NodeHeading, HeadingLevel: 1, KramdownIAL: parse.Map2IAL(root.IAL)}
content := html.UnescapeString(root.Content) content := html.UnescapeString(root.Content)
@ -1483,7 +1524,7 @@ func exportTree(tree *parse.Tree, wysiwyg, expandKaTexMacros, keepFold bool) (re
return ret return ret
} }
func resolveFootnotesDefs(refFootnotes *[]*refAsFootnotes, rootID string) (footnotesDefBlock *ast.Node) { func resolveFootnotesDefs(refFootnotes *[]*refAsFootnotes, rootID string, blockRefTextLeft, blockRefTextRight string) (footnotesDefBlock *ast.Node) {
if 1 > len(*refFootnotes) { if 1 > len(*refFootnotes) {
return nil return nil
} }
@ -1528,7 +1569,7 @@ func resolveFootnotesDefs(refFootnotes *[]*refAsFootnotes, rootID string) (footn
if treenode.IsBlockRef(n) { if treenode.IsBlockRef(n) {
defID, _, _ := treenode.GetBlockRef(n) defID, _, _ := treenode.GetBlockRef(n)
if f := getRefAsFootnotes(defID, refFootnotes); nil != f { if f := getRefAsFootnotes(defID, refFootnotes); nil != f {
n.InsertBefore(&ast.Node{Type: ast.NodeText, Tokens: []byte(Conf.Export.BlockRefTextLeft + f.refAnchorText + Conf.Export.BlockRefTextRight)}) n.InsertBefore(&ast.Node{Type: ast.NodeText, Tokens: []byte(blockRefTextLeft + f.refAnchorText + blockRefTextRight)})
n.InsertBefore(&ast.Node{Type: ast.NodeFootnotesRef, Tokens: []byte("^" + f.refNum), FootnotesRefId: f.refNum, FootnotesRefLabel: []byte("^" + f.refNum)}) n.InsertBefore(&ast.Node{Type: ast.NodeFootnotesRef, Tokens: []byte("^" + f.refNum), FootnotesRefId: f.refNum, FootnotesRefLabel: []byte("^" + f.refNum)})
unlinks = append(unlinks, n) unlinks = append(unlinks, n)
} }
@ -1714,7 +1755,7 @@ func exportRefTrees0(tree *parse.Tree, retTrees *map[string]*parse.Tree) {
}) })
} }
func processFileAnnotationRef(refID string, n *ast.Node) ast.WalkStatus { func processFileAnnotationRef(refID string, n *ast.Node, fileAnnotationRefMode int) ast.WalkStatus {
p := refID[:strings.LastIndex(refID, "/")] p := refID[:strings.LastIndex(refID, "/")]
absPath, err := GetAssetAbsPath(p) absPath, err := GetAssetAbsPath(p)
if nil != err { if nil != err {
@ -1747,7 +1788,7 @@ func processFileAnnotationRef(refID string, n *ast.Node) ast.WalkStatus {
file := p[7:len(p)-23-len(ext)] + ext file := p[7:len(p)-23-len(ext)] + ext
fileAnnotationRefLink := &ast.Node{Type: ast.NodeLink} fileAnnotationRefLink := &ast.Node{Type: ast.NodeLink}
fileAnnotationRefLink.AppendChild(&ast.Node{Type: ast.NodeOpenBracket}) fileAnnotationRefLink.AppendChild(&ast.Node{Type: ast.NodeOpenBracket})
if 0 == Conf.Export.FileAnnotationRefMode { if 0 == fileAnnotationRefMode {
fileAnnotationRefLink.AppendChild(&ast.Node{Type: ast.NodeLinkText, Tokens: []byte(file + " - p" + pageStr + " - " + refText)}) fileAnnotationRefLink.AppendChild(&ast.Node{Type: ast.NodeLinkText, Tokens: []byte(file + " - p" + pageStr + " - " + refText)})
} else { } else {
fileAnnotationRefLink.AppendChild(&ast.Node{Type: ast.NodeLinkText, Tokens: []byte(refText)}) fileAnnotationRefLink.AppendChild(&ast.Node{Type: ast.NodeLinkText, Tokens: []byte(refText)})