From 51724987ca481930361d8e5a67e26e1e7e698eb7 Mon Sep 17 00:00:00 2001 From: mrjvs Date: Sun, 24 Dec 2023 15:51:19 +0100 Subject: [PATCH 1/4] Fix popout bug --- src/components/overlays/OverlayDisplay.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/components/overlays/OverlayDisplay.tsx b/src/components/overlays/OverlayDisplay.tsx index aac20cc7..1898a92f 100644 --- a/src/components/overlays/OverlayDisplay.tsx +++ b/src/components/overlays/OverlayDisplay.tsx @@ -50,11 +50,7 @@ export function OverlayPortal(props: { {portalElement ? createPortal( - +
Date: Sun, 24 Dec 2023 16:12:28 +0100 Subject: [PATCH 2/4] Fix missing timeout on touch controls hovering --- .eslintrc.js | 2 +- .../player/internals/VideoClickTarget.tsx | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 8a057a44..e9b54595 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -62,7 +62,7 @@ module.exports = { "no-nested-ternary": "off", "prefer-destructuring": "off", "no-param-reassign": "off", - "@typescript-eslint/no-unused-vars": ["warn", { argsIgnorePattern: "^_" }], + "@typescript-eslint/no-unused-vars": ["warn", { argsIgnorePattern: "^_", varsIgnorePattern: "^_" }], "react/jsx-filename-extension": [ "error", { extensions: [".js", ".tsx", ".jsx"] } diff --git a/src/components/player/internals/VideoClickTarget.tsx b/src/components/player/internals/VideoClickTarget.tsx index c278e217..0d92a225 100644 --- a/src/components/player/internals/VideoClickTarget.tsx +++ b/src/components/player/internals/VideoClickTarget.tsx @@ -1,5 +1,6 @@ import classNames from "classnames"; import { PointerEvent, useCallback } from "react"; +import { useEffectOnce, useTimeoutFn } from "react-use"; import { useShouldShowVideoElement } from "@/components/player/internals/VideoContainer"; import { PlayerHoverState } from "@/stores/player/slices/interface"; @@ -13,6 +14,12 @@ export function VideoClickTarget(props: { showingControls: boolean }) { (s) => s.updateInterfaceHovering, ); const hovering = usePlayerStore((s) => s.interface.hovering); + const [_, cancel, reset] = useTimeoutFn(() => { + updateInterfaceHovering(PlayerHoverState.NOT_HOVERING); + }, 3000); + useEffectOnce(() => { + cancel(); + }); const toggleFullscreen = useCallback(() => { display?.toggleFullscreen(); @@ -29,11 +36,15 @@ export function VideoClickTarget(props: { showingControls: boolean }) { } // toggle on other types of clicks - if (hovering !== PlayerHoverState.MOBILE_TAPPED) + if (hovering !== PlayerHoverState.MOBILE_TAPPED) { updateInterfaceHovering(PlayerHoverState.MOBILE_TAPPED); - else updateInterfaceHovering(PlayerHoverState.NOT_HOVERING); + reset(); + } else { + updateInterfaceHovering(PlayerHoverState.NOT_HOVERING); + cancel(); + } }, - [display, isPaused, hovering, updateInterfaceHovering], + [display, isPaused, hovering, updateInterfaceHovering, reset, cancel], ); if (!show) return null; From 12f30bc42f0fef437fd06a215c8cdeffd883b1b3 Mon Sep 17 00:00:00 2001 From: mrjvs Date: Sun, 24 Dec 2023 16:22:09 +0100 Subject: [PATCH 3/4] Improve poster url quality --- src/backend/metadata/tmdb.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/metadata/tmdb.ts b/src/backend/metadata/tmdb.ts index 8cc1a350..3bd8c3e7 100644 --- a/src/backend/metadata/tmdb.ts +++ b/src/backend/metadata/tmdb.ts @@ -215,7 +215,7 @@ export function getMediaDetails< } export function getMediaPoster(posterPath: string | null): string | undefined { - if (posterPath) return `https://image.tmdb.org/t/p/w185/${posterPath}`; + if (posterPath) return `https://image.tmdb.org/t/p/w342/${posterPath}`; } export async function getEpisodes( From ac7fa99c4516e23040c60ad0b0fdd0437bae9288 Mon Sep 17 00:00:00 2001 From: mrjvs Date: Sun, 24 Dec 2023 16:37:00 +0100 Subject: [PATCH 4/4] Fix noOutput parsing + better error modal --- src/backend/helpers/providerApi.ts | 9 +++++++-- src/pages/parts/player/ScrapeErrorPart.tsx | 12 +++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/backend/helpers/providerApi.ts b/src/backend/helpers/providerApi.ts index 0b6e07a3..528e392c 100644 --- a/src/backend/helpers/providerApi.ts +++ b/src/backend/helpers/providerApi.ts @@ -94,6 +94,11 @@ export async function getApiToken(): Promise { return apiToken; } +function parseEventInput(inp: string): any { + if (inp.length === 0) return {}; + return JSON.parse(inp); +} + export async function connectServerSideEvents( url: string, endEvents: string[], @@ -115,12 +120,12 @@ export async function connectServerSideEvents( endEvents.forEach((evt) => { eventSource.addEventListener(evt, (e) => { eventSource.close(); - promResolve(JSON.parse(e.data)); + promResolve(parseEventInput(e.data)); }); }); eventSource.addEventListener("token", (e) => { - setApiToken(JSON.parse(e.data)); + setApiToken(parseEventInput(e.data)); }); eventSource.addEventListener("error", (err: MessageEvent) => { diff --git a/src/pages/parts/player/ScrapeErrorPart.tsx b/src/pages/parts/player/ScrapeErrorPart.tsx index 52901786..6b52c796 100644 --- a/src/pages/parts/player/ScrapeErrorPart.tsx +++ b/src/pages/parts/player/ScrapeErrorPart.tsx @@ -1,5 +1,6 @@ import { useMemo } from "react"; import { useTranslation } from "react-i18next"; +import { useLocation } from "react-router-dom"; import { Button } from "@/components/buttons/Button"; import { Icons } from "@/components/Icon"; @@ -9,6 +10,7 @@ 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 { getProviderApiUrls } from "@/utils/proxyUrls"; import { ErrorCardInModal } from "../errors/ErrorCard"; @@ -22,21 +24,21 @@ export interface ScrapeErrorPartProps { export function ScrapeErrorPart(props: ScrapeErrorPartProps) { const { t } = useTranslation(); const modal = useModal("error"); + const location = useLocation(); const error = useMemo(() => { const data = props.data; - const amountError = Object.values(data.sources).filter( - (v) => v.status === "failure", - ); - if (amountError.length === 0) return null; let str = ""; + const apiUrls = getProviderApiUrls(); + str += `URL - ${location.pathname}\n`; + str += `API - ${apiUrls.length > 0}\n\n`; Object.values(data.sources).forEach((v) => { str += `${v.id}: ${v.status}\n`; if (v.reason) str += `${v.reason}\n`; if (v.error) str += `${v.error.toString()}\n`; }); return str; - }, [props]); + }, [props, location]); return (