refactor: Simplifying etag computation

Signed-off-by: Vincent Boutour <[email protected]>

pkg/crud/get.go

@@ -114,7 +114,7 @@ func (a App) handleDir(w http.ResponseWriter, r *http.Request, request provider.
 	}
 
 	if query.GetBool(r, "thumbnail") {
-		a.thumbnailApp.List(w, r, request, item, items)
+		a.thumbnailApp.List(w, r, items)
 		return renderer.Page{}, nil
 	}
 
@@ -178,8 +178,7 @@ func (a App) serveGeoJSON(w http.ResponseWriter, r *http.Request, request provid
 		return
 	}
 
-	hash := a.exifHash(r.Context(), items)
-	etag, ok := provider.EtagMatch(w, r, hash)
+	etag, ok := provider.EtagMatch(w, r, a.exifHash(r.Context(), items))
 	if ok {
 		return
 	}

pkg/thumbnail/thumbnail.go

@@ -19,7 +19,6 @@ import (
 	"github.com/ViBiOh/httputils/v4/pkg/httperror"
 	"github.com/ViBiOh/httputils/v4/pkg/logger"
 	prom "github.com/ViBiOh/httputils/v4/pkg/prometheus"
-	"github.com/ViBiOh/httputils/v4/pkg/query"
 	"github.com/ViBiOh/httputils/v4/pkg/request"
 	"github.com/ViBiOh/httputils/v4/pkg/sha"
 	"github.com/prometheus/client_golang/prometheus"
@@ -196,22 +195,15 @@ func (a App) Serve(w http.ResponseWriter, r *http.Request, item absto.Item) {
 }
 
 // List return all thumbnail in a base64 form
-func (a App) List(w http.ResponseWriter, r *http.Request, request provider.Request, item absto.Item, items []absto.Item) {
+func (a App) List(w http.ResponseWriter, r *http.Request, items []absto.Item) {
 	if len(items) == 0 {
 		w.WriteHeader(http.StatusNoContent)
 		return
 	}
 
 	ctx := r.Context()
 
-	var hash string
-	if query.GetBool(r, "search") || request.IsStory() {
-		hash = a.thumbnailHash(ctx, items)
-	} else if thumbnails, err := a.ListDir(ctx, item); err == nil {
-		hash = sha.New(thumbnails)
-	}
-
-	etag, ok := provider.EtagMatch(w, r, hash)
+	etag, ok := provider.EtagMatch(w, r, a.thumbnailHash(ctx, items))
 	if ok {
 		return
 	}