Merge pull request #5 from ChaosNyaruko/todo

MDX adapted CSS loading supported
ChaosNyaruko · Dec 3, 2023 · 0ad299c · 0ad299c
2 parents 1a9968c + baacec2
commit 0ad299c
Show file tree

Hide file tree

Showing 17 changed files with 1,337 additions and 748 deletions.
diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml
@@ -0,0 +1,19 @@
+name: GitHub Actions Demo
+run-name: ${{ github.actor }} is testing out GitHub Actions 🚀
+on: [push]
+jobs:
+  Explore-GitHub-Actions:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
+      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
+      - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
+      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
+      - name: List files in the repository
+        run: |
+          ls ${{ github.workspace }}
+      - run: echo "🍏 This job's status is ${{ job.status }}."
+
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -0,0 +1,28 @@
+# This workflow will build a golang project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
+
+name: Go
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.20'
+
+    - name: Build
+      run: go build -v ./...
+
+    - name: Test
+      run: go test -v ./...
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /tmp
 mdict_parser
 .DS_Store
+.luarc.json
diff --git a/config.go b/config.go
@@ -26,7 +26,8 @@ func loadConfig() error { // TODO: more configurations, such as default engine.
 	if len(c.Dicts) == 0 {
 		return nil
 	}
-	ldoceMdx = c.Dicts[0] + ".json"
-	log.Printf("get dicts: %v", ldoceMdx)
+	globalDict.mdxFile = c.Dicts[0] + ".json"
+	globalDict.mdxCss = c.Dicts[0] + ".css"
+	log.Printf("get global dicts: %v", globalDict)
 	return nil
 }
diff --git a/index.html b/index.html
@@ -7,7 +7,7 @@
     </style>
     <body>
         <h1>
-        <form action="/dict?format=html" method="get">
+        <form action="/d/dict?format=html" method="get">
         <label for="word">Query:</label>
         <input type="text" id="name" name="query" placeholder="doctor" required/><br>
         <label for="word">Engine:</label>

diff --git a/main.go b/main.go
@@ -81,7 +81,7 @@ func main() {
 	}
 
 	if *interactive {
-		ldoceDict = loadDecodedMdx(filepath.Join(dataPath, "dicts", ldoceMdx)) // TODO(ch): lazy loading for performance?
+		globalDict.Load() // TODO(ch): lazy loading for performance?
 		startLoop()
 		return
 	}
@@ -106,7 +106,7 @@ func main() {
 			}
 		}
 		log.Printf("start a new server: %s/%s/%s/%s", network, addr, *render, *engine)
-		ldoceDict = loadDecodedMdx(filepath.Join(dataPath, "dicts", ldoceMdx)) // TODO(ch): lazy loading for performance?
+		globalDict.Load()
 		l, err := net.Listen(network, addr)
 		if err != nil {
 			log.Fatal("bad Listen: ", err)
@@ -208,7 +208,7 @@ func main() {
 
 	if *engine == "mdx" {
 		// io.Copy(os.Stdout, fd)
-		ldoceDict = loadDecodedMdx(filepath.Join(dataPath, "dicts", ldoceMdx)) // TODO(ch): lazy loading for performance?
+		globalDict.Load()
 		fmt.Println(queryMDX(*word, *render))
 		return
 	}

diff --git a/mdx.go b/mdx.go
@@ -6,26 +6,42 @@ import (
 	"io"
 	"log"
 	"os"
+	"path/filepath"
 	"strings"
 
 	"golang.org/x/net/html"
 )
 
-var (
-	// ldoceMdx = "Longman Dictionary of Contemporary English" + ".json"
-	// ldoceMdx = "ODE_zh" + ".json"
-	ldoceMdx  = "oald9" + ".json"
-	ldoceDict map[string]string
-)
+type MdxDict struct {
+	// For personal usage, "oald9.json", or "Longman Dictionary of Contemporary English"
+	mdxFile string
+	// Only match the mdx with the same mdxFile name
+	mdxCss  string
+	mdxDict map[string]string
+}
+
+func (g *MdxDict) Load() error {
+	g.mdxDict = loadDecodedMdx(filepath.Join(dataPath, "dicts", g.mdxFile))
+	if contents, err := os.ReadFile((filepath.Join(dataPath, "dicts", g.mdxCss))); err == nil {
+		g.mdxCss = string(contents)
+	} else {
+		g.mdxCss = ""
+		log.Printf("load dicts[%v] css err: %v", g.mdxFile, err)
+	}
+	return nil
+}
+
+// TODO: support multiple mdx lib at the same time.
+var globalDict MdxDict
 
 var gbold = "**"
 var gitalic = "*"
 
 func queryMDX(word string, f string) string {
 	if f == "html" {
-		return ldoceDict[word]
+		return globalDict.mdxDict[word]
 	}
-	fd := strings.NewReader(ldoceDict[word]) // TODO: find a "close" one when missing?
+	fd := strings.NewReader(globalDict.mdxDict[word]) // TODO: find a "close" one when missing?
 	return parseMDX(fd, f)
 }
 

diff --git a/mdx_test.go b/mdx_test.go
@@ -26,7 +26,7 @@ func Test_GetWords(t *testing.T) {
 			dfs(c, level+1, n)
 		}
 	}
-	fd, err := os.Open("./tmp/ldoce5.html")
+	fd, err := os.Open("./testdata/ldoce5.html")
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -41,8 +41,8 @@ func Test_GetWords(t *testing.T) {
 }
 
 func Test_MDXParser(t *testing.T) {
-	// fd, err := os.Open("./tmp/test.html")
-	fd, err := os.Open("./tmp/doctor_mdx.html")
+	// fd, err := os.Open("./testdata/test.html")
+	fd, err := os.Open("./testdata/doctor_mdx.html")
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -52,5 +52,5 @@ func Test_MDXParser(t *testing.T) {
 		log.Fatal(err)
 	}
 	// log.Printf("result: %v", readText(doc))
-	t.Logf("res: %v", format([]string{f(doc, 0, nil)}))
+	t.Logf("res: %v", format([]string{f(doc, 0, nil, "md")}))
 }