Browse Source

remove duplicate code

pull/364/head
adrifcastr 2 years ago
parent
commit
430b9564ab
  1. 1
      package.json
  2. 21
      src/backend/metadata/getmeta.ts
  3. 2
      src/components/media/MediaCard.tsx
  4. 3
      src/video/components/popouts/EpisodeSelectionPopout.tsx
  5. 7
      src/views/media/MediaView.tsx
  6. 5
      yarn.lock

1
package.json

@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
"react-stickynode": "^4.1.0",
"react-transition-group": "^4.4.5",
"react-use": "^17.4.0",
"slugify": "^1.6.6",
"subsrt-ts": "^2.1.1",
"unpacker": "^1.0.1"
},

21
src/backend/metadata/getmeta.ts

@ -180,27 +180,6 @@ export async function getLegacyMetaFromId( @@ -180,27 +180,6 @@ export async function getLegacyMetaFromId(
};
}
export function TMDBMediaToId(media: MWMediaMeta): string {
return ["tmdb", mediaTypeToTMDB(media.type), media.id].join("-");
}
export function decodeTMDBId(
paramId: string
): { id: string; type: MWMediaType } | null {
const [prefix, type, id] = paramId.split("-", 3);
if (prefix !== "tmdb") return null;
let mediaType;
try {
mediaType = TMDBMediaToMediaType(type);
} catch {
return null;
}
return {
type: mediaType,
id,
};
}
export function isLegacyUrl(url: string): boolean {
if (url.startsWith("/media/JW")) return true;
return false;

2
src/components/media/MediaCard.tsx

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
import { TMDBMediaToId } from "@/backend/metadata/getmeta";
import { TMDBMediaToId } from "@/backend/metadata/tmdb";
import { MWMediaMeta } from "@/backend/metadata/types/mw";
import { DotList } from "@/components/text/DotList";

3
src/video/components/popouts/EpisodeSelectionPopout.tsx

@ -2,7 +2,8 @@ import { useCallback, useMemo, useState } from "react"; @@ -2,7 +2,8 @@ import { useCallback, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { useParams } from "react-router-dom";
import { decodeTMDBId, getMetaFromId } from "@/backend/metadata/getmeta";
import { getMetaFromId } from "@/backend/metadata/getmeta";
import { decodeTMDBId } from "@/backend/metadata/tmdb";
import {
MWMediaType,
MWSeasonWithEpisodeMeta,

7
src/views/media/MediaView.tsx

@ -4,11 +4,8 @@ import { useTranslation } from "react-i18next"; @@ -4,11 +4,8 @@ import { useTranslation } from "react-i18next";
import { useHistory, useParams } from "react-router-dom";
import { MWStream } from "@/backend/helpers/streams";
import {
DetailedMeta,
decodeTMDBId,
getMetaFromId,
} from "@/backend/metadata/getmeta";
import { DetailedMeta, getMetaFromId } from "@/backend/metadata/getmeta";
import { decodeTMDBId } from "@/backend/metadata/tmdb";
import {
MWMediaType,
MWSeasonWithEpisodeMeta,

5
yarn.lock

@ -4764,6 +4764,11 @@ slice-ansi@^5.0.0: @@ -4764,6 +4764,11 @@ slice-ansi@^5.0.0:
ansi-styles "^6.0.0"
is-fullwidth-code-point "^4.0.0"
slugify@^1.6.6:
version "1.6.6"
resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.6.6.tgz#2d4ac0eacb47add6af9e04d3be79319cbcc7924b"
integrity sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==
source-map-js@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"

Loading…
Cancel
Save