✨feat(#6): 排除当前块的渲染

Author: 2234839

.github/workflows/build.yml

@@ -34,23 +34,14 @@ jobs:
       - name: cd build
         run: cd build && ls
 
-      - name: Deploy to GitHub Pages
-        if: success()
-        uses: crazy-max/ghaction-github-pages@v2
-        with:
-          target_branch: app-build
-          build_dir: build
-        env:
-          GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
-
       - name: chmod app
         run: chmod 777 ./build/md2website-linux-amd64
-      - name: test 2
-        run: ls
+
       - name: build doc
         run: ./build/md2website-linux-amd64 "./test-doc" "./outHTML" "./src/views/" ""
-      - name: test 3
-        run: ls
+
+      - name: zip views
+        run: zip -q -r ./build/views.zip ./src/views/
 
       - name: Deploy to GitHub Pages
         if: success()

.gitignore

@@ -23,4 +23,6 @@ mac_md2website
 __debug_bin
 
 
-outHTML
+outHTML
+
+docHTML

.vscode/launch.json

@@ -11,18 +11,18 @@
             "mode": "auto",
             "program": "${workspaceFolder}/src/",
             "env": {},
+            "args": [
+                "D:\\code\\doc\\doc",
+                "../docHTML/",
+                "./views/",
+                "C:/Users/llej/AppData/Local/Temp/siyuan/siyuan.db",
+            ],
             // "args": [
-            //     "D:\\code\\doc\\doc",
+            //     "../test-doc/",
             //     "../outHTML/",
             //     "./views/",
             //     "C:/Users/llej/AppData/Local/Temp/siyuan/siyuan.db",
-            // ],
-            "args": [
-                "../test-doc/",
-                "../outHTML/",
-                "./views/",
-                "C:/Users/llej/AppData/Local/Temp/siyuan/siyuan.db",
-            ]
+            // ]
         }
     ]
 }

src/fileEntity.go

@@ -41,7 +41,7 @@ func FileToFileEntity(path string, info os.FileInfo) FileEntity {
 		virtualPath = FilePathToWebPath(relativePath)
 		mdByte, err := ioutil.ReadFile(path)
 		if err != nil {
-			util.Log("读取文件失败", err)
+			util.Warn("读取文件失败", err)
 		}
 		mdStr = string(mdByte)
 		mdStructInfo = GetMdStructInfo("", mdStr)
@@ -88,4 +88,3 @@ func FindFileEntityFromID(id string) (FileEntity, MdStructInfo, error) {
 	}
 	return fileEntity, mdInfo, nil
 }
-

src/luteEngine.go

@@ -135,10 +135,13 @@ func init() {
 			sql := n.TokensStr()
 			ids := db.SQLToID(sql)
 
+			curID := getNodeRelativeBlockID(n)
+
 			for _, id := range ids {
-				// if id == baseEntity. {
-				// 	continue
-				// }
+				if id == curID {
+					// 派除当前块，查询出自身并不方便阅读
+					continue
+				}
 
 				fileEntity, mdInfo, err := FindFileEntityFromID(id)
 				if err != nil {
@@ -199,9 +202,10 @@ func GetMdStructInfo(name string, md string) []MdStructInfo {
 		}
 		content := renderBlockMarkdown(n)
 		if strings.Contains(n.Text(), "岁，一事无成，未来还有希望吗？") {
-			var id = n.IALAttr("id")
-			util.Log(id)
-			util.Log(22)
+			// 这里有一个 bug 待 lute 修复
+			// var id = n.IALAttr("id")
+			// util.Log(id)
+			// util.Log(22)
 		}
 		infoList = append(infoList, MdStructInfo{
 			blockID:   n.IALAttr("id"),
@@ -307,3 +311,22 @@ func headingChildren(heading *ast.Node) (ret []*ast.Node) {
 	ret = append(ret, blocks...)
 	return
 }
+
+// 获取和 node 最相关的 block ID,从node 一直往他的父级找
+func getNodeRelativeBlockID(node *ast.Node) string {
+	curID := node.IALAttr("id")
+	cursor := node
+	for true {
+		if curID != "" {
+			break
+		} else {
+			if cursor.Parent != nil {
+				cursor = cursor.Parent
+				curID = cursor.IALAttr("id")
+			} else {
+				break
+			}
+		}
+	}
+	return curID
+}

src/main.go

@@ -13,8 +13,6 @@ import (
 )
 
 func main() {
-
-
 	util.RunningLog("0", "=== 🛬 开始转换 🛫 ===")
 	// 流程 1  用户输入 {源目录 输出目录}
 	util.RunningLog("1", "用户输入")
@@ -23,6 +21,7 @@ func main() {
 	util.RunningLog("1.1", "sourceDir:"+sourceDir)
 	util.RunningLog("1.2", "outDir:"+outDir)
 	util.RunningLog("1.3", "viewsDir:"+TemplateDir)
+	util.RunningLog("1.4", "dbPath:"+SqlitePath)
 
 	// 流程 2  copy 源目录中资源文件至输出目录
 	util.RunningLog("2", "copy 资源到 outDir")