Browse Source

Merge branch 'dev' into dev

pull/1055/head
lmmelo16 1 year ago committed by GitHub
parent
commit
9aebffd9c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 14
      src/assets/locales/en.json
  2. 4
      src/backend/metadata/getmeta.ts
  3. 9
      src/backend/metadata/tmdb.ts
  4. 2
      src/backend/metadata/types/tmdb.ts
  5. 51
      src/components/DropFile.tsx
  6. 2
      src/components/Icon.tsx
  7. 41
      src/components/media/MediaCard.tsx
  8. 6
      src/components/player/atoms/Settings.tsx
  9. 65
      src/components/player/atoms/settings/AudioView.tsx
  10. 74
      src/components/player/atoms/settings/CaptionsView.tsx
  11. 15
      src/components/player/atoms/settings/SettingsMenu.tsx
  12. 32
      src/components/player/display/base.ts
  13. 3
      src/components/player/display/chromecast.ts
  14. 5
      src/components/player/display/displayInterface.ts
  15. 23
      src/pages/onboarding/OnboardingExtension.tsx
  16. 4
      src/pages/parts/admin/WorkerTestPart.tsx
  17. 61
      src/pages/parts/player/ScrapeErrorPart.tsx
  18. 10
      src/stores/player/slices/display.ts
  19. 10
      src/stores/player/slices/source.ts
  20. 20
      src/utils/extension.ts
  21. 1
      src/utils/mediaTypes.ts

14
src/assets/locales/en.json

@ -148,6 +148,7 @@ @@ -148,6 +148,7 @@
},
"media": {
"episodeDisplay": "S{{season}} E{{episode}}",
"unreleased": "Unreleased",
"types": {
"movie": "Movie",
"show": "Show"
@ -294,6 +295,7 @@ @@ -294,6 +295,7 @@
"enableSubtitles": "Enable Subtitles",
"experienceSection": "Viewing experience",
"playbackItem": "Playback settings",
"audioItem": "Audio",
"qualityItem": "Quality",
"sourceItem": "Video sources",
"subtitleItem": "Subtitle settings",
@ -316,7 +318,7 @@ @@ -316,7 +318,7 @@
"unknownOption": "Unknown"
},
"subtitles": {
"customChoice": "Select subtitle from file",
"customChoice": "Drop or upload file",
"customizeLabel": "Customize",
"offChoice": "Off",
"settings": {
@ -325,7 +327,8 @@ @@ -325,7 +327,8 @@
"fixCapitals": "Fix capitalization"
},
"title": "Subtitles",
"unknownLanguage": "Unknown"
"unknownLanguage": "Unknown",
"dropSubtitleFile": "Drop subtitle file here"
}
},
"metadata": {
@ -386,6 +389,13 @@ @@ -386,6 +389,13 @@
"homeButton": "Go home",
"text": "We have searched through our providers and cannot find the media you are looking for! We do not host the media and have no control over what is available. Please click 'Show details' below for more details.",
"title": "We couldn't find that"
},
"extensionFailure": {
"badge": "Extension disabled",
"homeButton": "Go home",
"enableExtension": "Enable extension",
"title": "Please enable the extension",
"text": "You've installed the movie-web extension. To start using it, you need to enable the extension for this site."
}
},
"time": {

4
src/backend/metadata/getmeta.ts

@ -43,7 +43,7 @@ export function formatTMDBMetaResult( @@ -43,7 +43,7 @@ export function formatTMDBMetaResult(
title: movie.title,
object_type: mediaTypeToTMDB(type),
poster: getMediaPoster(movie.poster_path) ?? undefined,
original_release_year: new Date(movie.release_date).getFullYear(),
original_release_date: new Date(movie.release_date),
};
}
if (type === MWMediaType.SERIES) {
@ -58,7 +58,7 @@ export function formatTMDBMetaResult( @@ -58,7 +58,7 @@ export function formatTMDBMetaResult(
title: v.name,
})),
poster: getMediaPoster(show.poster_path) ?? undefined,
original_release_year: new Date(show.first_air_date).getFullYear(),
original_release_date: new Date(show.first_air_date),
};
}

9
src/backend/metadata/tmdb.ts

@ -66,7 +66,7 @@ export function formatTMDBMeta( @@ -66,7 +66,7 @@ export function formatTMDBMeta(
return {
title: media.title,
id: media.id.toString(),
year: media.original_release_year?.toString(),
year: media.original_release_date?.getFullYear()?.toString(),
poster: media.poster,
type,
seasons: seasons as any,
@ -94,7 +94,8 @@ export function formatTMDBMetaToMediaItem(media: TMDBMediaResult): MediaItem { @@ -94,7 +94,8 @@ export function formatTMDBMetaToMediaItem(media: TMDBMediaResult): MediaItem {
return {
title: media.title,
id: media.id.toString(),
year: media.original_release_year ?? 0,
year: media.original_release_date?.getFullYear() ?? 0,
release_date: media.original_release_date,
poster: media.poster,
type,
};
@ -260,7 +261,7 @@ export function formatTMDBSearchResult( @@ -260,7 +261,7 @@ export function formatTMDBSearchResult(
title: show.name,
poster: getMediaPoster(show.poster_path),
id: show.id,
original_release_year: new Date(show.first_air_date).getFullYear(),
original_release_date: new Date(show.first_air_date),
object_type: mediatype,
};
}
@ -271,7 +272,7 @@ export function formatTMDBSearchResult( @@ -271,7 +272,7 @@ export function formatTMDBSearchResult(
title: movie.title,
poster: getMediaPoster(movie.poster_path),
id: movie.id,
original_release_year: new Date(movie.release_date).getFullYear(),
original_release_date: new Date(movie.release_date),
object_type: mediatype,
};
}

2
src/backend/metadata/types/tmdb.ts

@ -20,7 +20,7 @@ export type TMDBMediaResult = { @@ -20,7 +20,7 @@ export type TMDBMediaResult = {
title: string;
poster?: string;
id: number;
original_release_year?: number;
original_release_date?: Date;
object_type: TMDBContentTypes;
seasons?: TMDBSeasonShort[];
};

51
src/components/DropFile.tsx

@ -0,0 +1,51 @@ @@ -0,0 +1,51 @@
import { useEffect, useState } from "react";
import type { DragEvent, ReactNode } from "react";
interface FileDropHandlerProps {
children: ReactNode;
className: string;
onDrop: (event: DragEvent<HTMLDivElement>) => void;
onDraggingChange: (isDragging: boolean) => void;
}
export function FileDropHandler(props: FileDropHandlerProps) {
const [dragging, setDragging] = useState(false);
const handleDragEnter = (event: DragEvent<HTMLDivElement>) => {
event.preventDefault();
setDragging(true);
};
const handleDragLeave = (event: DragEvent<HTMLDivElement>) => {
if (!event.currentTarget.contains(event.relatedTarget as Node)) {
setDragging(false);
}
};
const handleDragOver = (event: DragEvent<HTMLDivElement>) => {
event.preventDefault();
};
const handleDrop = (event: DragEvent<HTMLDivElement>) => {
event.preventDefault();
setDragging(false);
props.onDrop(event);
};
useEffect(() => {
props.onDraggingChange(dragging);
}, [dragging, props]);
return (
<div
onDragEnter={handleDragEnter}
onDragLeave={handleDragLeave}
onDragOver={handleDragOver}
onDrop={handleDrop}
className={props.className}
>
{props.children}
</div>
);
}

2
src/components/Icon.tsx

@ -64,6 +64,7 @@ export enum Icons { @@ -64,6 +64,7 @@ export enum Icons {
DONATION = "donation",
CIRCLE_QUESTION = "circle_question",
BRUSH = "brush",
UPLOAD = "upload",
}
export interface IconProps {
@ -134,6 +135,7 @@ const iconList: Record<Icons, string> = { @@ -134,6 +135,7 @@ const iconList: Record<Icons, string> = {
donation: `<svg xmlns="http://www.w3.org/2000/svg" height="1em" width="1em" viewBox="0 0 576 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2023 Fonticons, Inc.--><path opacity="1" fill="currentColor" d="M163.9 136.9c-29.4-29.8-29.4-78.2 0-108s77-29.8 106.4 0l17.7 18 17.7-18c29.4-29.8 77-29.8 106.4 0s29.4 78.2 0 108L310.5 240.1c-6.2 6.3-14.3 9.4-22.5 9.4s-16.3-3.1-22.5-9.4L163.9 136.9zM568.2 336.3c13.1 17.8 9.3 42.8-8.5 55.9L433.1 485.5c-23.4 17.2-51.6 26.5-80.7 26.5H192 32c-17.7 0-32-14.3-32-32V416c0-17.7 14.3-32 32-32H68.8l44.9-36c22.7-18.2 50.9-28 80-28H272h16 64c17.7 0 32 14.3 32 32s-14.3 32-32 32H288 272c-8.8 0-16 7.2-16 16s7.2 16 16 16H392.6l119.7-88.2c17.8-13.1 42.8-9.3 55.9 8.5zM193.6 384l0 0-.9 0c.3 0 .6 0 .9 0z"/></svg>`,
circle_question: `<svg xmlns="http://www.w3.org/2000/svg" height="1em" width="1em" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2023 Fonticons, Inc.--><path opacity="1" fill="currentColor" d="M464 256A208 208 0 1 0 48 256a208 208 0 1 0 416 0zM0 256a256 256 0 1 1 512 0A256 256 0 1 1 0 256zm169.8-90.7c7.9-22.3 29.1-37.3 52.8-37.3h58.3c34.9 0 63.1 28.3 63.1 63.1c0 22.6-12.1 43.5-31.7 54.8L280 264.4c-.2 13-10.9 23.6-24 23.6c-13.3 0-24-10.7-24-24V250.5c0-8.6 4.6-16.5 12.1-20.8l44.3-25.4c4.7-2.7 7.6-7.7 7.6-13.1c0-8.4-6.8-15.1-15.1-15.1H222.6c-3.4 0-6.4 2.1-7.5 5.3l-.4 1.2c-4.4 12.5-18.2 19-30.6 14.6s-19-18.2-14.6-30.6l.4-1.2zM224 352a32 32 0 1 1 64 0 32 32 0 1 1 -64 0z"/></svg>`,
brush: `<svg xmlns="http://www.w3.org/2000/svg" height="1em" width="1em" viewBox="0 0 384 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2023 Fonticons, Inc.--><path d="M162.4 6c-1.5-3.6-5-6-8.9-6h-19c-3.9 0-7.5 2.4-8.9 6L104.9 57.7c-3.2 8-14.6 8-17.8 0L66.4 6c-1.5-3.6-5-6-8.9-6H48C21.5 0 0 21.5 0 48V224v22.4V256H9.6 374.4 384v-9.6V224 48c0-26.5-21.5-48-48-48H230.5c-3.9 0-7.5 2.4-8.9 6L200.9 57.7c-3.2 8-14.6 8-17.8 0L162.4 6zM0 288v32c0 35.3 28.7 64 64 64h64v64c0 35.3 28.7 64 64 64s64-28.7 64-64V384h64c35.3 0 64-28.7 64-64V288H0zM192 432a16 16 0 1 1 0 32 16 16 0 1 1 0-32z" fill="currentColor"/></svg>`,
upload: `<svg xmlns="http://www.w3.org/2000/svg" height="1em" width="1em" viewBox="0 0 384 512"><!--! Font Awesome Pro 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path opacity="1" fill="currentColor" d="M320 480H64c-17.7 0-32-14.3-32-32V64c0-17.7 14.3-32 32-32H192V144c0 26.5 21.5 48 48 48H352V448c0 17.7-14.3 32-32 32zM240 160c-8.8 0-16-7.2-16-16V32.5c2.8 .7 5.4 2.1 7.4 4.2L347.3 152.6c2.1 2.1 3.5 4.6 4.2 7.4H240zM64 0C28.7 0 0 28.7 0 64V448c0 35.3 28.7 64 64 64H320c35.3 0 64-28.7 64-64V163.9c0-12.7-5.1-24.9-14.1-33.9L254.1 14.1c-9-9-21.2-14.1-33.9-14.1H64zM208 278.6l52.7 52.7c6.2 6.2 16.4 6.2 22.6 0s6.2-16.4 0-22.6l-80-80c-6.2-6.2-16.4-6.2-22.6 0l-80 80c-6.2 6.2-6.2 16.4 0 22.6s16.4 6.2 22.6 0L176 278.6V400c0 8.8 7.2 16 16 16s16-7.2 16-16V278.6z"/></svg>`,
};
function ChromeCastButton() {

41
src/components/media/MediaCard.tsx

@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
import classNames from "classnames";
import { useCallback } from "react";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
@ -24,6 +25,20 @@ export interface MediaCardProps { @@ -24,6 +25,20 @@ export interface MediaCardProps {
onClose?: () => void;
}
function checkReleased(media: MediaItem): boolean {
const isReleasedYear = Boolean(
media.year && media.year <= new Date().getFullYear(),
);
const isReleasedDate = Boolean(
media.release_date && media.release_date <= new Date(),
);
// If the media has a release date, use that, otherwise use the year
const isReleased = media.release_date ? isReleasedDate : isReleasedYear;
return isReleased;
}
function MediaCardContent({
media,
linkable,
@ -35,10 +50,19 @@ function MediaCardContent({ @@ -35,10 +50,19 @@ function MediaCardContent({
const { t } = useTranslation();
const percentageString = `${Math.round(percentage ?? 0).toFixed(0)}%`;
const canLink = linkable && !closable;
const isReleased = useCallback(() => checkReleased(media), [media]);
const canLink = linkable && !closable && isReleased();
const dotListContent = [t(`media.types.${media.type}`)];
if (media.year) dotListContent.push(media.year.toFixed());
if (media.year) {
dotListContent.push(media.year.toFixed());
}
if (!isReleased()) {
dotListContent.push(t("media.unreleased"));
}
return (
<Flare.Base
@ -58,14 +82,14 @@ function MediaCardContent({ @@ -58,14 +82,14 @@ function MediaCardContent({
/>
<Flare.Child
className={`pointer-events-auto relative mb-2 p-3 transition-transform duration-100 ${
canLink ? "group-hover:scale-95" : ""
canLink ? "group-hover:scale-95" : "opacity-60"
}`}
>
<div
className={classNames(
"relative mb-4 pb-[150%] w-full overflow-hidden rounded-xl bg-mediaCard-hoverBackground bg-cover bg-center transition-[border-radius] duration-100",
{
"group-hover:rounded-lg": !closable,
"group-hover:rounded-lg": canLink,
},
)}
style={{
@ -142,7 +166,12 @@ function MediaCardContent({ @@ -142,7 +166,12 @@ function MediaCardContent({
export function MediaCard(props: MediaCardProps) {
const content = <MediaCardContent {...props} />;
const canLink = props.linkable && !props.closable;
const isReleased = useCallback(
() => checkReleased(props.media),
[props.media],
);
const canLink = props.linkable && !props.closable && isReleased();
let link = canLink
? `/media/${encodeURIComponent(mediaItemToId(props.media))}`
@ -157,7 +186,7 @@ export function MediaCard(props: MediaCardProps) { @@ -157,7 +186,7 @@ export function MediaCard(props: MediaCardProps) {
}
}
if (!props.linkable) return <span>{content}</span>;
if (!canLink) return <span>{content}</span>;
return (
<Link
to={link}

6
src/components/player/atoms/Settings.tsx

@ -14,6 +14,7 @@ import { Menu } from "@/components/player/internals/ContextMenu"; @@ -14,6 +14,7 @@ import { Menu } from "@/components/player/internals/ContextMenu";
import { useOverlayRouter } from "@/hooks/useOverlayRouter";
import { usePlayerStore } from "@/stores/player/store";
import { AudioView } from "./settings/AudioView";
import { CaptionSettingsView } from "./settings/CaptionSettingsView";
import { CaptionsView } from "./settings/CaptionsView";
import { DownloadRoutes } from "./settings/Downloads";
@ -46,6 +47,11 @@ function SettingsOverlay({ id }: { id: string }) { @@ -46,6 +47,11 @@ function SettingsOverlay({ id }: { id: string }) {
<QualityView id={id} />
</Menu.Card>
</OverlayPage>
<OverlayPage id={id} path="/audio" width={343} height={431}>
<Menu.Card>
<AudioView id={id} />
</Menu.Card>
</OverlayPage>
<OverlayPage id={id} path="/captions" width={343} height={431}>
<Menu.CardWithScrollable>
<CaptionsView id={id} />

65
src/components/player/atoms/settings/AudioView.tsx

@ -0,0 +1,65 @@ @@ -0,0 +1,65 @@
import { useCallback } from "react";
import { useTranslation } from "react-i18next";
import { FlagIcon } from "@/components/FlagIcon";
import { Menu } from "@/components/player/internals/ContextMenu";
import { useOverlayRouter } from "@/hooks/useOverlayRouter";
import { AudioTrack } from "@/stores/player/slices/source";
import { usePlayerStore } from "@/stores/player/store";
import { getPrettyLanguageNameFromLocale } from "@/utils/language";
import { SelectableLink } from "../../internals/ContextMenu/Links";
export function AudioOption(props: {
langCode?: string;
children: React.ReactNode;
selected?: boolean;
onClick?: () => void;
}) {
return (
<SelectableLink selected={props.selected} onClick={props.onClick}>
<span className="flex items-center">
<span data-code={props.langCode} className="mr-3 inline-flex">
<FlagIcon langCode={props.langCode} />
</span>
<span>{props.children}</span>
</span>
</SelectableLink>
);
}
export function AudioView({ id }: { id: string }) {
const { t } = useTranslation();
const unknownChoice = t("player.menus.subtitles.unknownLanguage");
const router = useOverlayRouter(id);
const audioTracks = usePlayerStore((s) => s.audioTracks);
const currentAudioTrack = usePlayerStore((s) => s.currentAudioTrack);
const changeAudioTrack = usePlayerStore((s) => s.display?.changeAudioTrack);
const change = useCallback(
(track: AudioTrack) => {
changeAudioTrack?.(track);
router.close();
},
[router, changeAudioTrack],
);
return (
<>
<Menu.BackLink onClick={() => router.navigate("/")}>Audio</Menu.BackLink>
<Menu.Section className="flex flex-col pb-4">
{audioTracks.map((v) => (
<AudioOption
key={v.id}
selected={v.id === currentAudioTrack?.id}
langCode={v.language}
onClick={audioTracks.includes(v) ? () => change(v) : undefined}
>
{getPrettyLanguageNameFromLocale(v.language) ?? unknownChoice}
</AudioOption>
))}
</Menu.Section>
</>
);
}

74
src/components/player/atoms/settings/CaptionsView.tsx

@ -1,11 +1,14 @@ @@ -1,11 +1,14 @@
import classNames from "classnames";
import Fuse from "fuse.js";
import { useMemo, useRef, useState } from "react";
import { type DragEvent, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { useAsyncFn } from "react-use";
import { convert } from "subsrt-ts";
import { subtitleTypeList } from "@/backend/helpers/subs";
import { FileDropHandler } from "@/components/DropFile";
import { FlagIcon } from "@/components/FlagIcon";
import { Icon, Icons } from "@/components/Icon";
import { useCaptions } from "@/components/player/hooks/useCaptions";
import { Menu } from "@/components/player/internals/ContextMenu";
import { Input } from "@/components/player/internals/ContextMenu/Input";
@ -123,6 +126,34 @@ export function CaptionsView({ id }: { id: string }) { @@ -123,6 +126,34 @@ export function CaptionsView({ id }: { id: string }) {
const { selectCaptionById, disable } = useCaptions();
const captionList = usePlayerStore((s) => s.captionList);
const getHlsCaptionList = usePlayerStore((s) => s.display?.getCaptionList);
const [dragging, setDragging] = useState(false);
const setCaption = usePlayerStore((s) => s.setCaption);
function onDrop(event: DragEvent<HTMLDivElement>) {
const files = event.dataTransfer.files;
const firstFile = files[0];
if (!files || !firstFile) return;
const fileExtension = `.${firstFile.name.split(".").pop()}`;
if (!fileExtension || !subtitleTypeList.includes(fileExtension)) {
return;
}
const reader = new FileReader();
reader.addEventListener("load", (e) => {
if (!e.target || typeof e.target.result !== "string") return;
const converted = convert(e.target.result, "srt");
setCaption({
language: "custom",
srtData: converted,
id: "custom-caption",
});
});
reader.readAsText(firstFile);
}
const captions = useMemo(
() =>
@ -164,6 +195,20 @@ export function CaptionsView({ id }: { id: string }) { @@ -164,6 +195,20 @@ export function CaptionsView({ id }: { id: string }) {
return (
<>
<div>
<div
className={classNames(
"absolute inset-0 flex items-center justify-center text-white z-10 pointer-events-none transition-opacity duration-300",
dragging ? "opacity-100" : "opacity-0",
)}
>
<div className="flex flex-col items-center">
<Icon className="text-5xl mb-4" icon={Icons.UPLOAD} />
<span className="text-xl weight font-medium">
{t("player.menus.subtitles.dropSubtitleFile")}
</span>
</div>
</div>
<Menu.BackLink
onClick={() => router.navigate("/")}
rightSide={
@ -178,17 +223,28 @@ export function CaptionsView({ id }: { id: string }) { @@ -178,17 +223,28 @@ export function CaptionsView({ id }: { id: string }) {
>
{t("player.menus.subtitles.title")}
</Menu.BackLink>
</div>
<FileDropHandler
className={`transition duration-300 ${dragging ? "opacity-20" : ""}`}
onDraggingChange={(isDragging) => {
setDragging(isDragging);
}}
onDrop={(event) => onDrop(event)}
>
<div className="mt-3">
<Input value={searchQuery} onInput={setSearchQuery} />
</div>
</div>
<Menu.ScrollToActiveSection className="!pt-1 mt-2 pb-3">
<CaptionOption onClick={() => disable()} selected={!selectedCaptionId}>
{t("player.menus.subtitles.offChoice")}
</CaptionOption>
<CustomCaptionOption />
{content}
</Menu.ScrollToActiveSection>
<Menu.ScrollToActiveSection className="!pt-1 mt-2 pb-3">
<CaptionOption
onClick={() => disable()}
selected={!selectedCaptionId}
>
{t("player.menus.subtitles.offChoice")}
</CaptionOption>
<CustomCaptionOption />
{content}
</Menu.ScrollToActiveSection>
</FileDropHandler>
</>
);
}

15
src/components/player/atoms/settings/SettingsMenu.tsx

@ -16,6 +16,7 @@ export function SettingsMenu({ id }: { id: string }) { @@ -16,6 +16,7 @@ export function SettingsMenu({ id }: { id: string }) {
const { t } = useTranslation();
const router = useOverlayRouter(id);
const currentQuality = usePlayerStore((s) => s.currentQuality);
const currentAudioTrack = usePlayerStore((s) => s.currentAudioTrack);
const selectedCaptionLanguage = usePlayerStore(
(s) => s.caption.selected?.language,
);
@ -35,6 +36,11 @@ export function SettingsMenu({ id }: { id: string }) { @@ -35,6 +36,11 @@ export function SettingsMenu({ id }: { id: string }) {
t("player.menus.subtitles.unknownLanguage")
: undefined;
const selectedAudioLanguagePretty = currentAudioTrack
? getPrettyLanguageNameFromLocale(currentAudioTrack.language) ??
t("player.menus.subtitles.unknownLanguage")
: undefined;
const source = usePlayerStore((s) => s.source);
const downloadable = source?.type === "file" || source?.type === "hls";
@ -51,6 +57,15 @@ export function SettingsMenu({ id }: { id: string }) { @@ -51,6 +57,15 @@ export function SettingsMenu({ id }: { id: string }) {
>
{t("player.menus.settings.qualityItem")}
</Menu.ChevronLink>
{currentAudioTrack && (
<Menu.ChevronLink
onClick={() => router.navigate("/audio")}
rightText={selectedAudioLanguagePretty ?? undefined}
>
{t("player.menus.settings.audioItem")}
</Menu.ChevronLink>
)}
<Menu.ChevronLink
onClick={() => router.navigate("/source")}
rightText={sourceName}

32
src/components/player/display/base.ts

@ -81,6 +81,24 @@ export function makeVideoElementDisplayInterface(): DisplayInterface { @@ -81,6 +81,24 @@ export function makeVideoElementDisplayInterface(): DisplayInterface {
emit("qualities", convertedLevels);
}
function reportAudioTracks() {
if (!hls) return;
const currentTrack = hls.audioTracks[hls.audioTrack];
emit("changedaudiotrack", {
id: currentTrack.id.toString(),
label: currentTrack.name,
language: currentTrack.lang ?? "unknown",
});
emit(
"audiotracks",
hls.audioTracks.map((v) => ({
id: v.id.toString(),
label: v.name,
language: v.lang ?? "unknown",
})),
);
}
function setupQualityForHls() {
if (videoElement && canPlayHlsNatively(videoElement)) {
return; // nothing to change
@ -155,6 +173,7 @@ export function makeVideoElementDisplayInterface(): DisplayInterface { @@ -155,6 +173,7 @@ export function makeVideoElementDisplayInterface(): DisplayInterface {
if (!hls) return;
reportLevels();
setupQualityForHls();
reportAudioTracks();
if (isExtensionActiveCached()) {
hls.on(Hls.Events.LEVEL_LOADED, async (_, data) => {
@ -464,5 +483,18 @@ export function makeVideoElementDisplayInterface(): DisplayInterface { @@ -464,5 +483,18 @@ export function makeVideoElementDisplayInterface(): DisplayInterface {
hls?.setSubtitleOption({ lang });
return promise;
},
changeAudioTrack(track) {
if (!hls) return;
const audioTrack = hls?.audioTracks.find(
(t) => t.id.toString() === track.id,
);
if (!audioTrack) return;
hls.audioTrack = hls.audioTracks.indexOf(audioTrack);
emit("changedaudiotrack", {
id: audioTrack.id.toString(),
label: audioTrack.name,
language: audioTrack.lang ?? "unknown",
});
},
};
}

3
src/components/player/display/chromecast.ts

@ -283,5 +283,8 @@ export function makeChromecastDisplayInterface( @@ -283,5 +283,8 @@ export function makeChromecastDisplayInterface(
async setSubtitlePreference() {
return Promise.resolve();
},
changeAudioTrack() {
// cant change audio tracks
},
};
}

5
src/components/player/display/displayInterface.ts

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
import { MediaPlaylist } from "hls.js";
import { MWMediaType } from "@/backend/metadata/types/mw";
import { CaptionListItem } from "@/stores/player/slices/source";
import { AudioTrack, CaptionListItem } from "@/stores/player/slices/source";
import { LoadableSource, SourceQuality } from "@/stores/player/utils/qualities";
import { Listener } from "@/utils/events";
@ -25,6 +25,8 @@ export type DisplayInterfaceEvents = { @@ -25,6 +25,8 @@ export type DisplayInterfaceEvents = {
loading: boolean;
qualities: SourceQuality[];
changedquality: SourceQuality | null;
audiotracks: AudioTrack[];
changedaudiotrack: AudioTrack | null;
needstrack: boolean;
canairplay: boolean;
playbackrate: number;
@ -60,6 +62,7 @@ export interface DisplayInterface extends Listener<DisplayInterfaceEvents> { @@ -60,6 +62,7 @@ export interface DisplayInterface extends Listener<DisplayInterfaceEvents> {
automaticQuality: boolean,
preferredQuality: SourceQuality | null,
): void;
changeAudioTrack(audioTrack: AudioTrack): void;
processVideoElement(video: HTMLVideoElement): void;
processContainerElement(container: HTMLElement): void;
toggleFullscreen(): void;

23
src/pages/onboarding/OnboardingExtension.tsx

@ -2,8 +2,7 @@ import { ReactNode, useCallback, useEffect, useMemo, useState } from "react"; @@ -2,8 +2,7 @@ import { ReactNode, useCallback, useEffect, useMemo, useState } from "react";
import { Trans, useTranslation } from "react-i18next";
import { useAsyncFn, useInterval } from "react-use";
import { isAllowedExtensionVersion } from "@/backend/extension/compatibility";
import { extensionInfo, sendPage } from "@/backend/extension/messaging";
import { sendPage } from "@/backend/extension/messaging";
import { Button } from "@/components/buttons/Button";
import { Icon, Icons } from "@/components/Icon";
import { Loading } from "@/components/layout/Loading";
@ -22,24 +21,8 @@ import { @@ -22,24 +21,8 @@ import {
ExtensionDetectionResult,
detectExtensionInstall,
} from "@/utils/detectFeatures";
type ExtensionStatus =
| "unknown"
| "failed"
| "disallowed"
| "noperms"
| "outdated"
| "success";
async function getExtensionState(): Promise<ExtensionStatus> {
const info = await extensionInfo();
if (!info) return "unknown"; // cant talk to extension
if (!info.success) return "failed"; // extension failed to respond
if (!info.allowed) return "disallowed"; // extension is not enabled on this page
if (!info.hasPermission) return "noperms"; // extension has no perms to do it's tasks
if (!isAllowedExtensionVersion(info.version)) return "outdated"; // extension is too old
return "success"; // no problems
}
import { getExtensionState } from "@/utils/extension";
import type { ExtensionStatus } from "@/utils/extension";
function RefreshBar() {
const { t } = useTranslation();

4
src/pages/parts/admin/WorkerTestPart.tsx

@ -83,10 +83,12 @@ export function WorkerTestPart() { @@ -83,10 +83,12 @@ export function WorkerTestPart() {
status: "success",
});
} catch (err) {
const error = err as Error;
error.message = error.message.replace(worker.url, "WORKER_URL");
updateWorker(worker.id, {
id: worker.id,
status: "error",
error: err as Error,
error,
});
}
});

61
src/pages/parts/player/ScrapeErrorPart.tsx

@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
import { useMemo } from "react";
import { useTranslation } from "react-i18next";
import { useEffect, useMemo, useState } from "react";
import { Trans, useTranslation } from "react-i18next";
import { useLocation } from "react-router-dom";
import { sendPage } from "@/backend/extension/messaging";
import { Button } from "@/components/buttons/Button";
import { Icons } from "@/components/Icon";
import { IconPill } from "@/components/layout/IconPill";
@ -10,6 +11,8 @@ import { Paragraph } from "@/components/text/Paragraph"; @@ -10,6 +11,8 @@ import { Paragraph } from "@/components/text/Paragraph";
import { Title } from "@/components/text/Title";
import { ScrapingItems, ScrapingSegment } from "@/hooks/useProviderScrape";
import { ErrorContainer, ErrorLayout } from "@/pages/layouts/ErrorLayout";
import { getExtensionState } from "@/utils/extension";
import type { ExtensionStatus } from "@/utils/extension";
import { getProviderApiUrls } from "@/utils/proxyUrls";
import { ErrorCardInModal } from "../errors/ErrorCard";
@ -25,6 +28,8 @@ export function ScrapeErrorPart(props: ScrapeErrorPartProps) { @@ -25,6 +28,8 @@ export function ScrapeErrorPart(props: ScrapeErrorPartProps) {
const { t } = useTranslation();
const modal = useModal("error");
const location = useLocation();
const [extensionState, setExtensionState] =
useState<ExtensionStatus>("unknown");
const error = useMemo(() => {
const data = props.data;
@ -42,6 +47,58 @@ export function ScrapeErrorPart(props: ScrapeErrorPartProps) { @@ -42,6 +47,58 @@ export function ScrapeErrorPart(props: ScrapeErrorPartProps) {
return str;
}, [props, location]);
useEffect(() => {
getExtensionState().then((state: ExtensionStatus) => {
setExtensionState(state);
});
}, [t]);
if (extensionState === "disallowed") {
return (
<ErrorLayout>
<ErrorContainer>
<IconPill icon={Icons.LOCK}>
{t("player.scraping.extensionFailure.badge")}
</IconPill>
<Title>{t("player.scraping.extensionFailure.title")}</Title>
<Paragraph>
<Trans
i18nKey="player.scraping.extensionFailure.text"
components={{
bold: (
<span className="font-bold" style={{ color: "#cfcfcf" }} />
),
}}
/>
</Paragraph>
<div className="flex gap-3">
<Button
href="/"
theme="secondary"
padding="md:px-12 p-2.5"
className="mt-6"
>
{t("player.scraping.extensionFailure.homeButton")}
</Button>
<Button
onClick={() => {
sendPage({
page: "PermissionGrant",
redirectUrl: window.location.href,
});
}}
theme="purple"
padding="md:px-12 p-2.5"
className="mt-6"
>
{t("player.scraping.extensionFailure.enableExtension")}
</Button>
</div>
</ErrorContainer>
</ErrorLayout>
);
}
return (
<ErrorLayout>
<ErrorContainer>

10
src/stores/player/slices/display.ts

@ -75,6 +75,16 @@ export const createDisplaySlice: MakeSlice<DisplaySlice> = (set, get) => ({ @@ -75,6 +75,16 @@ export const createDisplaySlice: MakeSlice<DisplaySlice> = (set, get) => ({
s.currentQuality = quality;
});
});
newDisplay.on("audiotracks", (audioTracks) => {
set((s) => {
s.audioTracks = audioTracks;
});
});
newDisplay.on("changedaudiotrack", (audioTrack) => {
set((s) => {
s.currentAudioTrack = audioTrack;
});
});
newDisplay.on("needstrack", (needsTrack) => {
set((s) => {
s.caption.asTrack = needsTrack;

10
src/stores/player/slices/source.ts

@ -56,12 +56,20 @@ export interface CaptionListItem { @@ -56,12 +56,20 @@ export interface CaptionListItem {
hls?: boolean;
}
export interface AudioTrack {
id: string;
label: string;
language: string;
}
export interface SourceSlice {
status: PlayerStatus;
source: SourceSliceSource | null;
sourceId: string | null;
qualities: SourceQuality[];
audioTracks: AudioTrack[];
currentQuality: SourceQuality | null;
currentAudioTrack: AudioTrack | null;
captionList: CaptionListItem[];
caption: {
selected: Caption | null;
@ -109,8 +117,10 @@ export const createSourceSlice: MakeSlice<SourceSlice> = (set, get) => ({ @@ -109,8 +117,10 @@ export const createSourceSlice: MakeSlice<SourceSlice> = (set, get) => ({
source: null,
sourceId: null,
qualities: [],
audioTracks: [],
captionList: [],
currentQuality: null,
currentAudioTrack: null,
status: playerStatus.IDLE,
meta: null,
caption: {

20
src/utils/extension.ts

@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
import { isAllowedExtensionVersion } from "@/backend/extension/compatibility";
import { extensionInfo } from "@/backend/extension/messaging";
export type ExtensionStatus =
| "unknown"
| "failed"
| "disallowed"
| "noperms"
| "outdated"
| "success";
export async function getExtensionState(): Promise<ExtensionStatus> {
const info = await extensionInfo();
if (!info) return "unknown"; // cant talk to extension
if (!info.success) return "failed"; // extension failed to respond
if (!info.allowed) return "disallowed"; // extension is not enabled on this page
if (!info.hasPermission) return "noperms"; // extension has no perms to do it's tasks
if (!isAllowedExtensionVersion(info.version)) return "outdated"; // extension is too old
return "success"; // no problems
}

1
src/utils/mediaTypes.ts

@ -2,6 +2,7 @@ export interface MediaItem { @@ -2,6 +2,7 @@ export interface MediaItem {
id: string;
title: string;
year?: number;
release_date?: Date;
poster?: string;
type: "show" | "movie";
}

Loading…
Cancel
Save