Fix issues

This commit is contained in:
Isra 2024-03-18 13:41:10 -05:00
parent 57d3f69efa
commit c9d2d7134b
3 changed files with 64 additions and 39 deletions

View File

@ -325,7 +325,8 @@
"fixCapitals": "Fix capitalization" "fixCapitals": "Fix capitalization"
}, },
"title": "Subtitles", "title": "Subtitles",
"unknownLanguage": "Unknown" "unknownLanguage": "Unknown",
"dropSubtitleFile": "Drop subtitle file here"
} }
}, },
"metadata": { "metadata": {

View File

@ -38,7 +38,7 @@ export function FileDropHandler(props: FileDropHandlerProps) {
}, [dragging, props]); }, [dragging, props]);
return ( return (
<section <div
onDragEnter={handleDragEnter} onDragEnter={handleDragEnter}
onDragLeave={handleDragLeave} onDragLeave={handleDragLeave}
onDragOver={handleDragOver} onDragOver={handleDragOver}
@ -46,6 +46,6 @@ export function FileDropHandler(props: FileDropHandlerProps) {
className={props.className} className={props.className}
> >
{props.children} {props.children}
</section> </div>
); );
} }

View File

@ -1,5 +1,5 @@
import Fuse from "fuse.js"; 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 { useTranslation } from "react-i18next";
import { useAsyncFn } from "react-use"; import { useAsyncFn } from "react-use";
import { convert } from "subsrt-ts"; import { convert } from "subsrt-ts";
@ -7,6 +7,7 @@ import { convert } from "subsrt-ts";
import { subtitleTypeList } from "@/backend/helpers/subs"; import { subtitleTypeList } from "@/backend/helpers/subs";
import { FileDropHandler } from "@/components/DropFile"; import { FileDropHandler } from "@/components/DropFile";
import { FlagIcon } from "@/components/FlagIcon"; import { FlagIcon } from "@/components/FlagIcon";
import { Icon, Icons } from "@/components/Icon";
import { useCaptions } from "@/components/player/hooks/useCaptions"; import { useCaptions } from "@/components/player/hooks/useCaptions";
import { Menu } from "@/components/player/internals/ContextMenu"; import { Menu } from "@/components/player/internals/ContextMenu";
import { Input } from "@/components/player/internals/ContextMenu/Input"; import { Input } from "@/components/player/internals/ContextMenu/Input";
@ -127,6 +128,32 @@ export function CaptionsView({ id }: { id: string }) {
const [dragging, setDragging] = useState(false); const [dragging, setDragging] = useState(false);
const setCaption = usePlayerStore((s) => s.setCaption); 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( const captions = useMemo(
() => () =>
captionList.length !== 0 ? captionList : getHlsCaptionList?.() ?? [], captionList.length !== 0 ? captionList : getHlsCaptionList?.() ?? [],
@ -165,32 +192,19 @@ export function CaptionsView({ id }: { id: string }) {
}); });
return ( return (
<FileDropHandler <>
className={`transition duration-300 ${dragging ? "brightness-50" : ""}`}
onDraggingChange={(isDragging) => {
setDragging(isDragging);
}}
onDrop={(event) => {
const files = event.dataTransfer.files;
if (!files || files.length === 0) 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(files[0]);
}}
>
<div> <div>
{dragging && (
<div className="absolute inset-0 flex items-center justify-center text-white z-10 pointer-events-none">
<div className="flex flex-col items-center">
<Icon className="text-4xl mb-8" icon={Icons.FILE} />
<span className="text-xl">
{t("player.menus.subtitles.dropSubtitleFile")}
</span>
</div>
</div>
)}
<Menu.BackLink <Menu.BackLink
onClick={() => router.navigate("/")} onClick={() => router.navigate("/")}
rightSide={ rightSide={
@ -205,19 +219,29 @@ export function CaptionsView({ id }: { id: string }) {
> >
{t("player.menus.subtitles.title")} {t("player.menus.subtitles.title")}
</Menu.BackLink> </Menu.BackLink>
</div>
<FileDropHandler
className={`transition duration-300 ${dragging ? "brightness-50" : ""}`}
onDraggingChange={(isDragging) => {
setDragging(isDragging);
}}
onDrop={(event) => onDrop(event)}
>
<div className="mt-3"> <div className="mt-3">
<Input value={searchQuery} onInput={setSearchQuery} /> <Input value={searchQuery} onInput={setSearchQuery} />
</div> </div>
</div>
<Menu.ScrollToActiveSection className="!pt-1 mt-2 pb-3"> <Menu.ScrollToActiveSection className="!pt-1 mt-2 pb-3">
<CaptionOption onClick={() => disable()} selected={!selectedCaptionId}> <CaptionOption
onClick={() => disable()}
selected={!selectedCaptionId}
>
{t("player.menus.subtitles.offChoice")} {t("player.menus.subtitles.offChoice")}
</CaptionOption> </CaptionOption>
<CustomCaptionOption /> <CustomCaptionOption />
{content} {content}
</Menu.ScrollToActiveSection> </Menu.ScrollToActiveSection>
</FileDropHandler> </FileDropHandler>
</>
); );
} }