refactor: change totally articles uris

Author: drawbu

articles/How I deploy Nix + Docker.md

@@ -1,6 +1,7 @@
 ---
 title: How I deploy Nix + Docker
 date: 2024-06-09
+uri: deploy-nix-docker
 ---
 
 Hello everyone :)

articles/Install NixOS on Contabo server.md

@@ -1,6 +1,7 @@
 ---
 title: How to install NixOS on a Contabo Server
 date: 2023-08-02
+uri: install-nixos-contabo-vps
 ---
 
 In this guide, we'll see how to setup NixOS on a Ubuntu 22.04 Contabo VPS.

articles/Server block Ubuntu + Nginx + systemd.md

@@ -1,6 +1,7 @@
 ---
 title: How to setup a server block with Nginx + systemd on Ubuntu with HTTPS
 date: 2023-05-02
+uri: server-block-nginx-systemd-ubuntu-https
 ---
 
 In this guide, we are going to use the keyword for you to replace. There will be `REPOSITORY ` and `DOMAIN_NAME` to replace.

pkg/routes/blog/article.go

@@ -0,0 +1,97 @@
+package blog
+
+import (
+	"bytes"
+	"fmt"
+	"io/fs"
+	"net/url"
+	"strings"
+	"time"
+
+	chroma "github.com/alecthomas/chroma/v2/formatters/html"
+	"github.com/charmbracelet/log"
+	"github.com/yuin/goldmark"
+	highlighting "github.com/yuin/goldmark-highlighting/v2"
+	meta "github.com/yuin/goldmark-meta"
+	mdParser "github.com/yuin/goldmark/parser"
+)
+
+type article struct {
+	Title   string
+	Date    time.Time
+	Content []byte
+	Uri     string
+}
+
+// TODO: Add metadata validation
+
+func NewArticle(file fs.File) (*article, error) {
+
+	var buf bytes.Buffer
+	context, err := fileToMarkdown(file, &buf)
+	if err != nil {
+		return nil, fmt.Errorf("Could not convert to markdown: %s", err)
+	}
+
+	metadata := meta.Get(context)
+
+	date, err := time.Parse("2006-01-02", metadata["date"].(string))
+	if err != nil {
+		return nil, fmt.Errorf("Could not parse as date : %s", err)
+	}
+
+	uri, err := makeArticleUri(date, metadata)
+	if err != nil {
+		return nil, fmt.Errorf("Could make article uri: %s", err)
+	}
+
+	return &article{
+		Title:   metadata["title"].(string),
+		Date:    date,
+		Content: buf.Bytes(),
+		Uri: uri,
+	}, nil
+}
+
+func fileToMarkdown(file fs.File, buf *bytes.Buffer) (mdParser.Context, error) {
+	info, err := file.Stat()
+	if err != nil {
+		return nil, fmt.Errorf("Error getting file info: %s", err)
+	}
+	log.Info("Opening new article", "name", info.Name)
+
+	content := make([]byte, info.Size())
+	if _, err = file.Read(content); err != nil {
+		return nil, fmt.Errorf("Could not read file: %s", err)
+	}
+
+	markdown := goldmark.New(
+		goldmark.WithExtensions(
+			highlighting.NewHighlighting(
+				highlighting.WithStyle("catppuccin-mocha"),
+				highlighting.WithFormatOptions(chroma.WithLineNumbers(true)),
+			),
+			meta.Meta,
+		),
+	)
+	context := mdParser.NewContext()
+	if err = markdown.Convert(content, buf, mdParser.WithContext(context)); err != nil {
+		return nil, fmt.Errorf("Could not converting file to markdown: %s", err)
+	}
+	return context, nil
+}
+
+func makeArticleUri(date time.Time, metadata map[string]any) (string, error) {
+
+	metaUri := metadata["uri"].(string)
+
+	if metaUri == "" {
+		metaTitle := metadata["title"].(string)
+		if metaTitle == "" {
+			return "", fmt.Errorf("Either one of 'uri' or 'title' needs to be set")
+		}
+		metaUri = url.QueryEscape(strings.ReplaceAll(strings.ToLower(metaTitle), " ", "-"))
+	}
+
+	return fmt.Sprintf("%s/%s", date.Format("2006/01"), metaUri), nil
+}

pkg/routes/blog/blog.go

@@ -1,41 +1,28 @@
 package blog
 
 import (
-	"bytes"
 	"errors"
 	"io/fs"
 	"net/http"
 	"net/url"
 	"sort"
 	"strings"
-	"time"
 
 	"app/articles"
 	"app/pkg/app"
 
 	"github.com/a-h/templ"
-	chroma "github.com/alecthomas/chroma/v2/formatters/html"
 	"github.com/charmbracelet/log"
-	"github.com/yuin/goldmark"
-	highlighting "github.com/yuin/goldmark-highlighting/v2"
-	meta "github.com/yuin/goldmark-meta"
-	"github.com/yuin/goldmark/parser"
 )
 
 var Articles = make(map[string]article)
 
 func init() {
 	for _, a := range getArticles(articles.Articles) {
-		Articles[a.Title] = a
+		Articles[a.Uri] = a
 	}
 }
 
-type article struct {
-	Title   string
-	Date    time.Time
-	Content []byte
-}
-
 func Handler(serv *app.Server, w http.ResponseWriter, r *http.Request) (templ.Component, error) {
 	article_name, err := url.PathUnescape(r.PathValue("article"))
 	if err != nil || article_name == "" {
@@ -82,45 +69,10 @@ func getArticles(filesystem fs.ReadDirFS) []article {
 			log.Warn("Error opening file:", "reason", err)
 			continue
 		}
-		a, err := parseMarkdownArticle(file)
+		a, err := NewArticle(file)
 		if err == nil || a != nil {
 			result = append(result, *a)
 		}
 	}
 	return result
 }
-
-func parseMarkdownArticle(file fs.File) (*article, error) {
-	info, err := file.Stat()
-	if err != nil {
-		log.Warn("Error getting file info:", "reason", err)
-		return nil, err
-	}
-	content := make([]byte, info.Size())
-	if _, err = file.Read(content); err != nil {
-		return nil, err
-	}
-
-	markdown := goldmark.New(
-		goldmark.WithExtensions(
-			highlighting.NewHighlighting(
-				highlighting.WithStyle("catppuccin-mocha"),
-				highlighting.WithFormatOptions(chroma.WithLineNumbers(true)),
-			),
-			meta.Meta,
-		),
-	)
-	var buf bytes.Buffer
-	context := parser.NewContext()
-	if err = markdown.Convert(content, &buf, parser.WithContext(context)); err != nil {
-		return nil, err
-	}
-
-	metaData := meta.Get(context)
-	date, err := time.Parse("2006-01-02", metaData["date"].(string))
-	return &article{
-		Title:   metaData["title"].(string),
-		Date:    date,
-		Content: buf.Bytes(),
-	}, nil
-}

pkg/routes/blog/blog.templ

@@ -7,7 +7,7 @@ templ blog(articles []article) {
 			for _, article := range articles {
 				<li>
 					<span class="mr-2">{ article.Date.Format("2006-01-02") }</span>
-					<a href={ templ.SafeURL("/blog/" + article.Title) }>{ article.Title }</a>
+					<a href={ templ.SafeURL("/blog/" + article.Uri) }>{ article.Title }</a>
 				</li>
 			}
 		</ul>