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.
-
+
LOL
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.
-
+
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.
@@ -43,6 +59,25 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis ligula vel n
LOL
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.
+
LOL
+
+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.
+
+
+
+
+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.
+
+
LOL
+
+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.
+
+
+
+
+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.
+
+
`
page = Page{
PageHeader: PageHeader{
diff --git a/internal/components/page/page.go b/internal/components/page/page.go
new file mode 100644
index 0000000..245b0e7
--- /dev/null
+++ b/internal/components/page/page.go
@@ -0,0 +1,88 @@
+package page
+
+import (
+ "bytes"
+ "compress/flate"
+ "context"
+ "encoding/base64"
+ "errors"
+ "fmt"
+ "log/slog"
+ "regexp"
+ "strings"
+
+ "git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/images"
+ "git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/translate"
+ "github.com/studio-b12/gowebdav"
+)
+
+var titleRGX = regexp.MustCompile(`(?m)^#\s+(.+)$`)
+
+var (
+ ErrMalFormedInput = errors.New("mal formed input")
+ ErrNotFound = errors.New("not found")
+)
+
+func (s *Service) getPageHeaders(ctx context.Context, uid string) (page PageHeader, err error) {
+ info, err := s.fs.ReadDir(uid)
+ if gowebdav.IsErrNotFound(err) { // try private
+ err = ErrNotFound
+ }
+ if err != nil {
+ return
+ }
+
+ lang := translate.Language(ctx)
+
+ var coverImage *gowebdav.File
+ var contentMD *gowebdav.File
+
+ for _, f := range info {
+ file := f.(gowebdav.File)
+
+ if strings.HasPrefix(file.ContentType(), "image/") {
+ coverImage = &file
+ }
+
+ parts := strings.Split(file.Name(), ".")
+
+ // fallback content
+ if contentMD == nil && len(parts) == 2 && parts[1] == "md" {
+ contentMD = &file
+ }
+ // language content
+ if len(parts) == 3 && parts[1] == lang && parts[2] == "md" {
+ contentMD = &file
+ }
+ }
+
+ slog.Debug("loaded page infos", "cover", coverImage, "content", contentMD)
+
+ content, err := s.fs.Read(contentMD.Path())
+ if err != nil {
+ return
+ }
+
+ title := titleRGX.FindStringSubmatch(string(content))
+ if len(title) < 2 {
+ err = fmt.Errorf("%w: no matches for title", ErrMalFormedInput)
+ return
+ }
+
+ page.UID = uid
+ page.Title = title[1]
+ page.CoverImageUID, err = images.UIDFromPath(coverImage.Path())
+
+ 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())
+}
diff --git a/internal/components/page/resource.go b/internal/components/page/resource.go
index 75055ea..63f2bc6 100644
--- a/internal/components/page/resource.go
+++ b/internal/components/page/resource.go
@@ -1,7 +1,23 @@
package page
-type Service struct{}
+import (
+ "log/slog"
-func New() *Service {
- return &Service{}
+ "github.com/studio-b12/gowebdav"
+)
+
+type Service struct {
+ fs *gowebdav.Client
+}
+
+func New(fs *gowebdav.Client) *Service {
+ info, err := fs.ReadDir("/")
+ if err != nil {
+ slog.Error("could not read dir", "err", err)
+ }
+
+ slog.Info("file info", "info", info)
+ return &Service{
+ fs: fs,
+ }
}
diff --git a/internal/handlers/handlehome/controller.go b/internal/handlers/handlehome/controller.go
index 569b78a..87d3210 100644
--- a/internal/handlers/handlehome/controller.go
+++ b/internal/handlers/handlehome/controller.go
@@ -8,7 +8,7 @@ import (
)
func (h *Handler) home(w http.ResponseWriter, r *http.Request) {
- pageHeaders, err := h.src.GetPages()
+ pageHeaders, err := h.src.GetPages(r.Context())
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
return
diff --git a/internal/handlers/handlehome/resource.go b/internal/handlers/handlehome/resource.go
index 7222737..6bb5371 100644
--- a/internal/handlers/handlehome/resource.go
+++ b/internal/handlers/handlehome/resource.go
@@ -22,6 +22,6 @@ func New(mux *http.ServeMux, srv pageService) *Handler {
}
type pageService interface {
- GetPages() ([]page.PageHeader, error)
+ GetPages(ctx context.Context) ([]page.PageHeader, error)
GetPage(ctx context.Context, uid string) (page.Page, error)
}
diff --git a/internal/server/routes.go b/internal/server/routes.go
index f9bab52..b393a3c 100644
--- a/internal/server/routes.go
+++ b/internal/server/routes.go
@@ -3,6 +3,7 @@ package server
import (
"log/slog"
"net/http"
+ "os"
"time"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/page"
@@ -10,6 +11,7 @@ import (
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/handlers/handlehome"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/templer"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/web"
+ "github.com/studio-b12/gowebdav"
)
func (s *Server) RegisterRoutes() (h http.Handler) {
@@ -24,17 +26,26 @@ func (s *Server) RegisterRoutes() (h http.Handler) {
return h
}
-func registerOther() http.Handler {
+func registerOther() (h http.Handler) {
mux := http.NewServeMux()
- pager := page.New()
+ webdavClient := gowebdav.NewClient("https://cloud.schreifuchs.ch/remote.php/dav/files/test/website", "test", os.Getenv("TEST_PW"))
+ if err := webdavClient.Connect(); err != nil {
+ slog.Error("could not connect webdavClient", "err", err, "pw", os.Getenv("TEST_PW"))
+ }
+
+ pager := page.New(webdavClient)
_ = handlehome.New(mux, pager)
mux.Handle("/", http.FileServer(http.FS(web.GetStaticFS())))
translator := translate.New()
- return translator.Middleware(mux)
+
+ h = mux
+ h = translator.Middleware(h)
+ h = cacheMiddleware(time.Second * 45)(h)
+ return h
}
func (s *Server) loggingMiddleware(next http.Handler) http.Handler {
diff --git a/internal/server/static.go b/internal/server/static.go
index df4bf2e..66fa38f 100644
--- a/internal/server/static.go
+++ b/internal/server/static.go
@@ -1,9 +1,11 @@
package server
import (
+ "fmt"
"io/fs"
"log/slog"
"net/http"
+ "time"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/web"
)
@@ -13,7 +15,7 @@ func registerStatic(mux *http.ServeMux) {
fileSystem := web.GetStaticFS()
// we still use go's fileServer to avoid unnecessary implementation
- fileServer := http.FileServer(http.FS(fileSystem))
+ fileServer := cacheMiddleware(time.Hour * 24)(http.FileServer(http.FS(fileSystem)))
err := fs.WalkDir(fileSystem, ".", func(path string, d fs.DirEntry, err error) error {
if err != nil {
@@ -36,3 +38,13 @@ func registerStatic(mux *http.ServeMux) {
panic(err)
}
}
+
+// cacheMiddleware adds Cache-Control headers to the response.
+func cacheMiddleware(maxAge time.Duration) func(next http.Handler) http.Handler {
+ return func(next http.Handler) http.Handler {
+ return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ w.Header().Set("Cache-Control", fmt.Sprintf("public, max-age=%.0f", maxAge.Seconds()))
+ next.ServeHTTP(w, r)
+ })
+ }
+}
diff --git a/tmp/build-errors.log b/tmp/build-errors.log
index 32ee03e..189b41c 100644
--- a/tmp/build-errors.log
+++ b/tmp/build-errors.log
@@ -1 +1 @@
-exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1
\ No newline at end of file
+exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1
\ No newline at end of file
diff --git a/tmp/main b/tmp/main
index 36898cd..f3d2c13 100755
Binary files a/tmp/main and b/tmp/main differ
diff --git a/web/components/imagetile.templ b/web/components/imagetile.templ
index 2e1099f..9a5d6e4 100644
--- a/web/components/imagetile.templ
+++ b/web/components/imagetile.templ
@@ -4,7 +4,7 @@ templ ImageTile(src string) {