Add cache headers to static files and etags to performer images (#337)

This commit is contained in:
InfiniteTF
2020-01-31 23:20:14 +01:00
committed by GitHub
parent 6a6e8d8875
commit cd9c6e998e
2 changed files with 17 additions and 0 deletions

View File

@@ -2,10 +2,13 @@ package api
import ( import (
"context" "context"
"crypto/md5"
"fmt"
"github.com/go-chi/chi" "github.com/go-chi/chi"
"github.com/stashapp/stash/pkg/models" "github.com/stashapp/stash/pkg/models"
"net/http" "net/http"
"strconv" "strconv"
"strings"
) )
type performerRoutes struct{} type performerRoutes struct{}
@@ -23,6 +26,16 @@ func (rs performerRoutes) Routes() chi.Router {
func (rs performerRoutes) Image(w http.ResponseWriter, r *http.Request) { func (rs performerRoutes) Image(w http.ResponseWriter, r *http.Request) {
performer := r.Context().Value(performerKey).(*models.Performer) performer := r.Context().Value(performerKey).(*models.Performer)
etag := fmt.Sprintf("%x", md5.Sum(performer.Image))
if match := r.Header.Get("If-None-Match"); match != "" {
if strings.Contains(match, etag) {
w.WriteHeader(http.StatusNotModified)
return
}
}
w.Header().Add("Etag", etag)
_, _ = w.Write(performer.Image) _, _ = w.Write(performer.Image)
} }

View File

@@ -196,6 +196,10 @@ func Start() {
data, _ := uiBox.Find("index.html") data, _ := uiBox.Find("index.html")
_, _ = w.Write(data) _, _ = w.Write(data)
} else { } else {
isStatic, _ := path.Match("/static/*/*", r.URL.Path)
if isStatic {
w.Header().Add("Cache-Control", "max-age=604800000")
}
http.FileServer(uiBox).ServeHTTP(w, r) http.FileServer(uiBox).ServeHTTP(w, r)
} }
}) })