schreifuchs/schreifuchs.ch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: page content

Browse Source
This commit is contained in:
schreifuchs
2026-03-02 15:40:42 +01:00
parent 19b9532f21
commit c3af7a1b35
16 changed files with 120 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/components/images/controller.go
+1 -1
View File
@@ -24,7 +24,7 @@ var ErrNotAnImage = errors.New("not an image")
func (s *Service) getMime(path string) (mimeType string, err error) {
info, err := s.fs.Stat(path)
if err != nil {
err = fmt.Errorf("image file info could not be fetched")
err = fmt.Errorf("image file info could not be fetched: %w", err)
}
if mimer, ok := info.(interface{ ContentType() string }); ok {
internal/components/images/uid.go → internal/components/images/helpers.go
+21
View File
@@ -4,7 +4,9 @@ import (
"bytes"
"compress/flate"
"encoding/base64"
"fmt"
"io"
"strings"
)
func UIDFromPath(path string) (uid string, err error) {
@@ -24,6 +26,12 @@ func UIDFromPath(path string) (uid string, err error) {
return base64.RawURLEncoding.EncodeToString(b.Bytes()), nil
}
func URLFromPath(path string) (url string, err error) {
uid, err := UIDFromPath(path)
url = "/images/" + uid
return
}
func PathFromUID(uid string) (string, error) {
// 1. Decode the Base64 string back to compressed bytes
compressedBytes, err := base64.RawURLEncoding.DecodeString(uid)
@@ -45,3 +53,16 @@ func PathFromUID(uid string) (string, error) {
return out.String(), nil
}
func SourceSet(src string) string {
sb := strings.Builder{}
for i := range 19 {
sb.WriteString(fmt.Sprintf("%s?w=%d %dw, ", src, 100*(i+1), 100*(i+1)))
}
i := 20
sb.WriteString(fmt.Sprintf("%s?w=%d %dw", src, 100*(i+1), 100*(i+1)))
return sb.String()
}
internal/components/page/controller.go
+10 -42
View File
@@ -10,6 +10,7 @@ type PageHeader struct {
UID string
Title string
CoverImageUID string
md []byte // markdown of the page //markdown of the page
}
type Page struct {
@@ -41,51 +42,18 @@ func (s *Service) GetPages(ctx context.Context) (pages []PageHeader, err error)
func (s *Service) GetPage(ctx context.Context, uid string) (page Page, err error) {
p, err := s.getPageHeaders(ctx, uid)
slog.Debug("got page", "page", p, "err", err)
content := `
<h1>LOL</h1>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis ligula vel nisl pellentesque aliquet. Maecenas eu congue tortor. Nunc mattis ligula vel augue viverra cursus. Suspendisse potenti. Vivamus in risus vitae mi molestie feugiat. Cras sapien tortor, elementum ut tempus vel, commodo at dui. In hac habitasse platea dictumst. Integer nec ullamcorper purus, tincidunt elementum felis. Duis hendrerit tempor vestibulum. Nunc ut finibus tellus. Donec eu lacus sit amet sem suscipit imperdiet. Quisque cursus vulputate sodales. In sit amet nisl a est lacinia sagittis. </p>
<img fetchpriority="low" loading="lazy" src="https://picsum.photos/500/1000">
<h2>LOL</h2>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis ligula vel nisl pellentesque aliquet. Maecenas eu congue tortor. Nunc mattis ligula vel augue viverra cursus. Suspendisse potenti. Vivamus in risus vitae mi molestie feugiat. Cras sapien tortor, elementum ut tempus vel, commodo at dui. In hac habitasse platea dictumst. Integer nec ullamcorper purus, tincidunt elementum felis. Duis hendrerit tempor vestibulum. Nunc ut finibus tellus. Donec eu lacus sit amet sem suscipit imperdiet. Quisque cursus vulputate sodales. In sit amet nisl a est lacinia sagittis. </p>
if err != nil {
return
}
<img fetchpriority="low" loading="lazy" src="https://picsum.photos/600/500">
html, err := s.getHTML(ctx, p)
if err != nil {
return
}
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis ligula vel nisl pellentesque aliquet. Maecenas eu congue tortor. Nunc mattis ligula vel augue viverra cursus. Suspendisse potenti. Vivamus in risus vitae mi molestie feugiat. Cras sapien tortor, elementum ut tempus vel, commodo at dui. In hac habitasse platea dictumst. Integer nec ullamcorper purus, tincidunt elementum felis. Duis hendrerit tempor vestibulum. Nunc ut finibus tellus. Donec eu lacus sit amet sem suscipit imperdiet. Quisque cursus vulputate sodales. In sit amet nisl a est lacinia sagittis. </p>
<h3>LOL</h3>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis ligula vel nisl pellentesque aliquet. Maecenas eu congue tortor. Nunc mattis ligula vel augue viverra cursus. Suspendisse potenti. Vivamus in risus vitae mi molestie feugiat. Cras sapien tortor, elementum ut tempus vel, commodo at dui. In hac habitasse platea dictumst. Integer nec ullamcorper purus, tincidunt elementum felis. Duis hendrerit tempor vestibulum. Nunc ut finibus tellus. Donec eu lacus sit amet sem suscipit imperdiet. Quisque cursus vulputate sodales. In sit amet nisl a est lacinia sagittis. </p>
<h2>LOL</h2>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis ligula vel nisl pellentesque aliquet. Maecenas eu congue tortor. Nunc mattis ligula vel augue viverra cursus. Suspendisse potenti. Vivamus in risus vitae mi molestie feugiat. Cras sapien tortor, elementum ut tempus vel, commodo at dui. In hac habitasse platea dictumst. Integer nec ullamcorper purus, tincidunt elementum felis. Duis hendrerit tempor vestibulum. Nunc ut finibus tellus. Donec eu lacus sit amet sem suscipit imperdiet. Quisque cursus vulputate sodales. In sit amet nisl a est lacinia sagittis. </p>
<img fetchpriority="low" loading="lazy" src="https://picsum.photos/601/500">
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis ligula vel nisl pellentesque aliquet. Maecenas eu congue tortor. Nunc mattis ligula vel augue viverra cursus. Suspendisse potenti. Vivamus in risus vitae mi molestie feugiat. Cras sapien tortor, elementum ut tempus vel, commodo at dui. In hac habitasse platea dictumst. Integer nec ullamcorper purus, tincidunt elementum felis. Duis hendrerit tempor vestibulum. Nunc ut finibus tellus. Donec eu lacus sit amet sem suscipit imperdiet. Quisque cursus vulputate sodales. In sit amet nisl a est lacinia sagittis. </p>
<h2>LOL</h2>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis ligula vel nisl pellentesque aliquet. Maecenas eu congue tortor. Nunc mattis ligula vel augue viverra cursus. Suspendisse potenti. Vivamus in risus vitae mi molestie feugiat. Cras sapien tortor, elementum ut tempus vel, commodo at dui. In hac habitasse platea dictumst. Integer nec ullamcorper purus, tincidunt elementum felis. Duis hendrerit tempor vestibulum. Nunc ut finibus tellus. Donec eu lacus sit amet sem suscipit imperdiet. Quisque cursus vulputate sodales. In sit amet nisl a est lacinia sagittis. </p>
<img fetchpriority="low" loading="lazy" src="https://picsum.photos/500/500">
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis ligula vel nisl pellentesque aliquet. Maecenas eu congue tortor. Nunc mattis ligula vel augue viverra cursus. Suspendisse potenti. Vivamus in risus vitae mi molestie feugiat. Cras sapien tortor, elementum ut tempus vel, commodo at dui. In hac habitasse platea dictumst. Integer nec ullamcorper purus, tincidunt elementum felis. Duis hendrerit tempor vestibulum. Nunc ut finibus tellus. Donec eu lacus sit amet sem suscipit imperdiet. Quisque cursus vulputate sodales. In sit amet nisl a est lacinia sagittis. </p>
`
page = Page{
PageHeader: PageHeader{
UID: uid,
Title: "This is my page Title",
CoverImageUID: "uid",
},
Content: content,
PageHeader: p,
Content: string(html),
}
return
}
internal/components/page/html.go
+69
View File
@@ -0,0 +1,69 @@
package page
import (
"context"
"io"
"log/slog"
"net/url"
"strings"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/images"
"github.com/gomarkdown/markdown"
"github.com/gomarkdown/markdown/ast"
"github.com/gomarkdown/markdown/html"
"github.com/gomarkdown/markdown/parser"
)
func (s *Service) getHTML(ctx context.Context, page PageHeader) (out []byte, err error) {
extensions := parser.CommonExtensions | parser.AutoHeadingIDs | parser.NoEmptyLineBeforeBlock
p := parser.NewWithExtensions(extensions)
doc := p.Parse(page.md)
// create HTML renderer with extensions
htmlFlags := html.CommonFlags | html.HrefTargetBlank
opts := html.RendererOptions{
Flags: htmlFlags,
RenderNodeHook: imageMiddleware(page),
}
renderer := html.NewRenderer(opts)
out = markdown.Render(doc, renderer)
return
}
func imageMiddleware(page PageHeader) func(w io.Writer, node ast.Node, entering bool) (ast.WalkStatus, bool) {
return func(w io.Writer, node ast.Node, entering bool) (ast.WalkStatus, bool) {
if !entering {
return ast.GoToNext, false
}
img, ok := node.(*ast.Image)
if !ok {
return ast.GoToNext, false
}
src := string(img.Destination)
if strings.HasPrefix(src, ".attachments") {
imgPath, err := url.PathUnescape(src)
if err != nil {
slog.Error("could not unescape path", "err", err)
return ast.GoToNext, false
}
src, err = images.URLFromPath(page.UID + "/" + imgPath)
if err != nil {
slog.Error("could not get image url", "err", err)
return ast.GoToNext, false
}
img.Attribute = &ast.Attribute{Attrs: map[string][]byte{
"srcset": []byte(images.SourceSet(src)),
"src": []byte(src),
}}
// // img.Attrs["srcset"] =
}
img.Destination = []byte(src)
return ast.GoToNext, false
}
}
internal/components/page/page.go
+2 -16
View File
@@ -1,10 +1,7 @@
package page
import (
"bytes"
"compress/flate"
"context"
"encoding/base64"
"errors"
"fmt"
"log/slog"
@@ -62,12 +59,12 @@ func (s *Service) getPageHeaders(ctx context.Context, uid string) (page PageHead
slog.Debug("loaded page infos", "cover", coverImage, "content", contentMD)
content, err := s.fs.Read(contentMD.Path())
page.md, err = s.fs.Read(contentMD.Path())
if err != nil {
return
}
title := titleRGX.FindStringSubmatch(string(content))
title := titleRGX.FindStringSubmatch(string(page.md))
if len(title) < 2 {
err = fmt.Errorf("%w: no matches for title", ErrMalFormedInput)
return
@@ -81,14 +78,3 @@ func (s *Service) getPageHeaders(ctx context.Context, uid string) (page PageHead
return
}
func getImageUID(path string) string {
var b bytes.Buffer
// NewWriter with NoDict (nil) creates a raw DEFLATE compressor
zw, _ := flate.NewWriter(&b, flate.BestCompression)
zw.Write([]byte(path))
zw.Close() // Essential to flush the final bits
return base64.RawURLEncoding.EncodeToString(b.Bytes())
}
internal/components/translate/middleware.go
+2
View File
@@ -2,6 +2,7 @@ package translate
import (
"context"
"log/slog"
"net/http"
"strings"
)
@@ -55,6 +56,7 @@ func (s *Service) Middleware(next http.Handler) http.Handler {
targetURL += "?" + r.URL.RawQuery
}
slog.Debug("redirecting for translated url", "old", path, "new", targetURL)
http.Redirect(w, r, targetURL, http.StatusFound)
})
}