Projets/NewTube
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(video): uniformiser classification et routage par section
CI / build-and-test (push) Successful in 14m9s
Details

Browse Source 
Source unique de classification (video-kind.ts) + politique de section centralisee (section-policy.ts). Les composants ne portent plus de seuils ni de regles de type maison.

- section-policy.ts: sectionAccepts / routeForVideo / shortsFeedAccepts /
  isPlayable + classifyOnce (enrichissement _kind a l'ingestion)
- watch-short: separe classification (shortsFeedAccepts) et jouabilite
  (isPlayable: allowEmbed DM, live/channel Twitch, Rumble 404); supprime le
  seuil Rumble 90 s et l'import YOUTUBE_SHORT_MAX_SECONDS du composant
- home: filtre sectionAccepts(...,'home') (plus de shorts dans le trending),
  routeForVideo, pagination bouclee (min 20, max 5 iterations)
- themes: _kind pre-calcule une fois, sectionAccepts, capacites live lues
  depuis le registre providers (fin de LIVE_PROVIDERS codes en dur)
- video-kind: helpers isNativeVerticalProvider / hasKnownDuration
- routes: alias /shorts/:id et /live/:id pour routeForVideo
- tests: section-policy.spec.ts + video-kind.spec.ts etendus; npm run test:section
This commit is contained in:
bruno
2026-09-29 13:34:58 -04:00
parent f443a470f9
commit 983c6cb5ab
15 changed files with 482 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/home/home.component.html
+1 -1
View File
@@ -21,7 +21,7 @@
} @else {
<div class="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-x-6 gap-y-8">
@for (video of trendingVideos(); track video.videoId) {
<a [routerLink]="['/watch', video.videoId]" [queryParams]="watchQueryParams(video)" [state]="{ video }" class="group flex flex-col bg-slate-800/50 rounded-lg overflow-hidden hover:bg-slate-700/50 transition-all duration-300 transform hover:-translate-y-1">
<a [routerLink]="routeForVideo(video)" [queryParams]="watchQueryParams(video)" [state]="{ video }" class="group flex flex-col bg-slate-800/50 rounded-lg overflow-hidden hover:bg-slate-700/50 transition-all duration-300 transform hover:-translate-y-1">
<div class="relative">
<img [src]="video.thumbnail" [alt]="video.title" class="w-full h-48 object-cover transition-transform duration-300 group-hover:scale-105">
<div class="absolute top-2 right-2">
src/components/home/home.component.ts
+48 -19
View File
@@ -11,6 +11,7 @@ import { TranslatePipe } from '../../pipes/translate.pipe';
import { LikeButtonComponent } from '../shared/components/like-button/like-button.component';
import { ProviderBadgeComponent } from '../../app/shared/components/provider-badge/provider-badge.component';
import { DurationPipe } from '../../app/shared/pipes/duration.pipe';
import { sectionAccepts, routeForVideo as routeForVideoPolicy, classifyOnce } from '../../app/shared/utils/section-policy';
@Component({
selector: 'app-home',
@@ -71,6 +72,10 @@ export class HomeComponent {
this.fetchNextPage();
}
// ponytail: garde-fous anti-boucle si le trending est saturé de shorts verticaux.
private static readonly HOME_PAGE_MIN = 20;
private static readonly HOME_MAX_ITERATIONS = 5;
fetchNextPage() {
if (this.busyMore()) return;
const readiness = this.instances.getProviderReadiness();
@@ -79,28 +84,47 @@ export class HomeComponent {
return;
}
this.busyMore.set(true);
this.fetchHomePage(0);
}
/**
* Le trending brut mélange shorts verticaux et vidéos : on classe chaque
* item UNE fois (`classifyOnce`) puis on n'accepte que les vidéos classiques
* (`sectionAccepts(..., 'home')`). On enchaîne les pages tant que la page
* reste incomplète, avec garde-fou pour ne jamais produire de vide silencieux.
*/
private fetchHomePage(iteration: number): void {
this.apiService.getTrendingPage(this.nextCursor()).subscribe({
next: res => {
const merged = [...this.trendingVideos(), ...res.items];
this.trendingVideos.set(merged);
this.nextCursor.set(res.nextCursor || null);
this.busyMore.set(false);
this.loading.set(false);
const provider = this.instances.selectedProvider();
if (merged.length === 0 && !this.notice()) {
const readiness2 = this.instances.getProviderReadiness();
if (!readiness2.ready) {
this.notice.set(readiness2.reason || 'Le provider sélectionné n\'est pas prêt.');
} else if (provider === 'youtube') {
this.notice.set('Aucune vidéo tendance YouTube chargée. Vérifiez que votre YOUTUBE_API_KEY est valide et que les restrictions HTTP referrer incluent http://localhost:4200/*.');
} else if (provider === 'peertube') {
const inst = this.instances.activePeerTubeInstance();
this.notice.set(`PeerTube: les vidéos ne sont pas disponibles depuis l'instance "${inst}" pour le moment. Essayez une autre instance dans l'en-tête.`);
} else if (provider === 'rumble') {
const label = this.instances.selectedProviderLabel();
this.notice.set(`Les vidéos ne sont pas disponibles pour le provider "${label}" pour le moment. Réessayez plus tard ou choisissez un autre provider.`);
const accepted = (res.items || [])
.map((v: Video) => classifyOnce(v))
.filter(v => sectionAccepts(v, 'home'));
const merged = [...this.trendingVideos(), ...accepted];
this.trendingVideos.set(merged);
this.nextCursor.set(res.nextCursor || null);
const hasMore = !!res.nextCursor;
const needMore = accepted.length === 0 || merged.length < HomeComponent.HOME_PAGE_MIN;
if (hasMore && needMore && iteration < HomeComponent.HOME_MAX_ITERATIONS - 1) {
this.fetchHomePage(iteration + 1);
return;
}
this.busyMore.set(false);
this.loading.set(false);
const provider = this.instances.selectedProvider();
if (merged.length === 0 && !this.notice()) {
const readiness2 = this.instances.getProviderReadiness();
if (!readiness2.ready) {
this.notice.set(readiness2.reason || 'Le provider sélectionné n\'est pas prêt.');
} else if (provider === 'youtube') {
this.notice.set('Aucune vidéo tendance YouTube chargée. Vérifiez que votre YOUTUBE_API_KEY est valide et que les restrictions HTTP referrer incluent http://localhost:4200/*.');
} else if (provider === 'peertube') {
const inst = this.instances.activePeerTubeInstance();
this.notice.set(`PeerTube: les vidéos ne sont pas disponibles depuis l'instance "${inst}" pour le moment. Essayez une autre instance dans l'en-tête.`);
} else if (provider === 'rumble') {
const label = this.instances.selectedProviderLabel();
this.notice.set(`Les vidéos ne sont pas disponibles pour le provider "${label}" pour le moment. Réessayez plus tard ou choisissez un autre provider.`);
}
}
}
},
// Never leave the infinite scroll stuck: release flags so scrolling retries.
error: () => {
@@ -115,6 +139,11 @@ export class HomeComponent {
});
}
/** Routage d'une carte (policy centrale) : vidéo classique ⇒ /watch. */
routeForVideo(v: Video): string {
return routeForVideoPolicy(v, 'home');
}
formatViews(views: number): string {
if (views >= 1_000_000_000) {
return (views / 1_000_000_000).toFixed(1) + 'B';
src/components/shorts/watch-short.component.ts
+41 -53
View File
@@ -13,10 +13,7 @@ import { DownloadService } from '../../services/download.service';
import { SubscriptionsService, GROUP_ICON_KEYWORDS } from '../../services/subscriptions.service';
import { AuthService } from '../../services/auth.service';
import { Video } from '../../models/video.model';
import { isShortVideo, YOUTUBE_SHORT_MAX_SECONDS } from '../../app/shared/utils/video-kind';
/** Durée max d'un Short Rumble natif (rumble.com/shorts : vertical ≤ 90 s). */
const RUMBLE_SHORT_MAX_SECONDS = 90;
import { shortsFeedAccepts, isPlayable as isPlayablePolicy, type PlayableContext } from '../../app/shared/utils/section-policy';
/** Provider long (youtube…) -> id court d'abonnement ('yt'…). */
const SUB_PROVIDER_OF: Record<string, 'yt' | 'dm' | 'tw' | 'pt' | 'od' | 'ru'> = {
@@ -374,10 +371,11 @@ export class WatchShortComponent implements OnDestroy {
const ids = Array.from(new Set(list.map(v => v.videoId))).slice(0, 50);
try {
const durations = await firstValueFrom(this.api.getYouTubeDurations(ids));
return list.filter(v => {
const d = durations?.[v.videoId] ?? 0;
return d > 0 && d <= YOUTUBE_SHORT_MAX_SECONDS;
});
// Durée issue de videos.list appliquée à l'item, puis classification centrale.
return list.filter(v => shortsFeedAccepts(
{ ...(v as object), duration: durations?.[v.videoId] ?? 0, provider: 'youtube' } as Video,
'youtube',
));
} catch {
return [];
}
@@ -390,15 +388,13 @@ export class WatchShortComponent implements OnDestroy {
* Les durées -1 (= non-embeddable, erreur 153) sont toujours exclues.
*/
private async pickYouTubeShorts(list: Video[]): Promise<Video[]> {
const shorts = list.filter(v =>
typeof v.duration === 'number' && v.duration > 0 && v.duration <= YOUTUBE_SHORT_MAX_SECONDS
);
const shorts = list.filter(v => shortsFeedAccepts({ ...(v as object), provider: 'youtube' } as Video, 'youtube'));
const allKnown = list.every(v => typeof v.duration === 'number' && v.duration !== 0);
if (shorts.length > 0 || allKnown) return shorts;
// Certaines durées manquent : on les récupère au lieu de jeter les vidéos.
const missing = list.filter(v => typeof v.duration !== 'number' || v.duration === 0);
const fetched = await this.filterYouTubeShorts(missing);
return [...shorts, ...fetched.filter(v => this.isShort(v))];
return [...shorts, ...fetched.filter(v => this.accepts(v))];
}
constructor() {
@@ -815,7 +811,7 @@ export class WatchShortComponent implements OnDestroy {
const byProvider: Video[][] = defs.map((d, i) => {
const raw = ((pages[i]?.items || []) as Video[]).filter(v => !!v?.videoId);
const list = raw.filter(v =>
this.isShort({ ...v, provider: d.provider } as Video) &&
this.accepts({ ...v, provider: d.provider } as Video) &&
(d.provider !== 'twitch' || this.shortsLangOk({ ...v, provider: d.provider } as Video))
);
// Mélange léger par sujet pour varier l'ordre à chaque visite.
@@ -927,7 +923,7 @@ export class WatchShortComponent implements OnDestroy {
next: (res: { items: Video[]; nextCursor?: string | null }) => {
const raw: Video[] = (res.items || []).filter((v: Video) => !!v.videoId);
// Langue utilisateur + double sécurité anti "time machine".
this.twitchShortsReady(raw.filter((v: Video) => this.isShort(v))).subscribe({
this.twitchShortsReady(raw.filter((v: Video) => this.accepts(v))).subscribe({
next: (filtered) => {
const list: Video[] = this.dedup(filtered);
this.items.set(list);
@@ -966,7 +962,7 @@ export class WatchShortComponent implements OnDestroy {
this.api.searchTwitchClipsPage(q)?.subscribe({
next: (res) => {
const raw = (res?.items || []).filter(v => !!v.videoId);
const shorts = raw.filter(v => this.isShort(v));
const shorts = raw.filter(v => this.accepts(v));
// Langue utilisateur + validation (recherche non validée côté service).
this.twitchShortsReady(shorts).subscribe({
next: (filtered) => {
@@ -1021,7 +1017,7 @@ export class WatchShortComponent implements OnDestroy {
};
if (this.provider() === 'youtube' && raw.length) {
this.pickYouTubeShorts(raw).then(list => {
const shorts = this.dedup(list.filter(v => this.isShort(v)));
const shorts = this.dedup(list.filter(v => this.accepts(v)));
if (shorts.length > 0) show(shorts);
else if (allowAltQuery) this.tryNextShortsQueryOrTrending();
else this.loadTrendingFallback();
@@ -1031,7 +1027,7 @@ export class WatchShortComponent implements OnDestroy {
});
return;
}
const list = this.dedup(raw.filter(v => this.isShort(v)));
const list = this.dedup(raw.filter(v => this.accepts(v)));
if (list.length > 0) show(list);
else if (allowAltQuery) this.tryNextShortsQueryOrTrending();
else this.loadTrendingFallback();
@@ -1067,9 +1063,9 @@ export class WatchShortComponent implements OnDestroy {
this.loading.set(false);
};
if (p === 'youtube' && raw.length) {
this.filterYouTubeShorts(raw).then(list => apply(list.filter(v => this.isShort(v)))).catch(() => apply([]));
this.filterYouTubeShorts(raw).then(list => apply(list.filter(v => this.accepts(v)))).catch(() => apply([]));
} else {
apply(raw.filter(v => this.isShort(v)));
apply(raw.filter(v => this.accepts(v)));
}
},
error: () => {
@@ -1079,38 +1075,30 @@ export class WatchShortComponent implements OnDestroy {
});
}
// Filtre Shorts — classification partagée, avec tolérance pour les
// providers dont les durées sont souvent inconnues (Rumble/Odysee : le
// scraper renvoie 0) afin de ne jamais afficher une page vide.
private isShort(v: Video): boolean {
const p = (v as any).provider || this.provider();
// Dailymotion : embed désactivé par le propriétaire (allow_embed=false)
// => le player répond "Forbidden" : on exclut avant même l'embed.
if (String(p) === 'dailymotion' && (v as any)?.raw?.allowEmbed === false) return false;
if (String(p) === 'twitch') {
const kind = String((v as any).kind || '').toLowerCase();
if (kind === 'clip') return true;
// Les lives/channels ne sont jamais des Shorts.
const type = String((v as any).type || '').toLowerCase();
if (type === 'live' || type === 'channel' || type === 'stream') return false;
/**
* Le feed accepte-t-il cet item ? Séparation stricte :
* - classification : `shortsFeedAccepts` (centre video-kind/section-policy,
* tolérance « durée inconnue » Rumble/Odysee incluse) ;
* - jouabilité : `isPlayable` (allowEmbed, lives/chaînes Twitch, Rumble 404).
*/
private accepts(v: Video): boolean {
const p = String((v as any).provider || this.provider()).toLowerCase();
const withProvider = { ...(v as object), provider: p } as Video;
return shortsFeedAccepts(withProvider, p) && this.isPlayable(withProvider);
}
/** Jouabilité : l'embed répondra-t-il ? (indépendant du type de contenu) */
private isPlayable(v: Video): boolean {
const p = String((v as any).provider || this.provider()).toLowerCase();
const ctx: PlayableContext = { provider: p };
if (p === 'rumble') {
const id = this.rumbleIdOf(v);
if (id) {
ctx.rumbleResolved = !!this.resolvedRumbleEmbed()[id];
ctx.rumbleFailed = this.rumbleEmbedFailed.has(id);
}
}
const d = Number((v as any).duration || 0);
if (String(p) === 'rumble') {
// Shorts natifs Rumble : vertical ≤ 90 s. Durée inconnue : on garde
// (le flux /shorts natif ne contient que du vertical).
if ((v as any).isShort === true && (d <= 0 || d <= RUMBLE_SHORT_MAX_SECONDS)) return true;
if (!(d > 0)) return true;
return d <= RUMBLE_SHORT_MAX_SECONDS;
}
if ((v as any).isShort === true) {
if (d > 0 && d > 75) return false;
return true;
}
if (String(p) === 'odysee' && !(d > 0)) {
// Durée inconnue : on garde la vidéo (flux infini) plutôt qu'un vide.
return true;
}
return isShortVideo({ ...(v as object), provider: p } as Parameters<typeof isShortVideo>[0]);
return isPlayablePolicy(v, ctx);
}
/**
@@ -1267,16 +1255,16 @@ export class WatchShortComponent implements OnDestroy {
this.busyMore.set(false);
};
if (p === 'youtube' && raw.length) {
this.pickYouTubeShorts(raw).then((list: Video[]) => apply(list.filter((v: Video) => this.isShort(v)))).catch(() => { apply([]); });
this.pickYouTubeShorts(raw).then((list: Video[]) => apply(list.filter((v: Video) => this.accepts(v)))).catch(() => { apply([]); });
} else if (p === 'twitch' && raw.length) {
// Langue utilisateur + clips paginés non tous validés côté service.
const shorts = raw.filter((v: Video) => this.isShort(v));
const shorts = raw.filter((v: Video) => this.accepts(v));
this.twitchShortsReady(shorts).subscribe({
next: (clean) => apply(clean),
error: () => apply(shorts),
});
} else {
apply(raw.filter((v: Video) => this.isShort(v)));
apply(raw.filter((v: Video) => this.accepts(v)));
}
}
src/components/themes/provider-theme-page.component.html
+1 -1
View File
@@ -172,7 +172,7 @@
<div class="absolute top-2 left-2 flex gap-1">
<span *ngIf="isLiveCard(v)" class="bg-purple-600 text-white text-[11px] font-bold px-1.5 py-0.5 rounded">LIVE</span>
<span *ngIf="!isLiveCard(v) && isClipCard(v)" class="bg-red-600 text-white text-[11px] font-bold px-1.5 py-0.5 rounded">CLIP</span>
<span *ngIf="!isLiveCard(v) && kindOf(v) === 'short' && !isClipCard(v)" class="bg-red-600 text-white text-[11px] font-bold px-1.5 py-0.5 rounded">SHORT</span>
<span *ngIf="!isLiveCard(v) && v._kind === 'short' && !isClipCard(v)" class="bg-red-600 text-white text-[11px] font-bold px-1.5 py-0.5 rounded">SHORT</span>
<span *ngIf="isChannelCard(v)" class="bg-slate-700/90 text-slate-200 text-[11px] font-bold px-1.5 py-0.5 rounded ring-1 ring-slate-500/50">CHAÎNE</span>
</div>
<div *ngIf="v.duration && v.duration > 0" class="absolute bottom-2 right-2 bg-black/75 text-white text-xs px-2 py-1 rounded-md font-mono">
src/components/themes/provider-theme-page.component.ts
+40 -82
View File
@@ -12,7 +12,8 @@ import { DurationPipe } from '../../app/shared/pipes/duration.pipe';
import { ProviderBadgeComponent } from '../../app/shared/components/provider-badge/provider-badge.component';
import { ChannelIdentityComponent } from '../../app/shared/components/channel-identity/channel-identity.component';
import { InfiniteAnchorComponent } from '../shared/infinite-anchor/infinite-anchor.component';
import { classifyVideo, isLiveVideo, isShortVideo } from '../../app/shared/utils/video-kind';
import { classifyOnce, type WithKind } from '../../app/shared/utils/section-policy';
import { providerSupportsLive } from '../../app/core/providers/provider-registry';
import { map, of, switchMap, catchError, forkJoin, Observable } from 'rxjs';
import { timeout } from 'rxjs/operators';
import { PagedResult } from '../../services/youtube-api.service';
@@ -73,7 +74,7 @@ export class ProviderThemePageComponent implements OnDestroy {
date = signal<'any' | 'day' | 'week' | 'month' | 'year'>('any');
// Data state
allVideos = signal<Video[]>([]);
allVideos = signal<WithKind<Video>[]>([]);
nextCursor = signal<string | null>(null);
// Curseurs par section Twitch (les paginations Helix sont indépendantes).
private twitchCursors = { live: null as string | null, vod: null as string | null, clip: null as string | null, channel: null as string | null };
@@ -96,39 +97,20 @@ export class ProviderThemePageComponent implements OnDestroy {
return this.applyFiltersWithType(this.allVideos(), 'any');
}
twitchLives = computed(() => {
const p = this.provider();
return this.twitchFilteredNoType().filter(v =>
isLiveVideo({ ...v, provider: (v.provider as string) || p }));
});
twitchVods = computed(() => {
const p = this.provider();
return this.twitchFilteredNoType().filter(v => {
const w = { ...v, provider: (v.provider as string) || p };
if (isLiveVideo(w)) return false;
if (isShortVideo(w)) return false;
if (String(v.type || '').toLowerCase() === 'channel') return false;
return true;
});
});
twitchClips = computed(() => {
const p = this.provider();
return this.twitchFilteredNoType().filter(v => {
const w = { ...v, provider: (v.provider as string) || p };
if (isLiveVideo(w)) return false;
if (String(v.type || '').toLowerCase() === 'channel') return false;
if (String((v as any).kind || '').toLowerCase() === 'clip') return true;
return isShortVideo(w);
});
});
twitchChannels = computed(() => {
const p = this.provider();
return this.twitchFilteredNoType().filter(v => {
if ((v as any).isLive === true) return false;
if (isLiveVideo({ ...v, provider: (v.provider as string) || p })) return false;
return String(v.type || '').toLowerCase() === 'channel';
});
});
// Sections Twitch regroupées sur `_kind` pré-calculé (les chaînes hors-ligne
// ont leur propre onglet, plus de doublon dans "En direct").
twitchLives = computed(() =>
this.twitchFilteredNoType().filter(v => v._kind === 'live' && !this.isChannelCard(v))
);
twitchVods = computed(() =>
this.twitchFilteredNoType().filter(v => v._kind === 'video')
);
twitchClips = computed(() =>
this.twitchFilteredNoType().filter(v => v._kind === 'short')
);
twitchChannels = computed(() =>
this.twitchFilteredNoType().filter(v => this.isChannelCard(v))
);
/** Onglet Twitch synchronisé avec le filtre "type" existant. */
twitchTab = computed<'all' | 'live' | 'video' | 'clip' | 'channel'>(() => {
@@ -231,8 +213,7 @@ export class ProviderThemePageComponent implements OnDestroy {
const isLiveTheme = themeSlug === 'live';
// Fournisseurs sans aucun direct : aucune vidéo, message explicite.
const LIVE_PROVIDERS: Provider[] = ['youtube', 'twitch'];
if (isLiveTheme && !LIVE_PROVIDERS.includes(provider)) {
if (isLiveTheme && !providerSupportsLive(provider)) {
this.error.set('Ce fournisseur ne propose pas de directs.');
this.loading.set(false);
this.loadingMore.set(false);
@@ -262,15 +243,13 @@ export class ProviderThemePageComponent implements OnDestroy {
next: (res: PagedResult<Video>) => {
if (snapshotVersion !== this.version) return;
// Thème live : garde-fou, ne jamais mélanger des VODs.
let items = res.items || [];
if (isLiveTheme) {
items = items.filter((v: Video) =>
isLiveVideo({ ...v, provider: (v.provider as string) || provider })
);
}
// Classification calculée UNE fois par item, puis thème live garde-fou.
let items: WithKind<Video>[] = (res.items || []).map((v: Video) =>
classifyOnce({ ...(v as object), provider: (v.provider as string) || provider } as Video)
);
if (isLiveTheme) items = items.filter(v => v._kind === 'live');
const existingIds = new Set(this.allVideos().map((v: Video) => v.videoId));
const newVideos = items.filter((v: Video) => !existingIds.has(v.videoId));
const newVideos = items.filter((v: WithKind<Video>) => !existingIds.has(v.videoId));
this.allVideos.update(current => [...current, ...newVideos]);
this.nextCursor.set(res.nextCursor || null);
@@ -309,7 +288,10 @@ export class ProviderThemePageComponent implements OnDestroy {
if (snapshotVersion !== this.version) return;
if (err) this.error.set(err);
const existing = new Set(this.allVideos().map(v => `${v.type}:${v.videoId}`));
const fresh = items.filter(v => !existing.has(`${v.type}:${v.videoId}`));
// `_kind` posé ici (ingestion), plus aucune reclassification au render.
const fresh = items
.filter(v => !existing.has(`${v.type}:${v.videoId}`))
.map(v => classifyOnce({ ...(v as object), provider: (v.provider as string) || provider } as Video));
if (fresh.length) this.allVideos.update(cur => [...cur, ...fresh]);
this.nextCursor.set(next);
this.loading.set(false);
@@ -419,33 +401,22 @@ export class ProviderThemePageComponent implements OnDestroy {
});
}
// Filtres de type basés sur `_kind` (classification pré-calculée, plus de
// règle maison ici). Les chaînes hors-ligne gardent leur traitement brut.
const typeFilter = typeOverride;
if (typeFilter !== 'any') {
const p = this.provider();
arr = arr.filter(v => {
const withProvider = { ...v, provider: (v.provider as string) || p };
if (typeFilter === 'video') return !isShortVideo(withProvider) && !isLiveVideo(withProvider) && String(v.type || '').toLowerCase() !== 'channel' && (v.type === 'video' || v.type === 'recorded');
if (typeFilter === 'live') return isLiveVideo(withProvider);
if (typeFilter === 'recorded') return !isLiveVideo(withProvider) && String(v.type || '').toLowerCase() !== 'channel' && (v.type === 'recorded' || (v.type === 'video' && !isShortVideo(withProvider)));
// Shorts / Clips : classification partagée + kind='clip' (durée parfois absente).
if (typeFilter === 'short') {
if (isLiveVideo(withProvider)) return false;
if (String(v.type || '').toLowerCase() === 'channel') return false;
if (String((v as any).kind || '').toLowerCase() === 'clip') return true;
return isShortVideo(withProvider);
}
// Chaînes : hors-ligne uniquement (les lives restent dans "Direct").
if (typeFilter === 'channel') {
if ((v as any).isLive === true) return false;
if (isLiveVideo(withProvider) && String(v.type || '').toLowerCase() !== 'channel') return false;
return String(v.type || '').toLowerCase() === 'channel';
}
const type = String(v.type || '').toLowerCase();
if (typeFilter === 'video') return v._kind === 'video' && type !== 'channel' && (type === 'video' || type === 'recorded');
if (typeFilter === 'live') return v._kind === 'live';
if (typeFilter === 'recorded') return v._kind !== 'live' && type !== 'channel' && (type === 'recorded' || (type === 'video' && v._kind !== 'short'));
if (typeFilter === 'short') return v._kind === 'short';
if (typeFilter === 'channel') return this.isChannelCard(v);
return true;
});
} else if (this.theme() === 'live') {
// Thème live même si l'utilisateur remet le filtre sur "Any" : LIVE seulement.
const p = this.provider();
arr = arr.filter(v => isLiveVideo({ ...v, provider: (v.provider as string) || p }));
arr = arr.filter(v => v._kind === 'live');
}
const langFilter = this.language();
@@ -504,19 +475,9 @@ export class ProviderThemePageComponent implements OnDestroy {
this.type.set(v === 'shorts' ? 'short' : v === 'videos' ? 'video' : 'any');
}
kindOf(v: Video): string {
const p = this.provider();
return classifyVideo({ ...v, provider: (v.provider as string) || p });
}
/** Badges Twitch : LIVE seulement si réellement en direct (pas les chaînes hors-ligne). */
isLiveCard(v: Video): boolean {
if ((v as any).isLive === true) return true;
if (String(v.type || '').toLowerCase() === 'live') return true;
if (String(v.type || '').toLowerCase() === 'channel') return false;
const p = this.provider();
return isLiveVideo({ ...v, provider: (v.provider as string) || p })
&& String(v.type || '').toLowerCase() !== 'channel';
return v._kind === 'live' && !this.isChannelCard(v);
}
isChannelCard(v: Video): boolean {
@@ -526,17 +487,14 @@ export class ProviderThemePageComponent implements OnDestroy {
isClipCard(v: Video): boolean {
if (this.isLiveCard(v) || this.isChannelCard(v)) return false;
if (String((v as any).kind || '').toLowerCase() === 'clip') return true;
const p = this.provider();
return isShortVideo({ ...v, provider: (v.provider as string) || p });
return v._kind === 'short';
}
/** Affichage "Tout" Twitch : sections empilées façon directory. */
showTwitchSectionsAll = computed(() => this.isTwitchSections() && this.twitchTab() === 'all');
shortsCount(): number {
const p = this.provider();
return this.allVideos().filter(v => isShortVideo({ ...v, provider: (v.provider as string) || p })).length;
return this.allVideos().filter(v => v._kind === 'short').length;
}
onLanguageChange(val: any) { this.language.set(val as any); }
onDateChange(val: any) { this.date.set(val as any); }
src/components/themes/theme-page.component.html
+7 -7
View File
@@ -36,8 +36,8 @@
<!-- Error / empty -->
<div *ngIf="!b.loading && b.error" class="text-amber-300">{{ b.error }}</div>
<div *ngIf="!b.loading && !b.error && b.items.length === 0 && themeSlug() === 'live' && !isLiveProvider(b.provider)" class="text-slate-400">Ce fournisseur ne propose pas de directs.</div>
<div *ngIf="!b.loading && !b.error && b.items.length === 0 && !(themeSlug() === 'live' && !isLiveProvider(b.provider))" class="text-slate-400">{{ 'empty.noItems' | t }}</div>
<div *ngIf="!b.loading && !b.error && b.items.length === 0 && themeSlug() === 'live' && !providerSupportsLive(b.provider)" class="text-slate-400">Ce fournisseur ne propose pas de directs.</div>
<div *ngIf="!b.loading && !b.error && b.items.length === 0 && !(themeSlug() === 'live' && !providerSupportsLive(b.provider))" class="text-slate-400">{{ 'empty.noItems' | t }}</div>
<div *ngIf="!b.loading && !b.error && b.items.length > 0 && filteredItems(b).length === 0" class="text-slate-400">
Aucun {{ contentFilter() === 'shorts' ? 'Short' : 'vidéo' }} pour ce fournisseur — essayez l'autre filtre.
</div>
@@ -56,18 +56,18 @@
<app-provider-badge [provider]="b.provider"></app-provider-badge>
</div>
<div class="absolute top-2 left-2 flex gap-1">
<span *ngIf="isLiveCard(v, b.provider)" class="bg-purple-600 text-white text-[11px] font-bold px-1.5 py-0.5 rounded">LIVE</span>
<span *ngIf="!isLiveCard(v, b.provider) && isClipCard(v, b.provider)" class="bg-red-600 text-white text-[11px] font-bold px-1.5 py-0.5 rounded">CLIP</span>
<span *ngIf="!isLiveCard(v, b.provider) && !isClipCard(v, b.provider) && kindOf(v, b.provider) === 'short'" class="bg-red-600 text-white text-[11px] font-bold px-1.5 py-0.5 rounded">SHORT</span>
<span *ngIf="isLiveCard(v)" class="bg-purple-600 text-white text-[11px] font-bold px-1.5 py-0.5 rounded">LIVE</span>
<span *ngIf="!isLiveCard(v) && isClipCard(v)" class="bg-red-600 text-white text-[11px] font-bold px-1.5 py-0.5 rounded">CLIP</span>
<span *ngIf="!isLiveCard(v) && !isClipCard(v) && v._kind === 'short'" class="bg-red-600 text-white text-[11px] font-bold px-1.5 py-0.5 rounded">SHORT</span>
<span *ngIf="isChannelCard(v)" class="bg-slate-700/90 text-slate-200 text-[11px] font-bold px-1.5 py-0.5 rounded ring-1 ring-slate-500/50">CHAÎNE</span>
</div>
<div class="absolute bottom-2 right-2 bg-black/70 text-white text-xs px-2 py-0.5 rounded" *ngIf="v.duration && v.duration > 0">
{{ v.duration | duration }}
</div>
<div *ngIf="isLiveCard(v, b.provider) && v.views > 0" class="absolute bottom-2 left-2 bg-black/70 text-white text-xs px-2 py-0.5 rounded">
<div *ngIf="isLiveCard(v) && v.views > 0" class="absolute bottom-2 left-2 bg-black/70 text-white text-xs px-2 py-0.5 rounded">
{{ v.views | number }} spectateurs
</div>
<div class="absolute bottom-2 left-2" *ngIf="!isLiveCard(v, b.provider)">
<div class="absolute bottom-2 left-2" *ngIf="!isLiveCard(v)">
<app-like-button [videoId]="v.videoId" [provider]="b.provider" [title]="v.title" [thumbnail]="v.thumbnail"></app-like-button>
</div>
</div>
src/components/themes/theme-page.component.ts
+34 -39
View File
@@ -10,14 +10,15 @@ import { LikeButtonComponent } from '../shared/components/like-button/like-butto
import { ProviderBadgeComponent } from '../../app/shared/components/provider-badge/provider-badge.component';
import { ChannelIdentityComponent } from '../../app/shared/components/channel-identity/channel-identity.component';
import { DurationPipe } from '../../app/shared/pipes/duration.pipe';
import { classifyVideo, isLiveVideo, isShortVideo } from '../../app/shared/utils/video-kind';
import { sectionAccepts, classifyOnce, type WithKind } from '../../app/shared/utils/section-policy';
import { providerSupportsLive } from '../../app/core/providers/provider-registry';
interface ProviderBlock {
provider: Provider;
label: string;
loading: boolean;
error: string | null;
items: Video[];
items: WithKind<Video>[];
}
@Component({
@@ -48,42 +49,37 @@ export class ThemePageComponent {
this.contentFilter.set(v);
}
/** Fournisseurs capables de fournir de vrais directs. */
private static readonly LIVE_PROVIDERS: Provider[] = ['youtube', 'twitch'];
/** Fournisseurs capables de fournir de vrais directs (source unique = registre). */
readonly providerSupportsLive = providerSupportsLive;
isLiveTheme(): boolean {
return this.themeSlug() === 'live';
}
isLiveProvider(p: Provider): boolean {
return (ThemePageComponent.LIVE_PROVIDERS as Provider[]).includes(p);
}
/** Items du bloc après application du filtre Vidéos/Shorts (+ LIVE seulement sur thème live). */
filteredItems(b: ProviderBlock): Video[] {
let items = b.items;
// Thème "En direct" : ne jamais mélanger avec des VODs (garde-fou si une API renvoie du non-live).
if (this.themeSlug() === 'live') {
items = items.filter(v => isLiveVideo({ ...v, provider: (v.provider as string) || b.provider }));
}
const f = this.contentFilter();
if (f === 'all') return items;
return items.filter(v =>
f === 'shorts' ? isShortVideo({ ...v, provider: (v.provider as string) || b.provider }) : !isShortVideo({ ...v, provider: (v.provider as string) || b.provider })
/** Enrichit une page : `_kind` calculé UNE fois à l'ingestion. */
private enrich(items: Video[], provider: Provider): WithKind<Video>[] {
return (items || []).map(v =>
classifyOnce({ ...(v as object), provider: (v.provider as string) || provider } as Video)
);
}
kindOf(v: Video, provider: Provider): string {
return classifyVideo({ ...v, provider: (v.provider as string) || provider });
/** Items du bloc après filtre Vidéos/Shorts (+ LIVE seulement sur thème live). */
filteredItems(b: ProviderBlock): Video[] {
let items: Video[] = b.items;
// Thème "En direct" : ne jamais mélanger avec des VODs (garde-fou si une API renvoie du non-live).
if (this.themeSlug() === 'live') {
items = items.filter(v => sectionAccepts(v, 'theme-live'));
}
const f = this.contentFilter();
if (f === 'all') return items;
return items.filter(v => f === 'shorts'
? sectionAccepts(v, 'theme-shorts')
: sectionAccepts(v, 'theme-videos'));
}
/** LIVE seulement si réellement en direct (les chaînes hors-ligne ne le sont pas). */
isLiveCard(v: Video, provider: Provider): boolean {
if ((v as any).isLive === true) return true;
if (String(v.type || '').toLowerCase() === 'live') return true;
if (String(v.type || '').toLowerCase() === 'channel') return false;
return isLiveVideo({ ...v, provider: (v.provider as string) || provider })
&& String(v.type || '').toLowerCase() !== 'channel';
isLiveCard(v: Video): boolean {
return v._kind === 'live' && !this.isChannelCard(v);
}
isChannelCard(v: Video): boolean {
@@ -91,14 +87,13 @@ export class ThemePageComponent {
return String(v.type || '').toLowerCase() === 'channel';
}
isClipCard(v: Video, provider: Provider): boolean {
if (this.isLiveCard(v, provider) || this.isChannelCard(v)) return false;
if (String((v as any).kind || '').toLowerCase() === 'clip') return true;
return isShortVideo({ ...v, provider: (v.provider as string) || provider });
isClipCard(v: Video): boolean {
if (this.isLiveCard(v) || this.isChannelCard(v)) return false;
return v._kind === 'short';
}
shortsCount(b: ProviderBlock): number {
return b.items.filter(v => isShortVideo({ ...v, provider: (v.provider as string) || b.provider })).length;
return b.items.filter(v => v._kind === 'short').length;
}
constructor() {
@@ -137,7 +132,7 @@ export class ThemePageComponent {
private fetchForProvider(block: ProviderBlock, slug: string) {
// Thème "En direct" : les fournisseurs sans live n'affichent aucune vidéo.
if (slug === 'live' && !this.isLiveProvider(block.provider)) {
if (slug === 'live' && !providerSupportsLive(block.provider)) {
block.loading = false;
block.error = null;
block.items = [];
@@ -168,7 +163,7 @@ export class ThemePageComponent {
if (slug === 'trending') {
this.api.getTrendingPage(null, block.provider).subscribe({
next: res => {
block.items = (res.items || []).slice(0, max);
block.items = this.enrich(res.items || [], block.provider).slice(0, max);
block.loading = false;
if (!block.items.length) console.info('[ThemePage] Empty block page', { provider: block.provider, theme: slug });
this.blocks.update(a => [...a]);
@@ -195,8 +190,8 @@ export class ThemePageComponent {
const mode = block.provider === 'youtube' ? 'youtube_eventType_live' : 'twitch_top_streams';
liveCall.subscribe({
next: res => {
block.items = (res.items || [])
.filter(v => isLiveVideo({ ...v, provider: (v.provider as string) || block.provider }))
block.items = this.enrich(res.items || [], block.provider)
.filter(v => v._kind === 'live')
.slice(0, max);
block.loading = false;
if (!block.items.length) console.info('[ThemePage] Empty block page', { provider: block.provider, theme: slug, mode });
@@ -220,7 +215,7 @@ export class ThemePageComponent {
const raw = tokens.join(' ').trim();
const q = (raw.split(/[^A-Za-z0-9à-ÿ]+/).filter(w => w.length >= 3)[0] || raw).trim();
const show = (items: Video[]) => {
block.items = (items || []).slice(0, max);
block.items = this.enrich(items || [], block.provider).slice(0, max);
block.loading = false;
if (!block.items.length) console.info('[ThemePage] Empty block page', { provider: block.provider, theme: slug, query: q });
this.blocks.update(a => [...a]);
@@ -254,7 +249,7 @@ export class ThemePageComponent {
// fallback to trending
this.api.getTrendingPage(null, block.provider).subscribe({
next: res => {
block.items = (res.items || []).slice(0, max);
block.items = this.enrich(res.items || [], block.provider).slice(0, max);
block.loading = false;
if (!block.items.length) console.info('[ThemePage] Empty block page', { provider: block.provider, theme: slug, mode: 'fallback_trending' });
this.blocks.update(a => [...a]);
@@ -272,7 +267,7 @@ export class ThemePageComponent {
} else {
this.api.searchVideosPage(q, null, block.provider).subscribe({
next: res => {
block.items = (res.items || []).slice(0, max);
block.items = this.enrich(res.items || [], block.provider).slice(0, max);
block.loading = false;
if (!block.items.length) console.info('[ThemePage] Empty block page', { provider: block.provider, theme: slug, query: q });
this.blocks.update(a => [...a]);