refactor: frontend logic

xpadev-net · Nov 22, 2023 · 9601aab · 9601aab
1 parent 6c866f2
commit 9601aab
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/src/controller/comment-picker/remote/remote-comment-picker.tsx b/src/controller/comment-picker/remote/remote-comment-picker.tsx
@@ -2,7 +2,7 @@ import { TextField } from "@mui/material";
 import Button from "@mui/material/Button";
 import { useSetAtom } from "jotai";
 import type { ChangeEvent, FC } from "react";
-import { useState } from "react";
+import { useRef, useState } from "react";
 
 import type { TCommentOption, TWatchV3Metadata } from "@/@types/niconico";
 import type { TCommentItemRemote } from "@/@types/queue";
@@ -26,14 +26,24 @@ const RemoteCommentPicker: FC<Props> = ({ onChange }) => {
   >(undefined);
   const setMessage = useSetAtom(messageAtom);
   const setIsLoading = useSetAtom(isLoadingAtom);
+  const lastUrl = useRef<string>("");
+
   const onUrlChange = (e: ChangeEvent<HTMLInputElement>): void => {
     setMetadata(undefined);
     setUrl(e.target.value);
   };
   const updateMetadata = (): void => {
     void (async () => {
       const nicoId = getNicoId(url);
-      if (!isNicovideoUrl(url) || metadata || !nicoId) return;
+      if (!isNicovideoUrl(url) || metadata || !nicoId) {
+        if (!url || lastUrl.current === nicoId) return;
+        setMessage({
+          title: "URLが正しくありません",
+          content:
+            "以下のような形式のURLを入力してください\nhttps://www.nicovideo.jp/watch/sm9\nhttps://nico.ms/sm9\ncontroller/movie-picker/remote/remote-movie-picker.tsx / getFormats",
+        });
+        return;
+      }
       setIsLoading(true);
       const targetMetadata = (await window.api.request({
         type: "getNiconicoMovieMetadata",
@@ -56,6 +66,7 @@ const RemoteCommentPicker: FC<Props> = ({ onChange }) => {
         return;
       }
       setMetadata(targetMetadata);
+      lastUrl.current = nicoId;
     })();
   };
   const onClick = (): void => {

diff --git a/src/controller/movie-picker/remote/remote-movie-picker.tsx b/src/controller/movie-picker/remote/remote-movie-picker.tsx
@@ -1,8 +1,8 @@
 import { FormControlLabel, Radio, RadioGroup, TextField } from "@mui/material";
 import Button from "@mui/material/Button";
 import { useSetAtom } from "jotai";
-import type { ChangeEvent, FC } from "react";
-import { useState } from "react";
+import type { ChangeEvent, FC, KeyboardEvent } from "react";
+import { useRef, useState } from "react";
 
 import type { TWatchV3Metadata } from "@/@types/niconico";
 import type { TMovieItemRemote, TRemoteMovieItemFormat } from "@/@types/queue";
@@ -26,6 +26,7 @@ const RemoteMoviePicker: FC<Props> = ({ onChange }) => {
   const [format, setFormat] = useState<TRemoteMovieItemFormat | undefined>();
   const setMessage = useSetAtom(messageAtom);
   const setIsLoading = useSetAtom(isLoadingAtom);
+  const lastUrl = useRef<string>("");
   const onUrlChange = (e: ChangeEvent<HTMLInputElement>): void => {
     setMetadata(undefined);
     setUrl(e.target.value);
@@ -34,11 +35,11 @@ const RemoteMoviePicker: FC<Props> = ({ onChange }) => {
     void (async () => {
       const nicoId = getNicoId(url);
       if (!isNicovideoUrl(url) || metadata || !nicoId) {
-        if (!url) return;
+        if (!url || lastUrl.current === nicoId) return;
         setMessage({
           title: "URLが正しくありません",
           content:
-            "以下のような形式のURLを入力してください\nhttps://www.nicovideo.jp/watch/sm9\nhttps://nico.ms/sm9",
+            "以下のような形式のURLを入力してください\nhttps://www.nicovideo.jp/watch/sm9\nhttps://nico.ms/sm9\ncontroller/movie-picker/remote/remote-movie-picker.tsx / getFormats",
         });
         return;
       }
@@ -65,16 +66,21 @@ const RemoteMoviePicker: FC<Props> = ({ onChange }) => {
       }
       setMediaServer(targetMetadata.data.media.domand ? "dms" : "dmc");
       setMetadata(targetMetadata);
+      lastUrl.current = nicoId;
     })();
   };
+  const onKeyDown = (e: KeyboardEvent<HTMLInputElement>): void => {
+    if (e.key !== "Enter") return;
+    getFormats();
+  };
   const onClick = (): void => {
     void (async () => {
       const nicoId = getNicoId(url);
       if (!nicoId) {
         setMessage({
           title: "URLが正しくありません",
           content:
-            "以下のような形式のURLを入力してください\nhttps://www.nicovideo.jp/watch/sm9\nhttps://nico.ms/sm9",
+            "以下のような形式のURLを入力してください\nhttps://www.nicovideo.jp/watch/sm9\nhttps://nico.ms/sm9\ncontroller/movie-picker/remote/remote-movie-picker.tsx / onClick",
         });
         return;
       }
@@ -122,6 +128,7 @@ const RemoteMoviePicker: FC<Props> = ({ onChange }) => {
         value={url}
         onChange={onUrlChange}
         onBlur={getFormats}
+        onKeyDown={onKeyDown}
         fullWidth={true}
       />
       {metadata && (