修复资源路径bug ，rss.xml 的引用不在底部引用列表与菜单中显示了

Author: 2234839

.vscode/launch.json

@@ -23,7 +23,7 @@
                 "-OutDir=D:\\code\\doc\\docHTML",
                 "-TemplateDir=./views/",
                 "-SqlitePath=C:/Users/llej/Documents/SiYuan/temp/siyuan.db",
-                "-IsDev=true",
+                "-IsDev=false",
             ],
             // "args": [
             //     "-SourceDir=C:/Users/llej/Documents/SiYuan/data/思源笔记用户指南",

src/main.go

@@ -51,7 +51,7 @@ func main() {
 	// copy views 中的资源文件
 	copy.Copy(path.Join(conf.TemplateDir, "./assets"), path.Join(outDir, "./assets"))
 	util.RunningLog("2.1", "copy 完成")
-	copy.Copy(path.Join(workspaceDir, "./widgets"), path.Join(outDir, "./widgets"))
+	copy.Copy(path.Join(workspaceDir, "./widgets"), path.Join(outDir, "./assets/widgets"))
 	util.RunningLog("2.2", "copy widgets")
 
 	// 流程 3  遍历源目录 生成 html 到输出目录
@@ -127,6 +127,9 @@ func main() {
 
 			var sonEntityList []sonEntityI
 			for _, sonEntity := range sonList {
+				if conf.RssNoOutputHtml && strings.HasSuffix(sonEntity.Name, ".rss.xml") {
+					continue
+				}
 				webPath := sonEntity.VirtualPath()[len(virtualPath):]
 				var name string
 				if sonEntity.Info.IsDir() {
@@ -199,6 +202,8 @@ func fileEntityListFilter(list []structAll.FileEntity, test func(structAll.FileE
 	}
 	return
 }
+
+// TODO: 逻辑不够严谨，还是存在错误 例如 file:///D:/code/doc/docHTML/工具/文本处理/简单文本处理.html 中的资源地址无法访问
 func HandlingAssets(node *ast.Node, outDir string, fileEntity structAll.FileEntity) {
 	if node.Next != nil {
 		HandlingAssets(node.Next, outDir, fileEntity)
@@ -235,16 +240,16 @@ func HandlingAssets(node *ast.Node, outDir string, fileEntity structAll.FileEnti
 							// 资源文件在笔记本内，这里重写链接地址即可
 							p := path.Join(strings.Repeat("../", level), dest)
 							node.Tokens = []byte(p)
-							return
 						} else {
 							// 在工作空间内
-							err := copy.Copy(assetsPath, path.Join(outDir, dest))
-							if err != nil {
-								util.Warn("复制资源文件失败", err)
-							}
 							node.Tokens = []byte(path.Join(fileEntity.RootPath(), dest))
-							return
 						}
+						// TODO 因为会有多个链接指向同一个资源，所以下面的写法会导致多余的 copy 需要优化
+						err := copy.Copy(assetsPath, path.Join(outDir, dest))
+						if err != nil {
+							util.Warn("复制资源文件失败", err)
+						}
+						return
 					} else {
 						// 当前路径不存在
 						level += 1

src/render/link.go

@@ -32,21 +32,33 @@ func (r *BaseRenderer) PrefixPath(dest []byte) []byte {
 	return ret
 }
 
+// BaseLinkOcean 链接 BaseRenderer 与 OceanPressRender
+var BaseLinkOcean = make(map[string]*OceanPressRender)
+
 func (r *BaseRenderer) RelativePath(dest []byte) []byte {
-	if "" == r.Options.LinkBase {
-		return dest
-	}
+
+	// if "" == r.Options.LinkBase {
+	// 	return dest
+	// }
+	oceanpressRender := BaseLinkOcean[r.Tree.ID]
 
 	// 强制将 %5C 即反斜杠 \ 转换为斜杠 / 以兼容 Windows 平台上使用的路径
 	dest = bytes.ReplaceAll(dest, []byte("%5C"), []byte("\\"))
 	if !r.isRelativePath(dest) {
+		if bytes.HasPrefix(dest, []byte("/widgets/")) {
+			dest = append([]byte(oceanpressRender.context.BaseEntity.RootPath()+"assets/"), dest...)
+		}
 		return dest
 	}
 
 	linkBase := util.StrToBytes(r.Options.LinkBase)
-	if !bytes.HasSuffix(linkBase, []byte("/")) {
-		linkBase = append(linkBase, []byte("/")...)
+	// if !bytes.HasSuffix(linkBase, []byte("/")) {
+	// 	linkBase = append(linkBase, []byte("/")...)
+	// }
+	if len(linkBase) > 0 && !bytes.HasPrefix(dest, []byte("/")) {
+		dest = append([]byte("/"), dest...)
 	}
+
 	ret := append(linkBase, dest...)
 	if bytes.Equal(linkBase, ret) {
 		return []byte("")

src/render/ocean_press_render.go

@@ -315,19 +315,19 @@ func (r *OceanPressRender) renderAudio(node *ast.Node, entering bool) ast.WalkSt
 	return ast.WalkContinue
 }
 
-// func (r *OceanPressRender) renderIFrame(node *ast.Node, entering bool) ast.WalkStatus {
-// 	if entering {
-// 		r.Tag("div", [][]string{{"class", "iframe"}}, false)
-// 		tokens := node.Tokens
-// 		if r.Options.Sanitize {
-// 			tokens = sanitize(tokens)
-// 		}
-// 		tokens = r.tagSrcPath(tokens)
-// 		r.Write(tokens)
-// 		r.Tag("/div", nil, false)
-// 	}
-// 	return ast.WalkContinue
-// }
+func (r *OceanPressRender) renderIFrame(node *ast.Node, entering bool) ast.WalkStatus {
+	if entering {
+		r.Tag("div", [][]string{{"class", "iframe"}}, false)
+		tokens := node.Tokens
+		if r.Options.Sanitize {
+			tokens = sanitize(tokens)
+		}
+		tokens = r.tagSrcPath(tokens)
+		r.Write(tokens)
+		r.Tag("/div", nil, false)
+	}
+	return ast.WalkContinue
+}
 
 // func (r *OceanPressRender) Render() (output []byte) {
 // 	output = r.BaseRenderer.Render()

src/render/ocean_press_render_custom.go

@@ -5,16 +5,13 @@ import (
 	"errors"
 	"html/template"
 	"path"
-	"regexp"
 	"strconv"
 	"strings"
 	"time"
 
-	"github.com/88250/lute"
 	"github.com/88250/lute/ast"
 	"github.com/88250/lute/html"
 	"github.com/88250/lute/lex"
-	"github.com/88250/lute/parse"
 	"github.com/88250/lute/render"
 	luteUtil "github.com/88250/lute/util"
 	"github.com/siyuan-note/oceanpress/src/conf"
@@ -25,9 +22,11 @@ import (
 func (r *OceanPressRender) Render() (html string, xml string) {
 	docName := r.context.BaseEntity.Name
 	// 调试用，跳过无关文档,免得浪费时间
-	if conf.IsDev && !strings.Contains(docName, "8月") {
+	if conf.IsDev && !strings.Contains(docName, "小心的使用") {
 		return "", ""
 	}
+	BaseLinkOcean[r.Tree.ID] = r
+
 	output := r.BaseRenderer.Render()
 	output = append(output, r.RenderFootnotes()...)
 
@@ -42,8 +41,12 @@ func (r *OceanPressRender) Render() (html string, xml string) {
 		WHERE
 			def_block_id = /** 被引用块的 id */
 			'` + curID + `'
-			AND /** 当前文档内对当前文档的引用不显示在反链中 */
-			"blocks".root_id != '` + curID + `';`
+		AND NOT /** 当前文档内对当前文档的引用不显示在反链中 */
+			"blocks".root_id = '` + curID + `'
+		`
+	if conf.RssNoOutputHtml {
+		sql += `AND NOT "blocks".hpath LIKE '%.rss.xml'`
+	}
 	// 底部反链
 	content := r.SqlRender(sql, false, true)
 	if len(content) > 0 {
@@ -177,12 +180,6 @@ func (r *OceanPressRender) renderNodeToHTML(node *ast.Node, headerIncludes bool)
 		return ast.WalkSkipChildren
 	})
 
-	// 渲染块
-	root := &ast.Node{Type: ast.NodeDocument}
-	luteEngine := lute.New()
-	tree := &parse.Tree{Root: root, Context: &parse.Context{ParseOption: luteEngine.ParseOptions}}
-	tree.Context.ParseOption.KramdownBlockIAL = false // 关闭 IAL
-
 	if node.ID != "" {
 		err := r.context.push(node.ID)
 		if err != nil {
@@ -192,7 +189,7 @@ func (r *OceanPressRender) renderNodeToHTML(node *ast.Node, headerIncludes bool)
 		}
 	}
 
-	renderer := NewOceanPressRenderer(tree, (*Options)(luteEngine.RenderOptions), r.context)
+	renderer := NewOceanPressRenderer(r.Tree, (*Options)(r.context.LuteEngine.RenderOptions), r.context)
 	// renderer2 := render.NewFormatRenderer(tree, luteEngine.RenderOptions)
 	renderer.Writer = &bytes.Buffer{}
 	// renderer.NodeWriterStack = append(renderer.NodeWriterStack, renderer.Writer) // 因为有可能不是从 root 开始渲染，所以需要初始化
@@ -410,29 +407,36 @@ func (r *OceanPressRender) renderDocument(node *ast.Node, entering bool) ast.Wal
 	return ast.WalkContinue
 }
 
-func (r *OceanPressRender) renderIFrame(node *ast.Node, entering bool) ast.WalkStatus {
-	if entering {
-		attr := [][]string{{"class", "iframe"}}
-		attr = append(attr, node.KramdownIAL...)
-		r.Tag("div", attr, false)
-		tokens := node.Tokens
-		if r.Options.Sanitize {
-			tokens = sanitize(tokens)
-		}
-		data := (string(tokens))
+// ========= 附加在 OceanPressRender 上的工具方法
+// 重写baserender的RelativePath
+func (r *OceanPressRender) RelativePath(dest []byte) []byte {
+	// r.		// monkey patch 挂件块的绝对路径改成相对路径
+	// reg, _ := regexp.Compile("src=\"/widgets/")
+	// str := reg.ReplaceAllString(data, "src=\""+r.context.BaseEntity.RootPath()+"widgets/")
 
-		// monkey patch 挂件块的绝对路径改成相对路径
-		reg, _ := regexp.Compile("src=\"/widgets/")
-		str := reg.ReplaceAllString(data, "src=\""+r.context.BaseEntity.RootPath()+"widgets/")
+	// tokens = r.tagSrcPath([]byte(str))
 
-		tokens = r.tagSrcPath([]byte(str))
-		r.Write(tokens)
-		r.Tag("/div", nil, false)
+	if "" == r.Options.LinkBase {
+		return dest
 	}
-	return ast.WalkContinue
+
+	// 强制将 %5C 即反斜杠 \ 转换为斜杠 / 以兼容 Windows 平台上使用的路径
+	dest = bytes.ReplaceAll(dest, []byte("%5C"), []byte("\\"))
+	if !r.isRelativePath(dest) {
+		return dest
+	}
+
+	linkBase := luteUtil.StrToBytes(r.Options.LinkBase)
+	if !bytes.HasSuffix(linkBase, []byte("/")) {
+		linkBase = append(linkBase, []byte("/")...)
+	}
+	ret := append(linkBase, dest...)
+	if bytes.Equal(linkBase, ret) {
+		return []byte("")
+	}
+	return ret
 }
 
-// ========= 附加在 OceanPressRender 上的工具方法
 // pushTopRefId 将 RenderLevel==0 的 id 添加到 topRefId
 func (r *OceanPressRender) pushTopRefId(id string) {
 	if r.RenderLevel() == 0 {