refactor: server routing

taking advantage of improvement of server routing from go 1.22
https://go.dev/blog/routing-enhancements

main.go

@@ -16,13 +16,13 @@ var (
 func main() {
 	serv := app.Server{Port: 8080, AssetsDir: assetsDir}
 
-	serv.AddRoute("/", homepage.Handler)
+	serv.AddRoute("GET /", homepage.Handler)
 	blog := blog.Handler{}
 	go blog.FetchArticles()
-	serv.AddRoute("/blog/{article...}", blog.Render)
-	serv.AddRoute("/contact", contact.Handler)
-	serv.AddRoute("/resume", resume.Handler)
-	serv.ServeRoute("/assets/", "/assets/")
+	serv.AddRoute("GET /blog/{article...}", blog.Render)
+	serv.AddRoute("GET /contact", contact.Handler)
+	serv.AddRoute("GET /resume", resume.Handler)
+	serv.ServeRoute("GET /assets/", "/assets/")
 
 	serv.Run()
 }

pkg/routes/blog/blog.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"net/url"
 	"os"
 	"os/exec"
 	"strings"
@@ -27,16 +28,16 @@ type article struct {
 	Title   string
 	Date    string
 	Path    string
-	URI     string
 	Content []byte
 }
 
 func (h *Handler) Render(serv *app.Server, w http.ResponseWriter, r *http.Request) error {
-	if r.URL.Path == "/blog" || r.URL.Path == "/blog/" {
+	article_name, err := url.PathUnescape(r.PathValue("article"))
+    if err != nil || article_name == "" {
 		return components.Template(blog(h.Articles)).Render(context.Background(), w)
 	}
 
-	a, err := findArticle(h.Articles, r.URL.Path)
+	a, err := findArticle(h.Articles, "/" + article_name)
 	if err != nil {
 		return err
 	}
@@ -60,7 +61,7 @@ func (h *Handler) fetch() {
 			return
 		}
 		h.RepoPath = path
-		h.Articles = getArticles(h.RepoPath, h.RepoPath)
+		h.Articles = getArticles("", h.RepoPath)
 		return
 	}
 
@@ -76,7 +77,7 @@ func (h *Handler) fetch() {
 
 func findArticle(articles []article, path string) (article, error) {
 	for _, a := range articles {
-		if a.URI == path {
+		if a.Path == path {
 			return a, nil
 		}
 	}
@@ -114,8 +115,9 @@ func cloneRepo(repo string) (string, error) {
 	return dirname, nil
 }
 
-func getArticles(path string, basepath string) []article {
-	entries, err := os.ReadDir(path)
+func getArticles(path string, repo_path string) []article {
+    fullpath := repo_path + "/" + path
+	entries, err := os.ReadDir(fullpath)
 	if err != nil {
 		return []article{}
 	}
@@ -127,20 +129,22 @@ func getArticles(path string, basepath string) []article {
 		}
 
 		if entry.IsDir() {
-			articles = append(articles, getArticles(path+"/"+entry.Name(), basepath)...)
+			articles = append(articles, getArticles(path+"/"+entry.Name(), repo_path)...)
 			continue
 		}
 		if strings.HasSuffix(entry.Name(), ".md") {
 			name := strings.TrimSuffix(entry.Name(), ".md")
-			uri := "/blog" + strings.TrimPrefix(path, basepath) + "/" + name
-			filepath := path + "/" + entry.Name()
-			articles = append(articles, article{Title: name, Path: filepath, URI: uri, Content: getContent(filepath)})
+			articles = append(articles, article{
+				Title: name,
+                Path: path + "/" + name,
+                Content: parseMarkdownArticle(fullpath + "/" + entry.Name()),
+            })
 		}
 	}
 	return articles
 }
 
-func getContent(path string) []byte {
+func parseMarkdownArticle(path string) []byte {
 	file, err := os.ReadFile(path)
 	if err != nil {
 		return []byte{}

pkg/routes/blog/blog.templ

@@ -6,7 +6,7 @@ templ blog(articles []article) {
 		<ul>
 			for _, article := range articles {
 				<li>
-					<a href={ templ.URL(article.URI) }>{ article.Title }</a>
+					<a href={ "/blog/" + templ.URL(article.Path) }>{ article.Title }</a>
 				</li>
 			}
 		</ul>