we don't want to use filepath on embedded filesystems

This commit is contained in:
2026-03-05 14:32:06 -07:00
parent 2d8f9aa005
commit d09e693035
2 changed files with 4 additions and 5 deletions
+2 -3
View File
@@ -22,7 +22,6 @@ import (
"mime"
"mime/multipart"
"net/http"
"path/filepath"
"strconv"
"strings"
@@ -70,13 +69,13 @@ func AmServeImage(c echo.Context) error {
switch components[2] {
case "builtin/":
var b []byte
b, err = static_images.ReadFile(filepath.Join("static_images", components[3]))
b, err = static_images.ReadFile(fmt.Sprintf("static_images/%s", components[3]))
if err == nil {
return c.Blob(http.StatusOK, mimeTypeFromFilename(components[3]), b)
}
case "ads/":
var b []byte
b, err = ad_banners.ReadFile(filepath.Join("adbanners", components[3]))
b, err = ad_banners.ReadFile(fmt.Sprintf("adbanners/%s", components[3]))
if err == nil {
return c.Blob(http.StatusOK, mimeTypeFromFilename(components[3]), b)
}
+2 -2
View File
@@ -13,11 +13,11 @@ package ui
import (
"bytes"
"embed"
"fmt"
"io"
"io/fs"
"net/http"
"os"
"path/filepath"
"strings"
"git.erbosoft.com/amy/amsterdam/config"
@@ -133,7 +133,7 @@ func AmLoadHTMLResource(resourceName string) (string, string, error) {
}
}
if f == nil {
f, err = static_resources.Open(filepath.Join("resources", resourceName))
f, err = static_resources.Open(fmt.Sprintf("resources/%s", resourceName))
if err != nil {
return "", "", err
}