fix(playlists): "+N without length" counts every video the sum left out

The label said "without length" but the count held only live videos, so
a video not fetched yet, or gone before it was, was left out of the sum
and named nowhere. The server's `Video.without_length` and the client's
`isWithoutLength` are now one rule (no length, whatever the live
status), and the field, the key and the helpers are named for what they
count. The comments that still quoted "+N live" say the current copy.
This commit is contained in:
2026-11-08 00:49:21 +01:00
parent 55cbbfb6e4
commit e8b9bdd7c1
17 changed files with 97 additions and 97 deletions
@@ -1,21 +0,0 @@
import { describe, expect, it } from "vitest";
import type { TFunction } from "i18next";
import { isLiveWithoutLength, withLiveCount } from "./liveWithoutLength";
const t = ((key: string, o: { count: number }) => `${key}:${o.count}`) as unknown as TFunction;
describe("a total and the live videos it cannot hold", () => {
it("counts a live video only when the server sent no length", () => {
expect(isLiveWithoutLength({ duration_seconds: null, live_status: "was_live" })).toBe(true);
expect(isLiveWithoutLength({ duration_seconds: null, live_status: "live" })).toBe(true);
expect(isLiveWithoutLength({ duration_seconds: 5400, live_status: "was_live" })).toBe(false);
// Not fetched yet, and not live: left out of the sum like before, not named as live.
expect(isLiveWithoutLength({ duration_seconds: null, live_status: "none" })).toBe(false);
});
it("names them beside the sum, or alone when nothing summed", () => {
expect(withLiveCount("12 hr 5 min", 2, t)).toBe("12 hr 5 min card.liveWithoutLength:2");
expect(withLiveCount("", 1, t)).toBe("card.liveWithoutLength:1");
expect(withLiveCount("12 hr 5 min", 0, t)).toBe("12 hr 5 min");
});
});
@@ -1,18 +0,0 @@
// A total of video lengths and the live videos it cannot hold. The server decides what a length is
// (a YouTube "length" past a day is a 24/7 stream's archive reporting the years it has run, and the
// API sends none for it: `catalog.models.LENGTH_MAX_S`), so this side keeps no copy of that limit. It
// only names what a sum left out: a live video — on air, upcoming, a premiere or an archive — with no
// length, as the server's `Video.live_without_length` counts it for the totals it sums itself.
import type { TFunction } from "i18next";
import type { Video } from "../../lib/api/feed";
export function isLiveWithoutLength(v: Pick<Video, "duration_seconds" | "live_status">): boolean {
return v.duration_seconds == null && v.live_status !== "none";
}
/** "12 hr 5 min +2 without length": `total` is the formatted sum ("" when nothing summed), `live` the count
* it left out. Empty when both are. */
export function withLiveCount(total: string, live: number, t: TFunction): string {
const suffix = live > 0 ? t("card.liveWithoutLength", { count: live }) : "";
return [total, suffix].filter(Boolean).join(" ");
}
@@ -0,0 +1,19 @@
import { describe, expect, it } from "vitest";
import type { TFunction } from "i18next";
import { isWithoutLength, withLeftOutCount } from "./withoutLength";
const t = ((key: string, o: { count: number }) => `${key}:${o.count}`) as unknown as TFunction;
describe("a total and the videos it cannot hold", () => {
it("counts every video the server sent no length for", () => {
expect(isWithoutLength({ duration_seconds: null })).toBe(true);
expect(isWithoutLength({ duration_seconds: 5400 })).toBe(false);
expect(isWithoutLength({ duration_seconds: 0 })).toBe(false);
});
it("names them beside the sum, or alone when nothing summed", () => {
expect(withLeftOutCount("12 hr 5 min", 2, t)).toBe("12 hr 5 min card.withoutLength:2");
expect(withLeftOutCount("", 1, t)).toBe("card.withoutLength:1");
expect(withLeftOutCount("12 hr 5 min", 0, t)).toBe("12 hr 5 min");
});
});
@@ -0,0 +1,19 @@
// A total of video lengths and the videos it cannot hold. The server decides what a length is (a
// YouTube "length" past a day is a 24/7 stream's archive reporting the years it has run, and the API
// sends none for it: `catalog.models.LENGTH_MAX_S`), so this side keeps no copy of that limit. It only
// names what a sum left out: every video with no length — live, an archive, or not fetched yet — as the
// server's `Video.without_length` counts it for the totals it sums itself. The two rules are the same,
// so the count and the sum never disagree about what was left out.
import type { TFunction } from "i18next";
import type { Video } from "../../lib/api/feed";
export function isWithoutLength(v: Pick<Video, "duration_seconds">): boolean {
return v.duration_seconds == null;
}
/** "12 hr 5 min +2 without length": `total` is the formatted sum ("" when nothing summed), `leftOut`
* the count it left out. Empty when both are. */
export function withLeftOutCount(total: string, leftOut: number, t: TFunction): string {
const suffix = leftOut > 0 ? t("card.withoutLength", { count: leftOut }) : "";
return [total, suffix].filter(Boolean).join(" ");
}
+2 -2
View File
@@ -16,8 +16,8 @@
"restart": "Restart",
"play": "Play",
"stream": "stream",
"liveWithoutLength_one": "+{{count}} without length",
"liveWithoutLength_other": "+{{count}} without length",
"withoutLength_one": "+{{count}} without length",
"withoutLength_other": "+{{count}} without length",
"views": "views",
"info": "Details",
"noDescription": "No description",
+2 -2
View File
@@ -16,8 +16,8 @@
"restart": "Elölről",
"play": "Lejátszás",
"stream": "közvetítés",
"liveWithoutLength_one": "+{{count}} hossz nélkül",
"liveWithoutLength_other": "+{{count}} hossz nélkül",
"withoutLength_one": "+{{count}} hossz nélkül",
"withoutLength_other": "+{{count}} hossz nélkül",
"views": "megtekintés",
"info": "Részletek",
"noDescription": "Nincs leírás",
+2 -2
View File
@@ -17,8 +17,8 @@ export interface Playlist {
dirty: boolean; // linked local playlist has edits not yet pushed to YouTube
item_count: number;
total_duration_seconds: number;
/** Live videos the total cannot hold (no length): the "+N without length" beside it. */
live_without_length: number;
/** The videos the total left out for having no length: the "+N without length" beside it. */
without_length: number;
cover_thumbnail: string | null;
updated_at: string; // ISO; when the list last CHANGED (rename, add/remove/move/reorder)
has_video?: boolean; // only set when listed with ?contains=<video_id>
@@ -192,10 +192,10 @@ describe("buildChannelColumns — Added", () => {
const length = cols.find((c) => c.key === "length");
const row = {
...ch({ total_duration_seconds: 7200 }),
live_without_length: 2,
without_length: 2,
} as ManagedChannel;
const { container } = render(<>{length!.render(row)}</>);
expect(container.textContent).not.toContain("card.liveWithoutLength");
expect(container.textContent).not.toContain("card.withoutLength");
expect(container.querySelectorAll("span")).toHaveLength(1);
});
});
@@ -990,24 +990,25 @@ describe("Playlists · the header", () => {
)
).textContent;
it("sums what is known, and says nothing about a runtime nothing sums to", async () => {
it("sums what is known, and names what it left out beside it", async () => {
// Not fetched yet, and not live: left out of the sum all the same, so it is named.
mount({ 1: [vid("A", 0), untimed("B")] });
expect(await meta()).toBe("playlists.itemCount · 50 min");
expect(await meta()).toBe("playlists.itemCount · 50 min card.withoutLength");
cleanup();
mount({ 1: [untimed("C")] });
expect(await meta()).toBe("playlists.itemCount");
mount({ 1: [vid("A", 0)] });
expect(await meta()).toBe("playlists.itemCount · 50 min");
});
it("names the live videos the sum cannot hold beside it", async () => {
it("names a live video the sum cannot hold, alone when nothing summed", async () => {
// A 24/7 stream's archive comes with no length (the server's rule): it is named, not summed.
const archive = (id: string) => ({ ...untimed(id), live_status: "was_live" }) as Video;
mount({ 1: [vid("A", 0), archive("B")] });
expect(await meta()).toBe("playlists.itemCount · 50 min card.liveWithoutLength");
expect(await meta()).toBe("playlists.itemCount · 50 min card.withoutLength");
cleanup();
mount({ 1: [archive("C")] });
expect(await meta()).toBe("playlists.itemCount · card.liveWithoutLength");
expect(await meta()).toBe("playlists.itemCount · card.withoutLength");
});
it("offers the view controls only once there is more than one row to arrange", async () => {
+6 -6
View File
@@ -68,7 +68,7 @@ import {
playlistViewParamUpdates,
} from "../../lib/playlistsUrlState";
import { formatRuntime } from "../../lib/format";
import { isLiveWithoutLength, withLiveCount } from "../../features/video/liveWithoutLength";
import { isWithoutLength, withLeftOutCount } from "../../features/video/withoutLength";
import { applyView, sameOrder } from "../../lib/playlistView";
import { useOpenLinkedPlayer } from "../../features/player/useOpenLinkedPlayer";
const PlayerModal = lazy(() => import("../../features/player/PlayerModal"));
@@ -566,13 +566,13 @@ function PlaylistDetail() {
}, [items]);
// Total playtime of the whole playlist (sums every item, matching the itemCount beside it — not
// the filtered `shown` set). Items with an unknown duration count as 0, and a live one is named
// beside the sum instead ("+2 without length"); hidden when there is neither.
// the filtered `shown` set). An item with an unknown duration is left out of the sum and named
// beside it instead ("+2 without length"); hidden when there is neither.
const totalSeconds = useMemo(
() => items.reduce((acc, v) => acc + (v.duration_seconds ?? 0), 0),
[items],
);
const liveCount = useMemo(() => items.filter(isLiveWithoutLength).length, [items]);
const leftOutCount = useMemo(() => items.filter(isWithoutLength).length, [items]);
// The row's "…" opens the row menu under itself. Which row's menu is open is part of the
// cell (aria-expanded), so the columns rebuild when it changes — a cheap array of closures.
@@ -1622,8 +1622,8 @@ function PlaylistDetail() {
>
<span className="text-xs text-muted">
{t("playlists.itemCount", { count: items.length })}
{(totalSeconds > 0 || liveCount > 0) &&
` · ${withLiveCount(formatRuntime(totalSeconds, lang), liveCount, t)}`}
{(totalSeconds > 0 || leftOutCount > 0) &&
` · ${withLeftOutCount(formatRuntime(totalSeconds, lang), leftOutCount, t)}`}
{filterActive &&
` · ${t("playlists.filteredCount", { count: shown.length })}`}
</span>
@@ -75,7 +75,7 @@ const pl = (id: number, name: string) =>
yt_playlist_id: null,
item_count: 1,
total_duration_seconds: 0,
live_without_length: 0,
without_length: 0,
cover_thumbnail: null,
dirty: false,
}) as unknown as Playlist;
@@ -80,7 +80,7 @@ const alpha = {
source: "local",
item_count: 3,
total_duration_seconds: 0,
live_without_length: 0,
without_length: 0,
cover_thumbnail: null,
dirty: false,
} as unknown as Playlist;
@@ -8,7 +8,7 @@ import { YouTubeIcon } from "../../lib/brandIcons";
import { api, type Playlist } from "../../lib/api";
import { compareText } from "../../lib/collate";
import { formatRuntime } from "../../lib/format";
import { withLiveCount } from "../../features/video/liveWithoutLength";
import { withLeftOutCount } from "../../features/video/withoutLength";
import { msg, notify } from "../../lib/notifications";
import { notifyYouTubeActionError } from "../../lib/youtubeErrors";
import { LS } from "../../lib/storage";
@@ -379,10 +379,10 @@ export default function PlaylistsRail() {
</div>
<div className="text-2xs text-muted">
{t("playlists.itemCount", { count: pl.item_count })}
{(pl.total_duration_seconds > 0 || pl.live_without_length > 0) &&
` · ${withLiveCount(
{(pl.total_duration_seconds > 0 || pl.without_length > 0) &&
` · ${withLeftOutCount(
formatRuntime(pl.total_duration_seconds, lang),
pl.live_without_length,
pl.without_length,
t,
)}`}
</div>