Merge remote-tracking branch 'origin/latest' into latest

Author: dannyvfilms

src/app/cache_utils.py

@@ -15,7 +15,10 @@
 TIME_LEFT_CACHE_PREFIX = "time_left_sorted_v19"
 _REGISTRY_TEMPLATE = f"{TIME_LEFT_CACHE_PREFIX}_registry_{{user_id}}"
 
-MEDIA_LIST_CACHE_PREFIX = "media_list_v1"
+# v2: payload changed from a pickled full MediaListEntry list to a compact
+# {media_pk, model, item_pk} order hydrated per page (issue #865). Bumped so a
+# rolling deploy can't hand the new code an old pickled entry (or vice versa).
+MEDIA_LIST_CACHE_PREFIX = "media_list_v2"
 MEDIA_LIST_CACHE_TTL = 60  # seconds — enough for "navigate away and back" use case
 # v2: filter payloads include per-tag media-list usage counts.
 MEDIA_LIST_FILTER_CACHE_PREFIX = "media_list_filters_v2"

src/app/helpers.py

@@ -1094,3 +1094,15 @@ def parse_completion_datetime(value):
         parsed = make_aware(parsed)
 
     return parsed
+
+def split_pass_history(tracked_plays, season):
+    """Return (plays in the season's current rewatch pass, every play).
+
+    Outside a pass the two are the same, so callers can key display off the
+    first and lifetime counts off the second without special-casing.
+    """
+    if season is None:
+        return tracked_plays, tracked_plays
+    return [
+        play for play in tracked_plays if season.play_counts_for_pass(play)
+    ], tracked_plays

src/app/history_cache.py

@@ -1019,9 +1019,7 @@ def build_history_days(
         )
     )
     process_movies = (
-        process_all
-        or has_person_filter
-        or MediaTypes.MOVIE.value in media_type_filter
+        process_all or has_person_filter or MediaTypes.MOVIE.value in media_type_filter
     )
     process_reading = (
         process_all
@@ -1037,19 +1035,15 @@ def build_history_days(
         )
     )
     process_music = (
-        process_all
-        or has_music_filter
-        or MediaTypes.MUSIC.value in media_type_filter
+        process_all or has_music_filter or MediaTypes.MUSIC.value in media_type_filter
     )
     process_podcasts = (
         process_all
         or has_podcast_filter
         or MediaTypes.PODCAST.value in media_type_filter
     )
     process_games = process_all or MediaTypes.GAME.value in media_type_filter
-    process_boardgames = (
-        process_all or MediaTypes.BOARDGAME.value in media_type_filter
-    )
+    process_boardgames = process_all or MediaTypes.BOARDGAME.value in media_type_filter
 
     # --- Fetch querysets ---
     episodes_start = time.perf_counter()
@@ -1399,11 +1393,7 @@ def entry_matches_implied_genre(entry):
                 entries.append(entry)
                 entry_counts["episodes"] += 1
 
-    if (
-        process_all
-        or has_person_filter
-        or MediaTypes.MOVIE.value in media_type_filter
-    ):
+    if process_all or has_person_filter or MediaTypes.MOVIE.value in media_type_filter:
         for movie in movies:
             if genre_filters and not matches_genre(movie, MediaTypes.MOVIE.value):
                 continue
@@ -1449,11 +1439,7 @@ def entry_matches_implied_genre(entry):
         elif mt == MediaTypes.ANIME.value:
             entry_counts["anime"] += 1
 
-    if (
-        process_all
-        or has_music_filter
-        or MediaTypes.MUSIC.value in media_type_filter
-    ):
+    if process_all or has_music_filter or MediaTypes.MUSIC.value in media_type_filter:
         music_entry_list, music_history_records_scanned, music_album_day_groups = (
             _build_music_entries(
                 user, music_entries, genre_filters, start_date, end_date
@@ -1492,9 +1478,7 @@ def entry_matches_implied_genre(entry):
         )
 
     process_games = process_all or MediaTypes.GAME.value in media_type_filter
-    process_boardgames = (
-        process_all or MediaTypes.BOARDGAME.value in media_type_filter
-    )
+    process_boardgames = process_all or MediaTypes.BOARDGAME.value in media_type_filter
     if process_games or process_boardgames:
         for entry in _build_game_entries(
             games,
@@ -1528,7 +1512,14 @@ def entry_matches_implied_genre(entry):
     undated_entries = [e for e in entries if e["played_at_local"] is None]
     entries = [e for e in entries if e["played_at_local"] is not None]
 
-    entries.sort(key=lambda e: e["played_at_local"], reverse=True)
+    entries.sort(
+        key=lambda e: (
+            e["played_at_local"],
+            e.get("season_number") or 0,
+            e.get("episode_number") or 0,
+        ),
+        reverse=True,
+    )
 
     grouped_entries = defaultdict(list)
     for entry in entries:
@@ -1538,7 +1529,14 @@ def entry_matches_implied_genre(entry):
     for _, day_entries in sorted(
         grouped_entries.items(), key=lambda x: x[0], reverse=True
     ):
-        day_entries.sort(key=lambda e: e["played_at_local"], reverse=True)
+        day_entries.sort(
+            key=lambda e: (
+                e["played_at_local"],
+                e.get("season_number") or 0,
+                e.get("episode_number") or 0,
+            ),
+            reverse=True,
+        )
         first_entry_time = day_entries[0]["played_at_local"]
         total_minutes = sum(e["runtime_minutes"] or 0 for e in day_entries)
         history_days.append(

src/app/history_cache_day_builder.py

@@ -56,9 +56,7 @@
 logger = logging.getLogger(__name__)
 
 
-def build_history_day(
-    user, day_key, logging_style_override=None, media_types=None
-):
+def build_history_day(user, day_key, logging_style_override=None, media_types=None):
     """Build a single history day payload for a user."""
     if not day_key:
         return None
@@ -71,12 +69,18 @@ def build_history_day(
     if not day_date:
         return None
     requested_media_types = expand_history_media_types(media_types)
-    include_episode = requested_media_types is None or "episode" in requested_media_types
+    include_episode = (
+        requested_media_types is None or "episode" in requested_media_types
+    )
     include_movie = requested_media_types is None or "movie" in requested_media_types
     include_music = requested_media_types is None or "music" in requested_media_types
-    include_podcast = requested_media_types is None or "podcast" in requested_media_types
+    include_podcast = (
+        requested_media_types is None or "podcast" in requested_media_types
+    )
     include_game = requested_media_types is None or "game" in requested_media_types
-    include_boardgame = requested_media_types is None or "boardgame" in requested_media_types
+    include_boardgame = (
+        requested_media_types is None or "boardgame" in requested_media_types
+    )
 
     day_start = timezone.make_aware(
         datetime.combine(day_date, datetime.min.time()),
@@ -203,7 +207,10 @@ def build_history_day(
         (MediaTypes.MANGA.value, Manga),
         (MediaTypes.ANIME.value, Anime),
     ):
-        if requested_media_types is not None and media_type_value not in requested_media_types:
+        if (
+            requested_media_types is not None
+            and media_type_value not in requested_media_types
+        ):
             continue
         records = (
             model.objects.filter(user=user)
@@ -511,21 +518,25 @@ def build_history_day(
     # Games / Boardgames
     if logging_style == "sessions":
         games = (
-            Game.objects.filter(user=user)
-            .filter(
-                models.Q(end_date__gte=day_start, end_date__lt=day_end)
-                | (
-                    models.Q(end_date__isnull=True)
-                    & models.Q(start_date__gte=day_start, start_date__lt=day_end)
-                )
-                | (
-                    models.Q(end_date__isnull=True)
-                    & models.Q(start_date__isnull=True)
-                    & models.Q(created_at__gte=day_start, created_at__lt=day_end)
+            (
+                Game.objects.filter(user=user)
+                .filter(
+                    models.Q(end_date__gte=day_start, end_date__lt=day_end)
+                    | (
+                        models.Q(end_date__isnull=True)
+                        & models.Q(start_date__gte=day_start, start_date__lt=day_end)
+                    )
+                    | (
+                        models.Q(end_date__isnull=True)
+                        & models.Q(start_date__isnull=True)
+                        & models.Q(created_at__gte=day_start, created_at__lt=day_end)
+                    )
                 )
+                .select_related("item")
             )
-            .select_related("item")
-        ) if include_game else Game.objects.none()
+            if include_game
+            else Game.objects.none()
+        )
         for game in games:
             activity_dt = game.end_date or game.start_date or game.created_at
             played_at_local = _localize_datetime(activity_dt)
@@ -568,21 +579,25 @@ def build_history_day(
             entries.append(entry)
 
         boardgames = (
-            BoardGame.objects.filter(user=user)
-            .filter(
-                models.Q(end_date__gte=day_start, end_date__lt=day_end)
-                | (
-                    models.Q(end_date__isnull=True)
-                    & models.Q(start_date__gte=day_start, start_date__lt=day_end)
-                )
-                | (
-                    models.Q(end_date__isnull=True)
-                    & models.Q(start_date__isnull=True)
-                    & models.Q(created_at__gte=day_start, created_at__lt=day_end)
+            (
+                BoardGame.objects.filter(user=user)
+                .filter(
+                    models.Q(end_date__gte=day_start, end_date__lt=day_end)
+                    | (
+                        models.Q(end_date__isnull=True)
+                        & models.Q(start_date__gte=day_start, start_date__lt=day_end)
+                    )
+                    | (
+                        models.Q(end_date__isnull=True)
+                        & models.Q(start_date__isnull=True)
+                        & models.Q(created_at__gte=day_start, created_at__lt=day_end)
+                    )
                 )
+                .select_related("item")
             )
-            .select_related("item")
-        ) if include_boardgame else BoardGame.objects.none()
+            if include_boardgame
+            else BoardGame.objects.none()
+        )
         for boardgame in boardgames:
             activity_dt = (
                 boardgame.end_date or boardgame.start_date or boardgame.created_at
@@ -748,7 +763,14 @@ def build_history_day(
     if not entries:
         return None
 
-    entries.sort(key=lambda entry: entry["played_at_local"], reverse=True)
+    entries.sort(
+        key=lambda entry: (
+            entry["played_at_local"],
+            entry.get("season_number") or 0,
+            entry.get("episode_number") or 0,
+        ),
+        reverse=True,
+    )
     total_minutes = sum(entry["runtime_minutes"] or 0 for entry in entries)
     first_entry_time = entries[0]["played_at_local"]
 

src/app/history_entry_builders.py

@@ -225,6 +225,12 @@ def _build_episode_entry(episode, episode_title_map=None):
         "display_title": display_title,
         "episode_label": episode_label,
         "episode_code": episode_code,
+        # Tiebreaker for entries.sort()'s played_at_local key: plays logged
+        # in one bulk action often share an exact timestamp, so the season
+        # order they actually play in decides ties rather than whatever
+        # arbitrary order the query happened to return them in.
+        "season_number": episode_item.season_number if episode_item else None,
+        "episode_number": episode_item.episode_number if episode_item else None,
         "played_at_local": played_at_local,
         "runtime_minutes": runtime_minutes,
         "runtime_display": helpers.minutes_to_hhmm(runtime_minutes)

src/app/history_processor.py

@@ -26,6 +26,9 @@ def process_history_entry(entry, media_type, user):
     new_record, old_record = entry
     processed_entry = {
         "id": new_record.history_id,
+        # The tracked row this entry describes, so the timeline can offer to
+        # edit the play itself rather than only delete the record of it.
+        "instance_id": new_record.id,
         "date": new_record.history_date,
         "changes": [],
     }

src/app/management/commands/benchmark_perf.py

@@ -21,6 +21,12 @@
     ("GET", "/medialist/tv"),
     ("GET", "/medialist/season"),
     ("GET", "/medialist/anime"),
+    ("GET", "/medialist/movie"),
+    ("GET", "/medialist/game"),
+    ("GET", "/medialist/book"),
+    ("GET", "/medialist/manga"),
+    ("GET", "/medialist/music"),
+    ("GET", "/medialist/podcast"),
     ("GET", "/statistics"),
     ("GET", "/history"),
     ("GET", "/discover"),
@@ -29,6 +35,16 @@
     ("GET", "/health/"),
 ]
 
+# medialist paths whose "scroll" (pagination) requests we also benchmark
+# separately from first-load, matching how issue #865 was reported: a slow
+# first render followed by additional slow requests while scrolling further
+# pages of the same list.
+MEDIALIST_SCROLL_PATHS = [
+    "/medialist/tv",
+    "/medialist/movie",
+]
+SCROLL_PAGES = 3
+
 RUNS = 3
 
 
@@ -136,5 +152,28 @@ def handle(self, *args, **options):
         )
         self.stdout.write("")
 
+        # Reproduce the issue #865 report: a cold first load followed by
+        # scrolling through several more pages of the same list. Each row
+        # here is ONE request (not a median), in request order, so a
+        # regression that only shows up after the cache warms (or only on
+        # page >= 2) is visible instead of averaged away.
+        if MEDIALIST_SCROLL_PATHS:
+            self.stdout.write("Scroll reproduction (issue #865): cold load + N page requests")
+            self.stdout.write(divider)
+            for path in MEDIALIST_SCROLL_PATHS:
+                for page in range(1, SCROLL_PAGES + 2):
+                    reset_queries()
+                    t0 = time.perf_counter()
+                    client.get(path, {"page": page} if page > 1 else {})
+                    wall_ms = (time.perf_counter() - t0) * 1000
+                    n_queries = len(connection.queries)
+                    label = f"{path} page={page}" + (" (first load)" if page == 1 else "")
+                    self.stdout.write(
+                        f"{label:<{col_w[0]}} | {n_queries:>{col_w[1]}} | "
+                        f"{'':>{col_w[2]}} | {wall_ms:>{col_w[3]}.1f}"
+                    )
+            self.stdout.write(divider)
+            self.stdout.write("")
+
         conf.settings.DEBUG = original_debug
         conf.settings.ALLOWED_HOSTS = original_allowed_hosts