From d71aab37dc9b69ca844c670d22a3df03ddb02d2d Mon Sep 17 00:00:00 2001 From: sudacode Date: Fri, 18 Sep 2026 23:53:26 -0700 Subject: [PATCH] feat(stats): separate YouTube channels in the Library - Store YouTube channels as a distinct media kind and migrate legacy entries safely - Add All Titles, Anime, and YouTube filters with channel-specific stats views --- changes/youtube-library-kind-docs.md | 4 + changes/youtube-library-kind.md | 5 + docs-site/immersion-tracking.md | 2 +- docs-site/youtube-integration.md | 4 + launcher/test-support/immersion-db-schema.ts | 3 +- .../services/anilist/cover-art-fetcher.ts | 10 + .../anime-merge-recommendations.ts | 7 +- .../immersion-tracker/anime-season-repair.ts | 15 +- .../immersion-tracker/query-library.ts | 2 + .../services/immersion-tracker/storage.ts | 33 ++- src/core/services/immersion-tracker/types.ts | 6 +- .../immersion-tracker/youtube-kind.test.ts | 188 ++++++++++++++++++ src/core/services/stats-sync/merge-catalog.ts | 1 + .../stats-sync/merge-occurrences.test.ts | 34 ++++ src/shared/media-kind.ts | 3 + src/types/stats-wire.ts | 3 + stats/src/components/anime/AnimeCard.test.tsx | 1 + stats/src/components/anime/AnimeCard.tsx | 3 +- .../components/anime/AnimeCoverImage.test.tsx | 1 + .../src/components/anime/AnimeDetailView.tsx | 5 +- .../anime/AnimeDialogAccessibility.test.tsx | 1 + .../src/components/anime/AnimeHeader.test.tsx | 14 ++ stats/src/components/anime/AnimeHeader.tsx | 40 ++-- .../components/anime/AnimeMergeFlow.test.tsx | 3 +- .../components/anime/AnimeOverviewStats.tsx | 12 +- stats/src/components/anime/AnimeTab.test.tsx | 54 +++++ stats/src/components/anime/AnimeTab.tsx | 56 +++++- stats/src/components/anime/EpisodeList.tsx | 10 +- .../src/components/anime/EpisodeMove.test.tsx | 1 + stats/src/lib/yomitan-lookup.test.tsx | 1 + 30 files changed, 475 insertions(+), 47 deletions(-) create mode 100644 changes/youtube-library-kind-docs.md create mode 100644 changes/youtube-library-kind.md create mode 100644 src/core/services/immersion-tracker/youtube-kind.test.ts create mode 100644 src/shared/media-kind.ts diff --git a/changes/youtube-library-kind-docs.md b/changes/youtube-library-kind-docs.md new file mode 100644 index 00000000..bdaa80d1 --- /dev/null +++ b/changes/youtube-library-kind-docs.md @@ -0,0 +1,4 @@ +type: docs +area: stats + +- Document YouTube channel filtering and video statistics in the Library. diff --git a/changes/youtube-library-kind.md b/changes/youtube-library-kind.md new file mode 100644 index 00000000..33fee1a7 --- /dev/null +++ b/changes/youtube-library-kind.md @@ -0,0 +1,5 @@ +type: fixed +area: stats + +- Store YouTube channels as a separate media kind and migrate existing channel entries without changing viewing history or manual video assignments, including channels created after temporarily returning to an older build. +- Add All Titles, Anime, and YouTube Library filters, identify channel pages, and keep channels out of AniList matching, season repair, and duplicate recommendations. diff --git a/docs-site/immersion-tracking.md b/docs-site/immersion-tracking.md index 2202c887..4eea7bf7 100644 --- a/docs-site/immersion-tracking.md +++ b/docs-site/immersion-tracking.md @@ -55,7 +55,7 @@ When older stats already grouped multiple seasons under one series entry, SubMin Jellyfin stream URLs are normalized to stable item links before stats titles are shown, so playback query parameters are not displayed in the dashboard. -When YouTube channel metadata is available, the Library tab groups videos by creator/channel and treats each tracked video as an episode-like entry inside that channel section. +When YouTube channel metadata is available, the Library tab groups videos by creator/channel. Use **All Titles**, **Anime**, or **YouTube** above the grid to filter the library. Channel pages show tracked videos and their stats without AniList controls. Existing channel entries are classified as YouTube automatically on startup, preserving viewing history and manual video assignments. Channels are excluded from anime metadata matching, season repair, and duplicate recommendations. A library entry is identified by its parsed title plus any detected season, so the same show can end up on several cards when releases disagree about the title or omit the season tag. Two fixes are available: diff --git a/docs-site/youtube-integration.md b/docs-site/youtube-integration.md index d29eaa2f..a9c48df6 100644 --- a/docs-site/youtube-integration.md +++ b/docs-site/youtube-integration.md @@ -149,6 +149,10 @@ These settings come from `config.jsonc` (or built-in defaults); there are no CLI - **Secondary subtitle fails**: Secondary track failures never block playback. The primary subtitle loads independently. - **Native mpv secondary rendering**: Stays hidden during YouTube flows so the SubMiner overlay remains the visible secondary subtitle surface. +## Viewing stats + +The stats Library groups tracked YouTube videos by channel when channel metadata is available. Select **YouTube** in the Library filter to see those channels separately from anime. Each channel page lists its videos, watch time, vocabulary, and mined cards. See [Immersion Tracking](/immersion-tracking#library). + ## Related pages - [Usage - YouTube Playback](/usage#youtube-playback) diff --git a/launcher/test-support/immersion-db-schema.ts b/launcher/test-support/immersion-db-schema.ts index c99e2cf4..c0d2d06e 100644 --- a/launcher/test-support/immersion-db-schema.ts +++ b/launcher/test-support/immersion-db-schema.ts @@ -22,7 +22,8 @@ export const IMMERSION_DB_FIXTURE_DDL = ` description TEXT, metadata_json TEXT, CREATED_DATE TEXT, - LAST_UPDATE_DATE TEXT + LAST_UPDATE_DATE TEXT, + media_kind TEXT NOT NULL DEFAULT 'anime' CHECK(media_kind IN ('anime', 'youtube')) ); CREATE TABLE imm_videos( video_id INTEGER PRIMARY KEY AUTOINCREMENT, diff --git a/src/core/services/anilist/cover-art-fetcher.ts b/src/core/services/anilist/cover-art-fetcher.ts index ac7be780..13b85c64 100644 --- a/src/core/services/anilist/cover-art-fetcher.ts +++ b/src/core/services/anilist/cover-art-fetcher.ts @@ -192,6 +192,16 @@ export function createCoverArtFetcher( return { async fetchIfMissing(db, videoId, canonicalTitle): Promise { + const channel = db + .prepare( + ` + SELECT 1 FROM imm_videos v + JOIN imm_anime a ON a.anime_id = v.anime_id + WHERE v.video_id = ? AND a.media_kind != 'anime' + `, + ) + .get(videoId); + if (channel) return false; const existing = getCoverArt(db, videoId); if (existing?.coverBlob) { return true; diff --git a/src/core/services/immersion-tracker/anime-merge-recommendations.ts b/src/core/services/immersion-tracker/anime-merge-recommendations.ts index 6ac0c096..1ad96e97 100644 --- a/src/core/services/immersion-tracker/anime-merge-recommendations.ts +++ b/src/core/services/immersion-tracker/anime-merge-recommendations.ts @@ -27,7 +27,7 @@ function getAnimeTitles(db: DatabaseSync, animeId: number): AnimeTitleRow | null .prepare( `SELECT canonical_title, title_romaji, title_english, title_native FROM imm_anime - WHERE anime_id = ?`, + WHERE anime_id = ? AND media_kind = 'anime'`, ) .get(animeId) as AnimeTitleRow | null; } @@ -77,6 +77,7 @@ export function shouldRecommendAnilistConflict( conflictAnimeId: number, options: AnimeConflictRecommendationOptions, ): boolean { + if (!getAnimeTitles(db, targetAnimeId) || !getAnimeTitles(db, conflictAnimeId)) return false; if (options.survivor === 'target' || options.matchConfidence === 'manual') return false; if ( !animeSeasonsAreMergeCompatible( @@ -99,6 +100,8 @@ export function recordAnimeMergeRecommendation( secondCandidateAnimeId: number, anilistId: number, ): void { + if (!getAnimeTitles(db, firstCandidateAnimeId) || !getAnimeTitles(db, secondCandidateAnimeId)) + return; const firstAnimeId = Math.min(firstCandidateAnimeId, secondCandidateAnimeId); const secondAnimeId = Math.max(firstCandidateAnimeId, secondCandidateAnimeId); const timestamp = toDbTimestamp(nowMs()); @@ -141,6 +144,8 @@ export function getAnimeMergeRecommendations(db: DatabaseSync): AnimeMergeRecomm second_anime_id AS secondAnimeId FROM imm_anime_merge_recommendations WHERE status = 'pending' + AND first_anime_id IN (SELECT anime_id FROM imm_anime WHERE media_kind = 'anime') + AND second_anime_id IN (SELECT anime_id FROM imm_anime WHERE media_kind = 'anime') ORDER BY recommendation_id ASC`, ) .all() as Array<{ diff --git a/src/core/services/immersion-tracker/anime-season-repair.ts b/src/core/services/immersion-tracker/anime-season-repair.ts index ced3ed18..797575c4 100644 --- a/src/core/services/immersion-tracker/anime-season-repair.ts +++ b/src/core/services/immersion-tracker/anime-season-repair.ts @@ -134,7 +134,7 @@ function getAnimeRow(db: DatabaseSync, animeId: number): AnimeRow | null { episodes_total, description FROM imm_anime - WHERE anime_id = ? + WHERE anime_id = ? AND media_kind = 'anime' `, ) .get(animeId) as AnimeRow | null; @@ -335,7 +335,8 @@ export function repairLegacySeasonlessAnimeRows(db: DatabaseSync): AnimeSeasonRe SELECT a.anime_id AS animeId FROM imm_anime a JOIN imm_videos v ON v.anime_id = a.anime_id - WHERE v.parsed_title IS NOT NULL + WHERE a.media_kind = 'anime' + AND v.parsed_title IS NOT NULL AND TRIM(v.parsed_title) != '' AND v.parsed_season IS NOT NULL AND v.parsed_season > 0 @@ -372,6 +373,11 @@ export function resolveAnimeAnilistConflict( anilistId: number, options: AnimeAnilistConflictOptions = {}, ): AnimeSeasonRepairSummary { + if (!getAnimeRow(db, targetAnimeId)) { + const summary = emptySummary(); + summary.anilistAssignmentBlocked = true; + return summary; + } const conflict = db .prepare( ` @@ -387,6 +393,11 @@ export function resolveAnimeAnilistConflict( return emptySummary(); } + if (!getAnimeRow(db, conflict.animeId)) { + const summary = emptySummary(); + summary.anilistAssignmentBlocked = true; + return summary; + } return runInTransaction(db, () => { const targetRow = getAnimeRow(db, targetAnimeId); if ( diff --git a/src/core/services/immersion-tracker/query-library.ts b/src/core/services/immersion-tracker/query-library.ts index 69240462..cb8f5736 100644 --- a/src/core/services/immersion-tracker/query-library.ts +++ b/src/core/services/immersion-tracker/query-library.ts @@ -33,6 +33,7 @@ export function getAnimeLibrary(db: DatabaseSync): AnimeLibraryRow[] { SELECT a.anime_id AS animeId, a.canonical_title AS canonicalTitle, + a.media_kind AS mediaKind, a.anilist_id AS anilistId, COALESCE(lm.total_sessions, 0) AS totalSessions, COALESCE(lm.total_active_ms, 0) AS totalActiveMs, @@ -63,6 +64,7 @@ export function getAnimeDetail(db: DatabaseSync, animeId: number): AnimeDetailRo SELECT a.anime_id AS animeId, a.canonical_title AS canonicalTitle, + a.media_kind AS mediaKind, a.anilist_id AS anilistId, a.title_romaji AS titleRomaji, a.title_english AS titleEnglish, diff --git a/src/core/services/immersion-tracker/storage.ts b/src/core/services/immersion-tracker/storage.ts index d04b3cbd..05804f11 100644 --- a/src/core/services/immersion-tracker/storage.ts +++ b/src/core/services/immersion-tracker/storage.ts @@ -1,3 +1,4 @@ +import type { MediaKind } from '../../../shared/media-kind'; import { createHash } from 'node:crypto'; import path from 'node:path'; import { parseMediaInfo } from '../../../jimaku/utils'; @@ -24,6 +25,7 @@ export interface TrackerPreparedStatements { } export interface AnimeRecordInput { + mediaKind?: MediaKind; parsedTitle: string; canonicalTitle: string; seasonScope?: number | null; @@ -600,6 +602,7 @@ export function getOrCreateAnimeRecord(db: DatabaseSync, input: AnimeRecordInput ` UPDATE imm_anime SET + media_kind = COALESCE(?, media_kind), canonical_title = COALESCE(NULLIF(?, ''), canonical_title), anilist_id = COALESCE(?, anilist_id), title_romaji = COALESCE(?, title_romaji), @@ -610,6 +613,7 @@ export function getOrCreateAnimeRecord(db: DatabaseSync, input: AnimeRecordInput WHERE anime_id = ? `, ).run( + byAnilistId || byNormalizedTitle ? (input.mediaKind ?? null) : null, canonicalTitleUpdate, input.anilistId, input.titleRomaji, @@ -627,6 +631,7 @@ export function getOrCreateAnimeRecord(db: DatabaseSync, input: AnimeRecordInput .prepare( ` INSERT INTO imm_anime( + media_kind, normalized_title_key, canonical_title, anilist_id, @@ -636,10 +641,11 @@ export function getOrCreateAnimeRecord(db: DatabaseSync, input: AnimeRecordInput metadata_json, CREATED_DATE, LAST_UPDATE_DATE - ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) + ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) `, ) .run( + input.mediaKind ?? 'anime', normalizedTitleKey, canonicalTitle, input.anilistId, @@ -803,6 +809,7 @@ export function linkYoutubeVideoToAnimeRecord( } const animeId = getOrCreateAnimeRecord(db, { + mediaKind: 'youtube', parsedTitle: identity.parsedTitle, canonicalTitle: identity.canonicalTitle, anilistId: null, @@ -875,6 +882,22 @@ function migrateLegacyAnimeMetadata(db: DatabaseSync): void { } } +// Older builds can create channel rows with the default anime kind even after +// the schema upgrade. Repair classification on every startup without moving videos. +function classifyYoutubeChannels(db: DatabaseSync): void { + db.exec(` + UPDATE imm_anime + SET media_kind = 'youtube' + WHERE media_kind = 'anime' + AND ( + normalized_title_key LIKE 'youtube channel %' + OR CASE WHEN json_valid(metadata_json) + THEN json_extract(metadata_json, '$.source') = 'youtube-channel' + ELSE 0 END + ) + `); +} + export function ensureSchema(db: DatabaseSync): void { db.exec(` CREATE TABLE IF NOT EXISTS imm_schema_version ( @@ -897,6 +920,7 @@ export function ensureSchema(db: DatabaseSync): void { .prepare('SELECT schema_version FROM imm_schema_version ORDER BY schema_version DESC LIMIT 1') .get() as { schema_version: number } | null; if (currentVersion?.schema_version === SCHEMA_VERSION) { + classifyYoutubeChannels(db); ensureLexicalDailyRollupTables(db); ensureLifetimeSummaryTables(db); ensureStatsExcludedWordsTable(db); @@ -921,6 +945,13 @@ export function ensureSchema(db: DatabaseSync): void { LAST_UPDATE_DATE TEXT ); `); + addColumnIfMissing( + db, + 'imm_anime', + 'media_kind', + "TEXT NOT NULL DEFAULT 'anime' CHECK(media_kind IN ('anime', 'youtube'))", + ); + classifyYoutubeChannels(db); db.exec(` CREATE TABLE IF NOT EXISTS imm_videos( video_id INTEGER PRIMARY KEY AUTOINCREMENT, diff --git a/src/core/services/immersion-tracker/types.ts b/src/core/services/immersion-tracker/types.ts index 18d3d59a..0d669559 100644 --- a/src/core/services/immersion-tracker/types.ts +++ b/src/core/services/immersion-tracker/types.ts @@ -1,4 +1,6 @@ -export const SCHEMA_VERSION = 23; +import type { MediaKind } from '../../../shared/media-kind'; + +export const SCHEMA_VERSION = 24; export const DEFAULT_QUEUE_CAP = 1_000; export const DEFAULT_BATCH_SIZE = 25; export const DEFAULT_FLUSH_INTERVAL_MS = 500; @@ -518,6 +520,7 @@ export interface YoutubeVideoMetadata { } export interface AnimeLibraryRow { + mediaKind: MediaKind; animeId: number; canonicalTitle: string; anilistId: number | null; @@ -531,6 +534,7 @@ export interface AnimeLibraryRow { } export interface AnimeDetailRow { + mediaKind: MediaKind; animeId: number; canonicalTitle: string; anilistId: number | null; diff --git a/src/core/services/immersion-tracker/youtube-kind.test.ts b/src/core/services/immersion-tracker/youtube-kind.test.ts new file mode 100644 index 00000000..a318478f --- /dev/null +++ b/src/core/services/immersion-tracker/youtube-kind.test.ts @@ -0,0 +1,188 @@ +import assert from 'node:assert/strict'; +import test from 'node:test'; +import { Database, type DatabaseSync } from './sqlite'; +import { + ensureSchema, + getOrCreateAnimeRecord, + getOrCreateVideoRecord, + linkYoutubeVideoToAnimeRecord, +} from './storage'; +import { getAnimeDetail, getAnimeLibrary } from './query-library'; +import { updateAnimeAnilistInfo } from './query-maintenance'; +import { + repairLegacySeasonlessAnimeRows, + resolveAnimeAnilistConflict, +} from './anime-season-repair'; +import { + getAnimeMergeRecommendations, + recordAnimeMergeRecommendation, +} from './anime-merge-recommendations'; +import { createCoverArtFetcher } from '../anilist/cover-art-fetcher'; +import { SCHEMA_VERSION, SOURCE_TYPE_REMOTE, type YoutubeVideoMetadata } from './types'; + +const metadata: YoutubeVideoMetadata = { + youtubeVideoId: 'video1', + videoUrl: 'https://www.youtube.com/watch?v=video1', + videoTitle: 'Video title', + videoThumbnailUrl: null, + channelId: 'UC123', + channelName: 'Channel name', + channelUrl: 'https://www.youtube.com/channel/UC123', + channelThumbnailUrl: null, + uploaderId: null, + uploaderUrl: null, + description: null, + metadataJson: null, +}; + +function createVideo(db: DatabaseSync, key: string): number { + return getOrCreateVideoRecord(db, key, { + canonicalTitle: 'Video title', + sourcePath: null, + sourceUrl: metadata.videoUrl, + sourceType: SOURCE_TYPE_REMOTE, + }); +} + +function createAnime( + db: DatabaseSync, + parsedTitle: string, + metadataJson: string | null = null, +): number { + return getOrCreateAnimeRecord(db, { + parsedTitle, + canonicalTitle: parsedTitle, + metadataJson, + anilistId: null, + titleRomaji: null, + titleEnglish: null, + titleNative: null, + }); +} + +test('schema 23 channel migration preserves history and manual assignments and is idempotent', () => { + const db = new Database(':memory:'); + try { + ensureSchema(db); + const ids = [ + createAnime(db, 'youtube-channel:UC123'), + createAnime(db, 'youtube-channel-url:https://www.youtube.com/@creator'), + createAnime(db, 'youtube-channel-name:Creator'), + createAnime(db, 'Renamed channel', '{ "source": "youtube-channel" }'), + ]; + const animeId = createAnime(db, 'Anime title', 'legacy non-JSON metadata'); + const videoId = createVideo(db, 'manual'); + db.prepare( + 'UPDATE imm_videos SET anime_id = ?, anime_assignment_locked = 1 WHERE video_id = ?', + ).run(animeId, videoId); + db.prepare( + 'INSERT INTO imm_lifetime_anime(anime_id, total_active_ms, total_cards) VALUES (?, 123456, 7)', + ).run(animeId); + const history = getAnimeLibrary(db); + // Reproduce the previous schema, including its lack of a media kind column. + db.exec( + 'ALTER TABLE imm_anime DROP COLUMN media_kind; DELETE FROM imm_schema_version; INSERT INTO imm_schema_version VALUES (23, 0)', + ); + ensureSchema(db); + ensureSchema(db); + for (const id of ids) { + const row = db.prepare('SELECT media_kind FROM imm_anime WHERE anime_id = ?').get(id); + assert.ok(row && typeof row === 'object' && 'media_kind' in row); + assert.equal(row.media_kind, 'youtube'); + } + assert.deepEqual(getAnimeLibrary(db), history); + assert.equal(linkYoutubeVideoToAnimeRecord(db, videoId, metadata), animeId); + const version = db + .prepare('SELECT MAX(schema_version) AS version FROM imm_schema_version') + .get(); + assert.ok(version && typeof version === 'object' && 'version' in version); + assert.equal(version.version, SCHEMA_VERSION); + } finally { + db.close(); + } +}); + +test('channel creation and repeated linking expose youtube in library and detail without losing totals', async () => { + const db = new Database(':memory:'); + try { + ensureSchema(db); + const videoId = createVideo(db, 'first'); + const channelId = linkYoutubeVideoToAnimeRecord(db, videoId, metadata); + assert.ok(channelId); + const secondVideoId = createVideo(db, 'second'); + assert.equal(linkYoutubeVideoToAnimeRecord(db, secondVideoId, metadata), channelId); + db.prepare( + 'INSERT INTO imm_lifetime_anime(anime_id, total_active_ms, total_cards) VALUES (?, 123456, 7)', + ).run(channelId); + assert.equal(getAnimeLibrary(db)[0]?.mediaKind, 'youtube'); + const detail = getAnimeDetail(db, channelId); + assert.equal(detail?.mediaKind, 'youtube'); + assert.equal(detail?.episodeCount, 2); + assert.equal(detail?.totalActiveMs, 123456); + assert.equal(detail?.totalCards, 7); + + // Even parsed season numbers and a matching anime name must not trigger repairs. + db.prepare('UPDATE imm_videos SET parsed_season = video_id').run(); + assert.equal(repairLegacySeasonlessAnimeRows(db).repaired, 0); + const animeId = createAnime(db, 'Channel name'); + for (const matchConfidence of ['exact', 'weak', 'manual'] as const) { + assert.equal( + resolveAnimeAnilistConflict(db, channelId, 123, { matchConfidence }) + .anilistAssignmentBlocked, + true, + ); + } + updateAnimeAnilistInfo(db, videoId, { + anilistId: 123, + titleRomaji: 'Wrong title', + titleEnglish: null, + titleNative: null, + episodesTotal: 12, + }); + recordAnimeMergeRecommendation(db, channelId, animeId, 123); + assert.deepEqual(getAnimeMergeRecommendations(db), []); + assert.equal(getAnimeDetail(db, channelId)?.anilistId, null); + const fetcher = createCoverArtFetcher( + { + acquire: async () => { + assert.fail('YouTube must not query AniList'); + }, + recordResponse: () => {}, + }, + console, + ); + assert.equal(await fetcher.fetchIfMissing(db, videoId, 'Channel name'), false); + } finally { + db.close(); + } +}); + +test('startup reclassifies channels created by an older build after the schema upgrade', () => { + const db = new Database(':memory:'); + try { + ensureSchema(db); + // An old build omits media_kind when creating a channel in the upgraded DB. + const channelId = createAnime(db, 'youtube-channel:UCnew'); + const animeId = createAnime(db, 'Regular anime'); + const videoId = createVideo(db, 'older-build'); + db.prepare( + 'UPDATE imm_videos SET anime_id = ?, anime_assignment_locked = 1 WHERE video_id = ?', + ).run(channelId, videoId); + db.prepare( + 'INSERT INTO imm_lifetime_anime(anime_id, total_active_ms, total_cards) VALUES (?, 120000, 5)', + ).run(channelId); + assert.equal(getAnimeLibrary(db)[0]?.mediaKind, 'anime'); + ensureSchema(db); + const channel = getAnimeLibrary(db)[0]; + assert.equal(channel?.animeId, channelId); + assert.equal(channel?.mediaKind, 'youtube'); + assert.equal(channel?.totalActiveMs, 120000); + assert.equal(channel?.totalCards, 5); + assert.equal(linkYoutubeVideoToAnimeRecord(db, videoId, metadata), channelId); + const anime = db.prepare('SELECT media_kind FROM imm_anime WHERE anime_id = ?').get(animeId); + assert.ok(anime && typeof anime === 'object' && 'media_kind' in anime); + assert.equal(anime.media_kind, 'anime'); + } finally { + db.close(); + } +}); diff --git a/src/core/services/stats-sync/merge-catalog.ts b/src/core/services/stats-sync/merge-catalog.ts index a58b8d62..ec55e1a0 100644 --- a/src/core/services/stats-sync/merge-catalog.ts +++ b/src/core/services/stats-sync/merge-catalog.ts @@ -2,6 +2,7 @@ import { selectAll, selectOne, type SqlRow, type SyncDb } from './libsql-driver' import { insertRow, tableExists, type SyncMergeSummary } from './shared'; const ANIME_COPY_COLUMNS = [ + 'media_kind', 'normalized_title_key', 'canonical_title', 'anilist_id', diff --git a/src/core/services/stats-sync/merge-occurrences.test.ts b/src/core/services/stats-sync/merge-occurrences.test.ts index a8dbaffe..8413ca13 100644 --- a/src/core/services/stats-sync/merge-occurrences.test.ts +++ b/src/core/services/stats-sync/merge-occurrences.test.ts @@ -98,3 +98,37 @@ for (const legacyOccurrences of [false, true]) { } }); } + +test('sync preserves the YouTube media kind when adding a channel', () => { + const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-sync-youtube-')); + try { + const localPath = buildDb(dir, 'local.sqlite', { + word: '猫', + seenMs: BASE_MS, + legacyOccurrences: false, + }); + const remotePath = buildDb(dir, 'remote.sqlite', { + word: '犬', + seenMs: BASE_MS, + legacyOccurrences: false, + }); + const remote = new Database(remotePath); + remote.exec("UPDATE imm_anime SET media_kind = 'youtube'"); + remote.close(); + mergeSnapshotIntoDb(localPath, remotePath); + const local = new Database(localPath); + try { + const row = local + .prepare( + "SELECT media_kind FROM imm_anime WHERE normalized_title_key = 'key-remote.sqlite'", + ) + .get(); + assert.ok(row && typeof row === 'object' && 'media_kind' in row); + assert.equal(row.media_kind, 'youtube'); + } finally { + local.close(); + } + } finally { + fs.rmSync(dir, { recursive: true, force: true }); + } +}); diff --git a/src/shared/media-kind.ts b/src/shared/media-kind.ts new file mode 100644 index 00000000..5899bb58 --- /dev/null +++ b/src/shared/media-kind.ts @@ -0,0 +1,3 @@ +export const MEDIA_KINDS = ['anime', 'youtube'] as const; + +export type MediaKind = (typeof MEDIA_KINDS)[number]; diff --git a/src/types/stats-wire.ts b/src/types/stats-wire.ts index 40ff0865..c65e1d9f 100644 --- a/src/types/stats-wire.ts +++ b/src/types/stats-wire.ts @@ -1,3 +1,4 @@ +import type { MediaKind } from '../shared/media-kind'; export interface SessionSummary { sessionId: number; canonicalTitle: string | null; @@ -240,6 +241,7 @@ export const EventType = { export type EventType = (typeof EventType)[keyof typeof EventType]; export interface AnimeLibraryItem { + mediaKind: MediaKind; animeId: number; canonicalTitle: string; anilistId: number | null; @@ -261,6 +263,7 @@ export interface AnilistEntry { export interface AnimeDetailData { detail: { + mediaKind: MediaKind; animeId: number; canonicalTitle: string; anilistId: number | null; diff --git a/stats/src/components/anime/AnimeCard.test.tsx b/stats/src/components/anime/AnimeCard.test.tsx index bcbd3c00..7d087b31 100644 --- a/stats/src/components/anime/AnimeCard.test.tsx +++ b/stats/src/components/anime/AnimeCard.test.tsx @@ -7,6 +7,7 @@ test('AnimeCard includes linked AniList id in cover URLs to avoid stale library const markup = renderToStaticMarkup(
{anime.canonicalTitle}
- {anime.episodeCount} episode{anime.episodeCount !== 1 ? 's' : ''} + {anime.episodeCount} {anime.mediaKind === 'youtube' ? 'video' : 'episode'} + {anime.episodeCount !== 1 ? 's' : ''}
{formatDuration(anime.totalActiveMs)} · {formatNumber(anime.totalCards)} cards diff --git a/stats/src/components/anime/AnimeCoverImage.test.tsx b/stats/src/components/anime/AnimeCoverImage.test.tsx index dfaf927f..bed2148c 100644 --- a/stats/src/components/anime/AnimeCoverImage.test.tsx +++ b/stats/src/components/anime/AnimeCoverImage.test.tsx @@ -16,6 +16,7 @@ test('AnimeHeader uses the linked AniList id to avoid stale cached cover art', ( const markup = renderToStaticMarkup( Loading...
; if (error) return
Error: {error}
; - if (!data?.detail) return
Anime not found
; + if (!data?.detail) return
Library entry not found
; const { detail, episodes, anilistEntries } = data; @@ -226,6 +226,7 @@ export function AnimeDetailView({ { onEpisodeMoved?.(); @@ -237,7 +238,7 @@ export function AnimeDetailView({ /> - {showAnilistSelector && ( + {detail.mediaKind === 'anime' && showAnilistSelector && ( void { function libraryItem(animeId: number, title: string): AnimeLibraryItem { return { + mediaKind: 'anime', animeId, canonicalTitle: title, anilistId: null, diff --git a/stats/src/components/anime/AnimeHeader.test.tsx b/stats/src/components/anime/AnimeHeader.test.tsx index 9f542a37..3d19d0ca 100644 --- a/stats/src/components/anime/AnimeHeader.test.tsx +++ b/stats/src/components/anime/AnimeHeader.test.tsx @@ -6,6 +6,7 @@ import { confirmAnimeDelete, setDeleteConfirmPresenter } from '../../lib/delete- import type { AnimeDetailData } from '../../types/stats'; const DETAIL: AnimeDetailData['detail'] = { + mediaKind: 'anime', animeId: 3, canonicalTitle: 'Project Radio Noise Season 2', anilistId: 20661, @@ -69,3 +70,16 @@ test('confirmAnimeDelete spells out how much data the entry deletion removes', a assert.match(seen[1] ?? '', /3 episodes/); assert.match(seen[0] ?? '', /every session and stat/); }); + +test('YouTube channel headers show videos and omit all AniList controls', () => { + const markup = renderToStaticMarkup( + {}} + />, + ); + assert.match(markup, /YouTube channel/); + assert.match(markup, /video/); + assert.doesNotMatch(markup, /AniList|anilist\.co|episode/); +}); diff --git a/stats/src/components/anime/AnimeHeader.tsx b/stats/src/components/anime/AnimeHeader.tsx index a6871cc3..bbedb268 100644 --- a/stats/src/components/anime/AnimeHeader.tsx +++ b/stats/src/components/anime/AnimeHeader.tsx @@ -37,6 +37,7 @@ export function AnimeHeader({ onDeleteAnime, isDeletingAnime = false, }: AnimeHeaderProps) { + const isYoutube = detail.mediaKind === 'youtube'; const altTitles = [detail.titleRomaji, detail.titleEnglish, detail.titleNative].filter( (t): t is string => t != null && t !== detail.canonicalTitle, ); @@ -61,33 +62,36 @@ export function AnimeHeader({ )}
- {detail.episodeCount} episode{detail.episodeCount !== 1 ? 's' : ''} + {isYoutube ? 'YouTube channel · ' : ''} + {detail.episodeCount} {isYoutube ? 'video' : 'episode'} + {detail.episodeCount !== 1 ? 's' : ''}
- {anilistEntries.length > 0 ? ( - hasMultipleEntries ? ( - anilistEntries.map((entry) => ) - ) : ( + {!isYoutube && + (anilistEntries.length > 0 ? ( + hasMultipleEntries ? ( + anilistEntries.map((entry) => ) + ) : ( + + View on AniList {'\u2197'} + + ) + ) : detail.anilistId ? ( View on AniList {'\u2197'} - ) - ) : detail.anilistId ? ( - - View on AniList {'\u2197'} - - ) : null} - {onChangeAnilist && ( + ) : null)} + {!isYoutube && onChangeAnilist && ( + ))} +
{SORT_OPTIONS.map((opt) => ( ))} @@ -202,7 +234,15 @@ export function AnimeTab({ {selectionMode ? 'Cancel' : 'Select'}
- {filtered.length} titles · {formatDuration(totalMs)} + {filtered.length}{' '} + {mediaKind === 'youtube' + ? filtered.length === 1 + ? 'channel' + : 'channels' + : filtered.length === 1 + ? 'title' + : 'titles'}{' '} + · {formatDuration(totalMs)}
diff --git a/stats/src/components/anime/EpisodeList.tsx b/stats/src/components/anime/EpisodeList.tsx index daddafdc..80e62b3c 100644 --- a/stats/src/components/anime/EpisodeList.tsx +++ b/stats/src/components/anime/EpisodeList.tsx @@ -17,6 +17,7 @@ const HOVER_REVEALED = interface EpisodeListProps { episodes: AnimeEpisode[]; + isYoutube?: boolean; /** Entry these episodes currently belong to; excluded from the move picker. */ animeId?: number; onEpisodeDeleted?: () => void; @@ -27,6 +28,7 @@ interface EpisodeListProps { export function EpisodeList({ episodes: initialEpisodes, + isYoutube = false, animeId, onEpisodeDeleted, onEpisodeMoved, @@ -90,7 +92,7 @@ export function EpisodeList({ return (
-

Episodes

+

{isYoutube ? 'Videos' : 'Episodes'}

{watchedCount}/{episodes.length} watched @@ -178,7 +180,7 @@ export function EpisodeList({ onOpenDetail(ep.videoId); }} className="px-2 py-1 rounded border border-ctp-surface2 text-[11px] text-ctp-blue hover:border-ctp-blue/50 hover:bg-ctp-blue/10 transition-colors" - title="Open episode details" + title={isYoutube ? 'Open video details' : 'Open episode details'} > Details @@ -218,8 +220,8 @@ export function EpisodeList({ void handleDeleteEpisode(ep.videoId, ep.canonicalTitle); }} className={`w-5 h-5 rounded border border-ctp-surface2 text-transparent hover:border-ctp-red/50 hover:text-ctp-red focus-visible:text-ctp-red hover:bg-ctp-red/10 transition-colors text-xs flex items-center justify-center ${HOVER_REVEALED}`} - title="Delete episode" - aria-label="Delete episode" + title={isYoutube ? 'Delete video' : 'Delete episode'} + aria-label={isYoutube ? 'Delete video' : 'Delete episode'} > {'\u2715'} diff --git a/stats/src/components/anime/EpisodeMove.test.tsx b/stats/src/components/anime/EpisodeMove.test.tsx index 57a40966..acebee95 100644 --- a/stats/src/components/anime/EpisodeMove.test.tsx +++ b/stats/src/components/anime/EpisodeMove.test.tsx @@ -63,6 +63,7 @@ function episode(videoId: number, title: string): AnimeEpisode { function libraryItem(animeId: number, title: string): AnimeLibraryItem { return { + mediaKind: 'anime', animeId, canonicalTitle: title, anilistId: null, diff --git a/stats/src/lib/yomitan-lookup.test.tsx b/stats/src/lib/yomitan-lookup.test.tsx index 145f39d2..f364becc 100644 --- a/stats/src/lib/yomitan-lookup.test.tsx +++ b/stats/src/lib/yomitan-lookup.test.tsx @@ -116,6 +116,7 @@ test('AnimeOverviewStats renders aggregate Yomitan lookup metrics', () => { detail={{ animeId: 1, canonicalTitle: 'Anime', + mediaKind: 'anime', anilistId: null, titleRomaji: null, titleEnglish: null,