better static file management

diff --git a/app/app.go b/app/app.go
index 7016c9ef8eebc5cff42f7b09f460ab3cb2518a90..41d98c3b7597b28f0729eca50dc25933f908eb36 100644 (file)
--- a/app/app.go
+++ b/app/app.go
@@ -12,6 +12,7 @@ import (
        "os"
        "path"
        "path/filepath"
+       "slices"
        "strings"
        "sync"
        "sync/atomic"
@@ -30,8 +31,8 @@ type App struct {
 
        Logger *slog.Logger
 
-       static        map[string]http.Handler
-       explicitPages []*page.Page
+       static         map[string]http.Handler
+       nonStaticFiles []string
 
        running        atomic.Bool
        wg             sync.WaitGroup
@@ -246,7 +247,7 @@ func (app *App) Static(rootPath, rootDir string) error {
 func (app *App) Handle(expr string, handler http.Handler) {
        // Check page handlers against static
        if todayPage, ok := handler.(*page.Page); ok {
-               app.explicitPages = append(app.explicitPages, todayPage)
+               app.nonStaticFiles = append(app.nonStaticFiles, todayPage.FileDependencies()...)
        }
        app.ServeMux.Handle(expr, handler)
 }
@@ -256,26 +257,11 @@ registerStaticHandlers:
        for expr, staticHandler := range app.static {
                // If the staticHandler is a *page.Page,
                if staticPage, ok := staticHandler.(*page.Page); ok {
-                       // and the source file can be identified,
-                       var staticPath string
-                       if fopener, ok := staticPage.File().(include.FileOpener); !ok {
-                               continue
-                       } else {
-                               staticPath = fopener.FileName()
-                       }
+                       // get the static file dependencies (should just be the static file)
+                       staticFile := staticPage.FileDependencies()[0]
                        // Make sure it isn't overridden by an explicitly handled *page.Page.
-                       for _, expPage := range app.explicitPages {
-                               var expPath string
-                               if fopener, ok := expPage.File().(include.FileOpener); !ok {
-                                       continue
-                               } else {
-                                       expPath = fopener.FileName()
-                               }
-
-                               // If paths are equal, continue to the next static handler.
-                               if staticPath == expPath {
-                                       continue registerStaticHandlers
-                               }
+                       if slices.Contains(app.nonStaticFiles, staticFile) {
+                               continue registerStaticHandlers
                        }
                }
                app.Handle(expr, staticHandler)
@@ -290,6 +276,7 @@ func (app *App) initOnce() {
        }
        app.initLock.Lock()
        if app.ready.Load() {
+               app.initLock.Unlock()
                return
        }
        app.setDefaults()

diff --git a/go.mod b/go.mod
index cc559d29d9f2d1910f556eebdbf4949210f0cad7..18c43e4af5ad042ae10c3d10dbbefec9b021c3ae 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -2,4 +2,4 @@ module git.earlybird.gay/today-app
 
 go 1.22.4
 
-require git.earlybird.gay/today-engine v0.0.0-20240902192420-b42b76d1d4c5
+require git.earlybird.gay/today-engine v0.0.0-20240911045033-55d49a64189f

diff --git a/go.sum b/go.sum
index 1d27a66d0d5eb091e978cc409586a4c4fc3b94ef..6423552cb892ed8ce8a41d7554aa5680d1b1265d 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -1,2 +1,2 @@
-git.earlybird.gay/today-engine v0.0.0-20240902192420-b42b76d1d4c5 h1:I+u8fVR315zuANZKWjDCgeHtJ2aSyS3xJHts/hDhFLc=
-git.earlybird.gay/today-engine v0.0.0-20240902192420-b42b76d1d4c5/go.mod h1:9w8xpAPxs1QvT//ph/jgAuRIoWyqdi2QEifwsKWOKns=
+git.earlybird.gay/today-engine v0.0.0-20240911045033-55d49a64189f h1:vyQTIzkDUvqO3coZArw+jiERQ0xzLVjaZx6n6lIpOxQ=
+git.earlybird.gay/today-engine v0.0.0-20240911045033-55d49a64189f/go.mod h1:9w8xpAPxs1QvT//ph/jgAuRIoWyqdi2QEifwsKWOKns=