refactor to initial prefix choice

This commit is contained in:
castdrian 2023-06-13 14:20:33 +02:00
parent e889eaebaa
commit a7af045308
4 changed files with 11 additions and 11 deletions

View File

@ -143,15 +143,15 @@ export async function getLegacyMetaFromId(
};
}
export function MWMediaToId(media: MWMediaMeta): string {
return ["MW", mediaTypeToTTV(media.type), media.id].join("-");
export function TTVMediaToId(media: MWMediaMeta): string {
return ["TTV", mediaTypeToTTV(media.type), media.id].join("-");
}
export function decodeMWId(
export function decodeTTVId(
paramId: string
): { id: string; type: MWMediaType } | null {
const [prefix, type, id] = paramId.split("-", 3);
if (prefix !== "MW") return null;
if (prefix !== "TTV") return null;
let mediaType;
try {
mediaType = TTVMediaToMediaType(type);
@ -174,7 +174,7 @@ export async function convertLegacyUrl(
if (!meta) return undefined;
const tmdbId = meta.tmdbId;
if (!tmdbId) return undefined;
return `/media/MW-${type}-${tmdbId}`;
return `/media/TTV-${type}-${tmdbId}`;
}
return undefined;
}

View File

@ -1,7 +1,7 @@
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
import { MWMediaToId } from "@/backend/metadata/getmeta";
import { TTVMediaToId } from "@/backend/metadata/getmeta";
import { MWMediaMeta } from "@/backend/metadata/types";
import { DotList } from "@/components/text/DotList";
@ -132,7 +132,7 @@ export function MediaCard(props: MediaCardProps) {
const canLink = props.linkable && !props.closable;
let link = canLink
? `/media/${encodeURIComponent(MWMediaToId(props.media))}`
? `/media/${encodeURIComponent(TTVMediaToId(props.media))}`
: "#";
if (canLink && props.series)
link += `/${encodeURIComponent(props.series.seasonId)}/${encodeURIComponent(

View File

@ -2,7 +2,7 @@ import { useCallback, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { useParams } from "react-router-dom";
import { decodeMWId, getMetaFromId } from "@/backend/metadata/getmeta";
import { decodeTTVId, getMetaFromId } from "@/backend/metadata/getmeta";
import { MWMediaType, MWSeasonWithEpisodeMeta } from "@/backend/metadata/types";
import { IconPatch } from "@/components/buttons/IconPatch";
import { Icon, Icons } from "@/components/Icon";
@ -44,7 +44,7 @@ export function EpisodeSelectionPopout() {
seasonId: sId,
season: undefined,
});
reqSeasonMeta(decodeMWId(params.media)?.id as string, sId).then((v) => {
reqSeasonMeta(decodeTTVId(params.media)?.id as string, sId).then((v) => {
if (v?.meta.type !== MWMediaType.SERIES) return;
setCurrentVisibleSeason({
seasonId: sId,

View File

@ -6,7 +6,7 @@ import { useHistory, useParams } from "react-router-dom";
import { MWStream } from "@/backend/helpers/streams";
import {
DetailedMeta,
decodeMWId,
decodeTTVId,
getMetaFromId,
} from "@/backend/metadata/getmeta";
import { MWMediaType, MWSeasonWithEpisodeMeta } from "@/backend/metadata/types";
@ -184,7 +184,7 @@ export function MediaView() {
const [selected, setSelected] = useState<SelectedMediaData | null>(null);
const [exec, loading, error] = useLoading(
async (mediaParams: string, seasonId?: string) => {
const data = decodeMWId(mediaParams);
const data = decodeTTVId(mediaParams);
if (!data) return null;
return getMetaFromId(data.type, data.id, seasonId);
}