Use embed package for binary assets instead of generated files

ui/static/static.go

@@ -0,0 +1,47 @@
+// Copyright 2021 Frédéric Guillot. All rights reserved.
+// Use of this source code is governed by the Apache 2.0
+// license that can be found in the LICENSE file.
+
+package static // import "miniflux.app/ui/static"
+
+import (
+	"crypto/sha256"
+	"embed"
+	"fmt"
+)
+
+//go:embed bin/*
+var binaryFiles embed.FS
+
+var binaryFileChecksums map[string]string
+
+func init() {
+	binaryFileChecksums = make(map[string]string)
+
+	dirEntries, err := binaryFiles.ReadDir("bin")
+	if err != nil {
+		panic(err)
+	}
+
+	for _, dirEntry := range dirEntries {
+		data, err := LoadBinaryFile(dirEntry.Name())
+		if err != nil {
+			panic(err)
+		}
+
+		binaryFileChecksums[dirEntry.Name()] = fmt.Sprintf("%x", sha256.Sum256(data))
+	}
+}
+
+// LoadBinaryFile loads an embed binary file.
+func LoadBinaryFile(filename string) ([]byte, error) {
+	return binaryFiles.ReadFile(fmt.Sprintf(`bin/%s`, filename))
+}
+
+// GetBinaryFileChecksum returns a binary file checksum.
+func GetBinaryFileChecksum(filename string) (string, error) {
+	if _, found := binaryFileChecksums[filename]; !found {
+		return "", fmt.Errorf(`static: unable to find checksum for %q`, filename)
+	}
+	return binaryFileChecksums[filename], nil
+}

ui/static_app_icon.go

@@ -5,7 +5,6 @@
 package ui // import "miniflux.app/ui"
 
 import (
-	"encoding/base64"
 	"net/http"
 	"time"
 
@@ -17,14 +16,14 @@ import (
 
 func (h *handler) showAppIcon(w http.ResponseWriter, r *http.Request) {
 	filename := request.RouteStringParam(r, "filename")
-	etag, found := static.BinariesChecksums[filename]
-	if !found {
+	etag, err := static.GetBinaryFileChecksum(filename)
+	if err != nil {
 		html.NotFound(w, r)
 		return
 	}
 
 	response.New(w, r).WithCaching(etag, 72*time.Hour, func(b *response.Builder) {
-		blob, err := base64.StdEncoding.DecodeString(static.Binaries[filename])
+		blob, err := static.LoadBinaryFile(filename)
 		if err != nil {
 			html.ServerError(w, r, err)
 			return

ui/static_favicon.go

@@ -5,7 +5,6 @@
 package ui // import "miniflux.app/ui"
 
 import (
-	"encoding/base64"
 	"net/http"
 	"time"
 
@@ -15,14 +14,14 @@ import (
 )
 
 func (h *handler) showFavicon(w http.ResponseWriter, r *http.Request) {
-	etag, found := static.BinariesChecksums["favicon.ico"]
-	if !found {
+	etag, err := static.GetBinaryFileChecksum("favicon.ico")
+	if err != nil {
 		html.NotFound(w, r)
 		return
 	}
 
 	response.New(w, r).WithCaching(etag, 48*time.Hour, func(b *response.Builder) {
-		blob, err := base64.StdEncoding.DecodeString(static.Binaries["favicon.ico"])
+		blob, err := static.LoadBinaryFile("favicon.ico")
 		if err != nil {
 			html.ServerError(w, r, err)
 			return