fix: Adding debug log for investigating etag problem

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · May 20, 2022 · 95f2ab6 · 95f2ab6
1 parent 8520951
commit 95f2ab6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/pkg/crud/get.go b/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, item, items)
+		a.thumbnailApp.List(w, r, request, item, items)
 		return renderer.Page{}, nil
 	}
 

diff --git a/pkg/provider/utils.go b/pkg/provider/utils.go
@@ -285,5 +285,7 @@ func EtagMatch(w http.ResponseWriter, r *http.Request, hash string) (etag string
 		match = true
 	}
 
+	logger.Info("Request is `%s`, Hash is `%s`, `If-None-Match` is `%s`, Match ? %t", r.URL.String(), hash, r.Header.Get("If-None-Match"), match)
+
 	return
 }
diff --git a/pkg/thumbnail/thumbnail.go b/pkg/thumbnail/thumbnail.go
@@ -196,7 +196,7 @@ 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, item absto.Item, items []absto.Item) {
+func (a App) List(w http.ResponseWriter, r *http.Request, request provider.Request, item absto.Item, items []absto.Item) {
 	if len(items) == 0 {
 		w.WriteHeader(http.StatusNoContent)
 		return
@@ -205,7 +205,7 @@ func (a App) List(w http.ResponseWriter, r *http.Request, item absto.Item, items
 	ctx := r.Context()
 
 	var hash string
-	if query.GetBool(r, "search") {
+	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)