0.2.73

server/internal/api/items.go

@@ -46,21 +46,43 @@ func (s *Server) handleItem(w http.ResponseWriter, r *http.Request, sess store.S
 		writeError(w, http.StatusBadRequest, "item id is required")
 		return
 	}
-	// Version the entry when the detail contract grows so older cached payloads cannot
-	// hide newly requested fields such as People or the stored ratings.
-	key := cache.UserKey(sess.EmbyUserID, "item:v6:"+itemID)
-
-	if raw, err := s.cache.Get(ctx, key); err == nil {
+	if raw, err := s.cache.Get(ctx, itemDetailKey(sess.EmbyUserID, itemID)); err == nil {
 		w.Header().Set("X-Memby-Cache", "hit")
 		writeRaw(w, http.StatusOK, raw)
 		return
 	}
 
-	item, err := s.emby.Item(ctx, credentials(sess), itemID, fieldsDetail)
+	item, err := s.detailItem(ctx, sess, itemID)
 	if err != nil {
 		s.writeUpstreamError(ctx, w, err, "could not load the item")
 		return
 	}
+	w.Header().Set("X-Memby-Cache", "miss")
+	writeRaw(w, http.StatusOK, item)
+}
+
+// itemDetailKey is versioned so that when the detail contract grows, older cached payloads
+// cannot hide newly requested fields such as People or the stored ratings.
+func itemDetailKey(userID, itemID string) string {
+	return cache.UserKey(userID, "item:v6:"+itemID)
+}
+
+// detailItem is the full record for one item, decorated and kept.
+//
+// It is shared rather than private to the item route because a Magic press hands back a
+// title the television is about to open a detail page for — and before this, that press
+// paid its own uncached Emby lookup and then the page paid a second one a moment later.
+func (s *Server) detailItem(
+	ctx context.Context, sess store.Session, itemID string,
+) (json.RawMessage, error) {
+	key := itemDetailKey(sess.EmbyUserID, itemID)
+	if raw, err := s.cache.Get(ctx, key); err == nil {
+		return raw, nil
+	}
+	item, err := s.emby.Item(ctx, credentials(sess), itemID, fieldsDetail)
+	if err != nil {
+		return nil, err
+	}
 	// A detail page can then draw its ratings with the rest of the hero rather than
 	// after a second request. Anything not yet stored still arrives on /ratings.
 	decorated := []json.RawMessage{item}
@@ -69,8 +91,7 @@ func (s *Server) handleItem(w http.ResponseWriter, r *http.Request, sess store.S
 	if err := s.cache.Set(ctx, key, item, s.cfg.ItemTTL); err != nil {
 		s.loggerFor(ctx).Warn("item cache write failed", "error", err)
 	}
-	w.Header().Set("X-Memby-Cache", "miss")
-	writeRaw(w, http.StatusOK, item)
+	return item, nil
 }
 
 // handleSeasonFinale verifies an episode against Sonarr's complete season, including