mirror of
https://github.com/4gray/iptvnator.git
synced 2026-10-11 19:46:16 -08:00
fix(tmdb): address director-pages review — split oversized spec, stable track keys, translated crew roles
- tmdb-merge.spec.ts grew past the 400-line lint ceiling — the Stalker
merge suite moved to tmdb-merge-stalker.spec.ts (fixes the CI Lint job).
- All cast/director chip loops now track by TMDB person id with an
index fallback ('p<id>' / 'i<index>') instead of member.name — distinct
people can share a name and creator payloads carry no dedup (greptile).
- Directing-only filmography credits carry the role in a new crewJob
field ('Director' | 'Creator') instead of stuffing TMDB's raw English
job into character; ActorViewComponent renders it through translated
labels (XTREAM.CREW_JOB_DIRECTOR/CREATOR, added to all 18 locales via
the i18n patch workflow, matching each locale's existing glossary —
pt "Diretor", de "Regisseur") (Codex).
Tests: person spec asserts character/crewJob separation; merge suites
green after the split (15 + stalker file).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
1 parent
d79c438aa1
commit
13ab41b99d
28 files changed
+196
-138
No files matched your search
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "الممثلون",
|
||||
"DIRECTOR": "المخرج",
|
||||
"SIMILAR": "مشابه",
|
||||
"CREW_JOB_DIRECTOR": "المخرج",
|
||||
"CREW_JOB_CREATOR": "المبتكر",
|
||||
"ACTOR_FILMOGRAPHY": "الأعمال الفنية",
|
||||
"ACTOR_FILTER_ALL": "الكل",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "هذه البوابة",
|
||||
|
||||
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "الممثلون",
|
||||
"DIRECTOR": "المخرج",
|
||||
"SIMILAR": "بحال هادو",
|
||||
"CREW_JOB_DIRECTOR": "المخرج",
|
||||
"CREW_JOB_CREATOR": "المبتكر",
|
||||
"ACTOR_FILMOGRAPHY": "الأفلام ديالو",
|
||||
"ACTOR_FILTER_ALL": "كلشي",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "هاد البوابة",
|
||||
|
||||
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "Акцёры",
|
||||
"DIRECTOR": "Рэжысёр",
|
||||
"SIMILAR": "Падобнае",
|
||||
"CREW_JOB_DIRECTOR": "Рэжысёр",
|
||||
"CREW_JOB_CREATOR": "Стваральнік",
|
||||
"ACTOR_FILMOGRAPHY": "Фільмаграфія",
|
||||
"ACTOR_FILTER_ALL": "Усе",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "Гэты партал",
|
||||
|
||||
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "Schauspieler",
|
||||
"DIRECTOR": "Regisseur",
|
||||
"SIMILAR": "Ähnliche Titel",
|
||||
"CREW_JOB_DIRECTOR": "Regisseur",
|
||||
"CREW_JOB_CREATOR": "Schöpfer",
|
||||
"ACTOR_FILMOGRAPHY": "Filmografie",
|
||||
"ACTOR_FILTER_ALL": "Alle",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "Dieses Portal",
|
||||
|
||||
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "Ηθοποιοί",
|
||||
"DIRECTOR": "Σκηνοθέτης",
|
||||
"SIMILAR": "Παρόμοια",
|
||||
"CREW_JOB_DIRECTOR": "Σκηνοθέτης",
|
||||
"CREW_JOB_CREATOR": "Δημιουργός",
|
||||
"ACTOR_FILMOGRAPHY": "Φιλμογραφία",
|
||||
"ACTOR_FILTER_ALL": "Όλα",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "Αυτή η πύλη",
|
||||
|
||||
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "Actors",
|
||||
"DIRECTOR": "Director",
|
||||
"SIMILAR": "Similar",
|
||||
"CREW_JOB_DIRECTOR": "Director",
|
||||
"CREW_JOB_CREATOR": "Creator",
|
||||
"ACTOR_FILMOGRAPHY": "Filmography",
|
||||
"ACTOR_FILTER_ALL": "All",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "This portal",
|
||||
|
||||
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "Actores",
|
||||
"DIRECTOR": "Director",
|
||||
"SIMILAR": "Similares",
|
||||
"CREW_JOB_DIRECTOR": "Director",
|
||||
"CREW_JOB_CREATOR": "Creador",
|
||||
"ACTOR_FILMOGRAPHY": "Filmografía",
|
||||
"ACTOR_FILTER_ALL": "Todas",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "Este portal",
|
||||
|
||||
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "Acteurs",
|
||||
"DIRECTOR": "Réalisateur",
|
||||
"SIMILAR": "Similaires",
|
||||
"CREW_JOB_DIRECTOR": "Réalisateur",
|
||||
"CREW_JOB_CREATOR": "Créateur",
|
||||
"ACTOR_FILMOGRAPHY": "Filmographie",
|
||||
"ACTOR_FILTER_ALL": "Tout",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "Ce portail",
|
||||
|
||||
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "Attori",
|
||||
"DIRECTOR": "Regista",
|
||||
"SIMILAR": "Simili",
|
||||
"CREW_JOB_DIRECTOR": "Regista",
|
||||
"CREW_JOB_CREATOR": "Ideatore",
|
||||
"ACTOR_FILMOGRAPHY": "Filmografia",
|
||||
"ACTOR_FILTER_ALL": "Tutti",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "Questo portale",
|
||||
|
||||
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "出演者",
|
||||
"DIRECTOR": "監督",
|
||||
"SIMILAR": "類似作品",
|
||||
"CREW_JOB_DIRECTOR": "監督",
|
||||
"CREW_JOB_CREATOR": "クリエイター",
|
||||
"ACTOR_FILMOGRAPHY": "出演作品",
|
||||
"ACTOR_FILTER_ALL": "すべて",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "このポータル",
|
||||
|
||||
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "배우",
|
||||
"DIRECTOR": "감독",
|
||||
"SIMILAR": "비슷한 콘텐츠",
|
||||
"CREW_JOB_DIRECTOR": "감독",
|
||||
"CREW_JOB_CREATOR": "크리에이터",
|
||||
"ACTOR_FILMOGRAPHY": "출연 작품",
|
||||
"ACTOR_FILTER_ALL": "전체",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "현재 포털",
|
||||
|
||||
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "Acteurs",
|
||||
"DIRECTOR": "Regisseur",
|
||||
"SIMILAR": "Vergelijkbaar",
|
||||
"CREW_JOB_DIRECTOR": "Regisseur",
|
||||
"CREW_JOB_CREATOR": "Bedenker",
|
||||
"ACTOR_FILMOGRAPHY": "Filmografie",
|
||||
"ACTOR_FILTER_ALL": "Alles",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "Dit portaal",
|
||||
|
||||
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "Aktorzy",
|
||||
"DIRECTOR": "Reżyser",
|
||||
"SIMILAR": "Podobne",
|
||||
"CREW_JOB_DIRECTOR": "Reżyser",
|
||||
"CREW_JOB_CREATOR": "Twórca",
|
||||
"ACTOR_FILMOGRAPHY": "Filmografia",
|
||||
"ACTOR_FILTER_ALL": "Wszystkie",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "Ten portal",
|
||||
|
||||
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "Atores",
|
||||
"DIRECTOR": "Diretor",
|
||||
"SIMILAR": "Semelhantes",
|
||||
"CREW_JOB_DIRECTOR": "Diretor",
|
||||
"CREW_JOB_CREATOR": "Criador",
|
||||
"ACTOR_FILMOGRAPHY": "Filmografia",
|
||||
"ACTOR_FILTER_ALL": "Todos",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "Este portal",
|
||||
|
||||
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "Актеры",
|
||||
"DIRECTOR": "Режиссёр",
|
||||
"SIMILAR": "Похожее",
|
||||
"CREW_JOB_DIRECTOR": "Режиссёр",
|
||||
"CREW_JOB_CREATOR": "Создатель",
|
||||
"ACTOR_FILMOGRAPHY": "Фильмография",
|
||||
"ACTOR_FILTER_ALL": "Все",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "Этот портал",
|
||||
|
||||
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "Oyuncular",
|
||||
"DIRECTOR": "Yönetmen",
|
||||
"SIMILAR": "Benzerler",
|
||||
"CREW_JOB_DIRECTOR": "Yönetmen",
|
||||
"CREW_JOB_CREATOR": "Yaratıcı",
|
||||
"ACTOR_FILMOGRAPHY": "Filmografi",
|
||||
"ACTOR_FILTER_ALL": "Tümü",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "Bu portal",
|
||||
|
||||
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "演员",
|
||||
"DIRECTOR": "导演",
|
||||
"SIMILAR": "类似影片",
|
||||
"CREW_JOB_DIRECTOR": "导演",
|
||||
"CREW_JOB_CREATOR": "主创",
|
||||
"ACTOR_FILMOGRAPHY": "参演作品",
|
||||
"ACTOR_FILTER_ALL": "全部",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "当前门户",
|
||||
|
||||
@@ -783,6 +783,8 @@
|
||||
"ACTORS": "演員",
|
||||
"DIRECTOR": "導演",
|
||||
"SIMILAR": "類似作品",
|
||||
"CREW_JOB_DIRECTOR": "導演",
|
||||
"CREW_JOB_CREATOR": "主創",
|
||||
"ACTOR_FILMOGRAPHY": "參演作品",
|
||||
"ACTOR_FILTER_ALL": "全部",
|
||||
"ACTOR_SCOPE_THIS_PORTAL": "目前入口",
|
||||
|
||||
+2
-2
@@ -37,7 +37,7 @@
|
||||
<div class="details__cast-strip">
|
||||
@for (
|
||||
member of serial.info.tmdb_cast;
|
||||
track member.name
|
||||
track member.tmdbPersonId ? 'p' + member.tmdbPersonId : 'i' + $index
|
||||
) {
|
||||
<span
|
||||
class="details__cast-chip"
|
||||
@@ -83,7 +83,7 @@
|
||||
<span class="label">{{ 'XTREAM.DIRECTOR' | translate }}</span>
|
||||
@if (serial.info.tmdb_directors?.length) {
|
||||
<div class="details__cast-strip">
|
||||
@for (member of serial.info.tmdb_directors; track member.name) {
|
||||
@for (member of serial.info.tmdb_directors; track member.tmdbPersonId ? 'p' + member.tmdbPersonId : 'i' + $index) {
|
||||
<span
|
||||
class="details__cast-chip"
|
||||
[class.details__cast-chip--clickable]="
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
<span class="label">{{ 'XTREAM.CAST' | translate }}</span>
|
||||
@if (info.tmdb_cast?.length) {
|
||||
<div class="details__cast-strip">
|
||||
@for (member of info.tmdb_cast; track member.name) {
|
||||
@for (member of info.tmdb_cast; track member.tmdbPersonId ? 'p' + member.tmdbPersonId : 'i' + $index) {
|
||||
<span
|
||||
class="details__cast-chip"
|
||||
[class.details__cast-chip--clickable]="
|
||||
@@ -82,7 +82,7 @@
|
||||
<span class="label">{{ 'XTREAM.DIRECTOR' | translate }}</span>
|
||||
@if (info.tmdb_directors?.length) {
|
||||
<div class="details__cast-strip">
|
||||
@for (member of info.tmdb_directors; track member.name) {
|
||||
@for (member of info.tmdb_directors; track member.tmdbPersonId ? 'p' + member.tmdbPersonId : 'i' + $index) {
|
||||
<span
|
||||
class="details__cast-chip"
|
||||
[class.details__cast-chip--clickable]="
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
<span class="label">{{ 'XTREAM.ACTORS' | translate }}</span>
|
||||
@if (info.tmdb_cast?.length) {
|
||||
<div class="details__cast-strip">
|
||||
@for (member of info.tmdb_cast; track member.name) {
|
||||
@for (member of info.tmdb_cast; track member.tmdbPersonId ? 'p' + member.tmdbPersonId : 'i' + $index) {
|
||||
<span
|
||||
class="details__cast-chip"
|
||||
[class.details__cast-chip--clickable]="
|
||||
@@ -84,7 +84,7 @@
|
||||
<span class="label">{{ 'XTREAM.DIRECTOR' | translate }}</span>
|
||||
@if (info.tmdb_directors?.length) {
|
||||
<div class="details__cast-strip">
|
||||
@for (member of info.tmdb_directors; track member.name) {
|
||||
@for (member of info.tmdb_directors; track member.tmdbPersonId ? 'p' + member.tmdbPersonId : 'i' + $index) {
|
||||
<span
|
||||
class="details__cast-chip"
|
||||
[class.details__cast-chip--clickable]="
|
||||
|
||||
@@ -0,0 +1,113 @@
|
||||
import { StalkerVodInfo } from '@iptvnator/shared/interfaces';
|
||||
import { mergeStalkerInfoWithTmdb } from './tmdb-merge';
|
||||
import { TmdbMovieDetails, TmdbTvDetails } from './tmdb.types';
|
||||
|
||||
describe('mergeStalkerInfoWithTmdb', () => {
|
||||
const providerStalkerInfo: StalkerVodInfo = {
|
||||
movie_image: '',
|
||||
description: '',
|
||||
name: 'Ирония судьбы, или С лёгким паром!',
|
||||
o_name: undefined,
|
||||
actors: 'Провайдерский актёр',
|
||||
director: '',
|
||||
releasedate: '1976',
|
||||
genre: '',
|
||||
rating_imdb: '',
|
||||
rating_kinopoisk: '8.1',
|
||||
};
|
||||
|
||||
const tmdbMovieRu: TmdbMovieDetails = {
|
||||
id: 20992,
|
||||
title: 'Ирония судьбы, или С лёгким паром!',
|
||||
overview: 'Описание из TMDB',
|
||||
genres: [{ id: 35, name: 'комедия' }],
|
||||
release_date: '1976-01-01',
|
||||
vote_average: 7.9,
|
||||
vote_count: 250,
|
||||
poster_path: '/irony-poster.jpg',
|
||||
backdrop_path: '/irony-backdrop.jpg',
|
||||
credits: {
|
||||
cast: [
|
||||
{
|
||||
name: 'Андрей Мягков',
|
||||
order: 0,
|
||||
profile_path: '/myagkov.jpg',
|
||||
},
|
||||
],
|
||||
crew: [{ id: 77, name: 'Эльдар Рязанов', job: 'Director' }],
|
||||
},
|
||||
};
|
||||
|
||||
it('prefers TMDB editorial fields and attaches cast/backdrop', () => {
|
||||
const merged = mergeStalkerInfoWithTmdb(
|
||||
providerStalkerInfo,
|
||||
tmdbMovieRu,
|
||||
'movie'
|
||||
);
|
||||
|
||||
expect(merged.description).toBe('Описание из TMDB');
|
||||
expect(merged.actors).toBe('Андрей Мягков');
|
||||
expect(merged.director).toBe('Эльдар Рязанов');
|
||||
expect(merged.tmdb_directors?.[0]).toEqual({
|
||||
name: 'Эльдар Рязанов',
|
||||
profileUrl: null,
|
||||
tmdbPersonId: 77,
|
||||
});
|
||||
expect(merged.genre).toBe('комедия');
|
||||
expect(merged.movie_image).toBe(
|
||||
'https://image.tmdb.org/t/p/w500/irony-poster.jpg'
|
||||
);
|
||||
expect(merged.tmdb_backdrop).toBe(
|
||||
'https://image.tmdb.org/t/p/w1280/irony-backdrop.jpg'
|
||||
);
|
||||
expect(merged.tmdb_cast).toEqual([
|
||||
{
|
||||
name: 'Андрей Мягков',
|
||||
profileUrl: 'https://image.tmdb.org/t/p/w185/myagkov.jpg',
|
||||
},
|
||||
]);
|
||||
// Provider keeps its own fields where TMDB should not win
|
||||
expect(merged.name).toBe('Ирония судьбы, или С лёгким паром!');
|
||||
expect(merged.rating_kinopoisk).toBe('8.1');
|
||||
expect(merged.releasedate).toBe('1976');
|
||||
});
|
||||
|
||||
it('only fills rating_imdb when the provider left it empty', () => {
|
||||
const merged = mergeStalkerInfoWithTmdb(
|
||||
providerStalkerInfo,
|
||||
tmdbMovieRu,
|
||||
'movie'
|
||||
);
|
||||
expect(merged.rating_imdb).toBe('7.9');
|
||||
|
||||
const withProviderRating = mergeStalkerInfoWithTmdb(
|
||||
{ ...providerStalkerInfo, rating_imdb: '8.4' },
|
||||
tmdbMovieRu,
|
||||
'movie'
|
||||
);
|
||||
expect(withProviderRating.rating_imdb).toBe('8.4');
|
||||
});
|
||||
|
||||
it('uses series creators as director for tv items', () => {
|
||||
const tv: TmdbTvDetails = {
|
||||
id: 1,
|
||||
overview: 'tv overview',
|
||||
created_by: [{ name: 'Создатель Сериала' }],
|
||||
};
|
||||
const merged = mergeStalkerInfoWithTmdb(providerStalkerInfo, tv, 'tv');
|
||||
expect(merged.director).toBe('Создатель Сериала');
|
||||
});
|
||||
|
||||
it('keeps provider values for missing TMDB fields', () => {
|
||||
const merged = mergeStalkerInfoWithTmdb(
|
||||
{ ...providerStalkerInfo, description: 'Провайдерский сюжет' },
|
||||
{ id: 20992 },
|
||||
'movie'
|
||||
);
|
||||
|
||||
expect(merged.description).toBe('Провайдерский сюжет');
|
||||
expect(merged.actors).toBe('Провайдерский актёр');
|
||||
expect(merged.tmdb_cast).toBeUndefined();
|
||||
expect(merged.tmdb_backdrop).toBeUndefined();
|
||||
});
|
||||
});
|
||||
@@ -1,13 +1,5 @@
|
||||
import {
|
||||
StalkerVodInfo,
|
||||
XtreamSerieInfo,
|
||||
XtreamVodInfo,
|
||||
} from '@iptvnator/shared/interfaces';
|
||||
import {
|
||||
mergeSerieInfoWithTmdb,
|
||||
mergeStalkerInfoWithTmdb,
|
||||
mergeVodInfoWithTmdb,
|
||||
} from './tmdb-merge';
|
||||
import { XtreamSerieInfo, XtreamVodInfo } from '@iptvnator/shared/interfaces';
|
||||
import { mergeSerieInfoWithTmdb, mergeVodInfoWithTmdb } from './tmdb-merge';
|
||||
import { TmdbMovieDetails, TmdbTvDetails } from './tmdb.types';
|
||||
|
||||
function providerVodInfo(overrides: Partial<XtreamVodInfo> = {}): XtreamVodInfo {
|
||||
@@ -311,113 +303,3 @@ describe('mergeSerieInfoWithTmdb', () => {
|
||||
expect(merged.cover).toBe('http://provider/cover.jpg');
|
||||
});
|
||||
});
|
||||
|
||||
describe('mergeStalkerInfoWithTmdb', () => {
|
||||
const providerStalkerInfo: StalkerVodInfo = {
|
||||
movie_image: '',
|
||||
description: '',
|
||||
name: 'Ирония судьбы, или С лёгким паром!',
|
||||
o_name: undefined,
|
||||
actors: 'Провайдерский актёр',
|
||||
director: '',
|
||||
releasedate: '1976',
|
||||
genre: '',
|
||||
rating_imdb: '',
|
||||
rating_kinopoisk: '8.1',
|
||||
};
|
||||
|
||||
const tmdbMovieRu: TmdbMovieDetails = {
|
||||
id: 20992,
|
||||
title: 'Ирония судьбы, или С лёгким паром!',
|
||||
overview: 'Описание из TMDB',
|
||||
genres: [{ id: 35, name: 'комедия' }],
|
||||
release_date: '1976-01-01',
|
||||
vote_average: 7.9,
|
||||
vote_count: 250,
|
||||
poster_path: '/irony-poster.jpg',
|
||||
backdrop_path: '/irony-backdrop.jpg',
|
||||
credits: {
|
||||
cast: [
|
||||
{
|
||||
name: 'Андрей Мягков',
|
||||
order: 0,
|
||||
profile_path: '/myagkov.jpg',
|
||||
},
|
||||
],
|
||||
crew: [{ id: 77, name: 'Эльдар Рязанов', job: 'Director' }],
|
||||
},
|
||||
};
|
||||
|
||||
it('prefers TMDB editorial fields and attaches cast/backdrop', () => {
|
||||
const merged = mergeStalkerInfoWithTmdb(
|
||||
providerStalkerInfo,
|
||||
tmdbMovieRu,
|
||||
'movie'
|
||||
);
|
||||
|
||||
expect(merged.description).toBe('Описание из TMDB');
|
||||
expect(merged.actors).toBe('Андрей Мягков');
|
||||
expect(merged.director).toBe('Эльдар Рязанов');
|
||||
expect(merged.tmdb_directors?.[0]).toEqual({
|
||||
name: 'Эльдар Рязанов',
|
||||
profileUrl: null,
|
||||
tmdbPersonId: 77,
|
||||
});
|
||||
expect(merged.genre).toBe('комедия');
|
||||
expect(merged.movie_image).toBe(
|
||||
'https://image.tmdb.org/t/p/w500/irony-poster.jpg'
|
||||
);
|
||||
expect(merged.tmdb_backdrop).toBe(
|
||||
'https://image.tmdb.org/t/p/w1280/irony-backdrop.jpg'
|
||||
);
|
||||
expect(merged.tmdb_cast).toEqual([
|
||||
{
|
||||
name: 'Андрей Мягков',
|
||||
profileUrl: 'https://image.tmdb.org/t/p/w185/myagkov.jpg',
|
||||
},
|
||||
]);
|
||||
// Provider keeps its own fields where TMDB should not win
|
||||
expect(merged.name).toBe('Ирония судьбы, или С лёгким паром!');
|
||||
expect(merged.rating_kinopoisk).toBe('8.1');
|
||||
expect(merged.releasedate).toBe('1976');
|
||||
});
|
||||
|
||||
it('only fills rating_imdb when the provider left it empty', () => {
|
||||
const merged = mergeStalkerInfoWithTmdb(
|
||||
providerStalkerInfo,
|
||||
tmdbMovieRu,
|
||||
'movie'
|
||||
);
|
||||
expect(merged.rating_imdb).toBe('7.9');
|
||||
|
||||
const withProviderRating = mergeStalkerInfoWithTmdb(
|
||||
{ ...providerStalkerInfo, rating_imdb: '8.4' },
|
||||
tmdbMovieRu,
|
||||
'movie'
|
||||
);
|
||||
expect(withProviderRating.rating_imdb).toBe('8.4');
|
||||
});
|
||||
|
||||
it('uses series creators as director for tv items', () => {
|
||||
const tv: TmdbTvDetails = {
|
||||
id: 1,
|
||||
overview: 'tv overview',
|
||||
created_by: [{ name: 'Создатель Сериала' }],
|
||||
};
|
||||
const merged = mergeStalkerInfoWithTmdb(providerStalkerInfo, tv, 'tv');
|
||||
expect(merged.director).toBe('Создатель Сериала');
|
||||
});
|
||||
|
||||
it('keeps provider values for missing TMDB fields', () => {
|
||||
const merged = mergeStalkerInfoWithTmdb(
|
||||
{ ...providerStalkerInfo, description: 'Провайдерский сюжет' },
|
||||
{ id: 20992 },
|
||||
'movie'
|
||||
);
|
||||
|
||||
expect(merged.description).toBe('Провайдерский сюжет');
|
||||
expect(merged.actors).toBe('Провайдерский актёр');
|
||||
expect(merged.tmdb_cast).toBeUndefined();
|
||||
expect(merged.tmdb_backdrop).toBeUndefined();
|
||||
});
|
||||
});
|
||||
@@ -90,6 +90,7 @@ describe('mapPersonFilmography', () => {
|
||||
year: 1999,
|
||||
posterUrl: 'https://image.tmdb.org/t/p/w500/fc.jpg',
|
||||
character: 'Tyler Durden',
|
||||
crewJob: null,
|
||||
});
|
||||
expect(credits[2].mediaType).toBe('tv');
|
||||
// Undated entries sort last
|
||||
@@ -99,7 +100,8 @@ describe('mapPersonFilmography', () => {
|
||||
it('includes directing credits from the crew, acting wins the dedup', () => {
|
||||
const credits = mapPersonFilmography(person);
|
||||
|
||||
// Directed-only title appears with the job in the character slot
|
||||
// Directed-only title carries the role separately from character,
|
||||
// so the UI can render it through a translated label
|
||||
const departed = credits.find((credit) => credit.tmdbId === 1422);
|
||||
expect(departed).toEqual({
|
||||
tmdbId: 1422,
|
||||
@@ -107,7 +109,8 @@ describe('mapPersonFilmography', () => {
|
||||
title: 'The Departed',
|
||||
year: 2006,
|
||||
posterUrl: null,
|
||||
character: 'Director',
|
||||
character: null,
|
||||
crewJob: 'Director',
|
||||
});
|
||||
|
||||
// Non-director crew jobs (Producer) are not part of the filmography
|
||||
@@ -118,6 +121,7 @@ describe('mapPersonFilmography', () => {
|
||||
// Fight Club was acted AND directed — the acting credit wins
|
||||
const fightClub = credits.find((credit) => credit.tmdbId === 550);
|
||||
expect(fightClub?.character).toBe('Tyler Durden');
|
||||
expect(fightClub?.crewJob).toBeNull();
|
||||
});
|
||||
|
||||
it('handles a person without credits', () => {
|
||||
|
||||
@@ -17,19 +17,30 @@ export interface ActorProfile {
|
||||
photoUrl: string | null;
|
||||
}
|
||||
|
||||
export type ActorCrewJob = 'Director' | 'Creator';
|
||||
|
||||
export interface ActorFilmographyCredit {
|
||||
tmdbId: number;
|
||||
mediaType: 'movie' | 'tv';
|
||||
title: string;
|
||||
year: number | null;
|
||||
posterUrl: string | null;
|
||||
/** Character (acting credits) or job like "Director" (crew credits) */
|
||||
/** Character name for acting credits, null for crew-only credits */
|
||||
character: string | null;
|
||||
/**
|
||||
* Crew role for directing-only credits — kept separate from
|
||||
* `character` so the UI can render it through translated labels
|
||||
* instead of TMDB's raw English job string.
|
||||
*/
|
||||
crewJob: ActorCrewJob | null;
|
||||
}
|
||||
|
||||
const MAX_FILMOGRAPHY_CREDITS = 80;
|
||||
/** Crew jobs worth showing on the person page (directors, TV creators) */
|
||||
const FILMOGRAPHY_CREW_JOBS = new Set(['Director', 'Creator']);
|
||||
const FILMOGRAPHY_CREW_JOBS = new Set<string>([
|
||||
'Director',
|
||||
'Creator',
|
||||
] satisfies ActorCrewJob[]);
|
||||
|
||||
export function mapPersonProfile(person: TmdbPersonDetails): ActorProfile {
|
||||
return {
|
||||
@@ -48,7 +59,7 @@ export function mapPersonProfile(person: TmdbPersonDetails): ActorProfile {
|
||||
* first (undated entries last), capped at {@link MAX_FILMOGRAPHY_CREDITS}.
|
||||
* Acting credits win the dedup so "Actor — Character" survives when a
|
||||
* person both starred in and directed the same title; directing-only
|
||||
* titles show the job ("Director") in the character slot.
|
||||
* titles carry the crew role in `crewJob` for translated rendering.
|
||||
*/
|
||||
export function mapPersonFilmography(
|
||||
person: TmdbPersonDetails
|
||||
@@ -56,12 +67,14 @@ export function mapPersonFilmography(
|
||||
const seen = new Set<string>();
|
||||
const credits: ActorFilmographyCredit[] = [];
|
||||
|
||||
const castCredits = person.combined_credits?.cast ?? [];
|
||||
const crewCredits = (person.combined_credits?.crew ?? []).filter(
|
||||
(credit) => credit.job && FILMOGRAPHY_CREW_JOBS.has(credit.job)
|
||||
const castCredits = (person.combined_credits?.cast ?? []).map(
|
||||
(credit) => ({ credit, crewJob: null as ActorCrewJob | null })
|
||||
);
|
||||
const crewCredits = (person.combined_credits?.crew ?? [])
|
||||
.filter((credit) => credit.job && FILMOGRAPHY_CREW_JOBS.has(credit.job))
|
||||
.map((credit) => ({ credit, crewJob: credit.job as ActorCrewJob }));
|
||||
|
||||
for (const credit of [...castCredits, ...crewCredits]) {
|
||||
for (const { credit, crewJob } of [...castCredits, ...crewCredits]) {
|
||||
const mediaType =
|
||||
credit.media_type === 'movie' || credit.media_type === 'tv'
|
||||
? credit.media_type
|
||||
@@ -79,7 +92,8 @@ export function mapPersonFilmography(
|
||||
title,
|
||||
year: extractYear(credit.release_date ?? credit.first_air_date),
|
||||
posterUrl: tmdbPosterUrl(credit.poster_path),
|
||||
character: credit.character?.trim() || credit.job?.trim() || null,
|
||||
character: credit.character?.trim() || null,
|
||||
crewJob,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
<span class="label">{{ 'XTREAM.ACTORS' | translate }}</span>
|
||||
@if (meta.tmdbCast?.length) {
|
||||
<div class="details__cast-strip">
|
||||
@for (member of meta.tmdbCast; track member.name) {
|
||||
@for (member of meta.tmdbCast; track member.tmdbPersonId ? 'p' + member.tmdbPersonId : 'i' + $index) {
|
||||
<span
|
||||
class="details__cast-chip"
|
||||
[class.details__cast-chip--clickable]="
|
||||
@@ -80,7 +80,7 @@
|
||||
<span class="label">{{ 'XTREAM.DIRECTOR' | translate }}</span>
|
||||
@if (meta.tmdbDirectors?.length) {
|
||||
<div class="details__cast-strip">
|
||||
@for (member of meta.tmdbDirectors; track member.name) {
|
||||
@for (member of meta.tmdbDirectors; track member.tmdbPersonId ? 'p' + member.tmdbPersonId : 'i' + $index) {
|
||||
<span
|
||||
class="details__cast-chip"
|
||||
[class.details__cast-chip--clickable]="
|
||||
|
||||
@@ -165,6 +165,8 @@
|
||||
}
|
||||
@if (item.character) {
|
||||
· {{ item.character }}
|
||||
} @else if (item.crewJob) {
|
||||
· {{ crewJobKey(item.crewJob) | translate }}
|
||||
}
|
||||
</span>
|
||||
</button>
|
||||
|
||||
@@ -52,6 +52,13 @@ export class ActorViewComponent {
|
||||
|
||||
readonly filterMode = signal<'all' | 'available'>('all');
|
||||
|
||||
/** Translated label key for a crew-only credit ("Director"/"Creator") */
|
||||
crewJobKey(job: 'Director' | 'Creator'): string {
|
||||
return job === 'Creator'
|
||||
? 'XTREAM.CREW_JOB_CREATOR'
|
||||
: 'XTREAM.CREW_JOB_DIRECTOR';
|
||||
}
|
||||
|
||||
readonly visibleItems = computed(() =>
|
||||
this.showAvailabilityFilter() && this.filterMode() === 'available'
|
||||
? this.items().filter((item) => item.available)
|
||||
|
||||
Reference in new issue
Block a user