From ddc3e8f61a80eefdae7f91fd8b2e162b2257b28a Mon Sep 17 00:00:00 2001
From: Arthur Jamet <arthur.jamet@gmail.com>
Date: Sun, 4 Aug 2024 19:46:16 +0200
Subject: [PATCH] Front: better Format of Video Metadata for Episodes

---
 front/packages/ui/src/player/index.tsx        | 28 ++++++++++---------
 .../packages/ui/src/player/media-session.tsx  |  5 +++-
 front/packages/ui/src/player/state.tsx        |  1 +
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/front/packages/ui/src/player/index.tsx b/front/packages/ui/src/player/index.tsx
index bee71bad..193e13dc 100644
--- a/front/packages/ui/src/player/index.tsx
+++ b/front/packages/ui/src/player/index.tsx
@@ -65,6 +65,17 @@ const mapData = (
 	};
 };
 
+const formatTitleMetadata = (item: Item) => {
+	if (item.type === "movie") {
+		return item.name;
+	}
+	return `${item.name} (${episodeDisplayNumber({
+		seasonNumber: item.seasonNumber,
+		episodeNumber: item.episodeNumber,
+		absoluteNumber: item.absoluteNumber,
+	})})`;
+};
+
 export const Player = ({
 	slug,
 	type,
@@ -81,10 +92,7 @@ export const Player = ({
 	const [playbackError, setPlaybackError] = useState<string | undefined>(undefined);
 	const { data, error } = useFetch(Player.query(type, slug));
 	const { data: info, error: infoError } = useFetch(Player.infoQuery(type, slug));
-	const image =
-		data && data.type === "episode"
-			? data.show?.poster ?? data?.thumbnail
-			: data?.thumbnail;
+	const image = data && data.type === "episode" ? data.show?.poster ?? data?.poster : data?.poster;
 	const previous =
 		data && data.type === "episode" && data.previousEpisode
 			? `/watch/${data.previousEpisode.slug}?t=0`
@@ -93,15 +101,8 @@ export const Player = ({
 		data && data.type === "episode" && data.nextEpisode
 			? `/watch/${data.nextEpisode.slug}?t=0`
 			: undefined;
-	const title =
-		data &&
-		(data.type === "movie"
-			? data.name
-			: `${data.show!.name} ${episodeDisplayNumber({
-					seasonNumber: data.seasonNumber,
-					episodeNumber: data.episodeNumber,
-					absoluteNumber: data.absoluteNumber,
-				})}`);
+	const title = data && formatTitleMetadata(data);
+	const subtitle = data && data.type === "episode" ? data.show?.name : undefined;
 
 	useVideoKeyboard(info?.subtitles, info?.fonts, previous, next);
 
@@ -145,6 +146,7 @@ export const Player = ({
 				<Video
 					metadata={{
 						title: title ?? t("show.episodeNoMetadata"),
+						subtitle: subtitle ?? undefined,
 						description: data?.overview ?? undefined,
 						imageUri: image?.medium,
 						next: next,
diff --git a/front/packages/ui/src/player/media-session.tsx b/front/packages/ui/src/player/media-session.tsx
index 9c4f1d69..d2567c3b 100644
--- a/front/packages/ui/src/player/media-session.tsx
+++ b/front/packages/ui/src/player/media-session.tsx
@@ -26,11 +26,13 @@ import { durationAtom, playAtom, progressAtom } from "./state";
 
 export const MediaSessionManager = ({
 	title,
+	subtitle,
 	imageUri,
 	previous,
 	next,
 }: {
 	title?: string;
+	subtitle?: string;
 	imageUri?: string | null;
 	previous?: string;
 	next?: string;
@@ -45,9 +47,10 @@ export const MediaSessionManager = ({
 		if (!("mediaSession" in navigator)) return;
 		navigator.mediaSession.metadata = new MediaMetadata({
 			title: title,
+			album: subtitle,
 			artwork: imageUri ? [{ src: imageUri }] : undefined,
 		});
-	}, [title, imageUri]);
+	}, [title, subtitle, imageUri]);
 
 	useEffect(() => {
 		if (!("mediaSession" in navigator)) return;
diff --git a/front/packages/ui/src/player/state.tsx b/front/packages/ui/src/player/state.tsx
index dc20ad47..53ed43a2 100644
--- a/front/packages/ui/src/player/state.tsx
+++ b/front/packages/ui/src/player/state.tsx
@@ -116,6 +116,7 @@ export const Video = memo(function Video({
 	startTime?: number | null;
 	metadata: {
 		title?: string;
+		subtitle?: string;
 		description?: string;
 		imageUri?: string;
 		previous?: string;