diff --git a/src/pages/movie/profile.tsx b/src/pages/movie/profile.tsx
index 9bea3a7..c07aea4 100644
--- a/src/pages/movie/profile.tsx
+++ b/src/pages/movie/profile.tsx
@@ -4,14 +4,21 @@
import { For, Show, createSignal, onMount } from "solid-js";
import { ArrowLeft } from "lucide-solid";
-import { MovieProfile, delete_movie, fetch_movie_profile, update_movie_profile } from "@/services";
+import {
+ MovieProfile,
+ delete_movie,
+ fetch_movie_profile,
+ parse_video_file_name,
+ update_movie_profile,
+ upload_subtitle_for_movie,
+} from "@/services";
import { Button, Dialog, Skeleton, LazyImage, ScrollView, Input } from "@/components/ui";
-import { TMDBSearcherDialog } from "@/components/TMDBSearcher/dialog";
-import { TMDBSearcherDialogCore } from "@/components/TMDBSearcher/store";
+import { TMDBSearcherDialog, TMDBSearcherDialogCore } from "@/components/TMDBSearcher";
import { DialogCore, ButtonCore, ScrollViewCore, InputCore } from "@/domains/ui";
import { RequestCore } from "@/domains/request";
import { ViewComponent } from "@/types";
import { appendAction, homeLayout, mediaPlayingPage, rootView } from "@/store";
+import { SelectionCore } from "@/domains/cur";
export const MovieProfilePage: ViewComponent = (props) => {
const { app, view } = props;
@@ -37,18 +44,102 @@ export const MovieProfilePage: ViewComponent = (props) => {
profileRequest.reload();
},
});
+ const filenameParseRequest = new RequestCore(parse_video_file_name, {
+ onLoading(loading) {
+ subtitleUploadDialog.okBtn.setLoading(loading);
+ },
+ });
+ const uploadRequest = new RequestCore(upload_subtitle_for_movie, {
+ onLoading(loading) {
+ subtitleUploadDialog.okBtn.setLoading(loading);
+ },
+ onSuccess() {
+ app.tip({
+ text: ["字幕上传成功"],
+ });
+ subtitleUploadDialog.hide();
+ },
+ onFailed(error) {
+ app.tip({
+ text: ["字幕上传失败", error.message],
+ });
+ },
+ });
+ const subtitleValues = new SelectionCore<{ drive_id: string; lang: string; file: File }>();
const subtitleUploadInput = new InputCore({
defaultValue: [],
placeholder: "上传字幕文件",
type: "file",
- onChange(v) {
- console.log(v);
+ async onChange(v) {
+ const file = v[0];
+ if (!file) {
+ return;
+ }
+ if (!profileRequest.response) {
+ app.tip({
+ text: ["请等待详情加载完成"],
+ });
+ return;
+ }
+ if (profileRequest.response.sources.length === 0) {
+ app.tip({
+ text: ["必须包含至少一个视频源"],
+ });
+ return;
+ }
+ const { name } = file;
+ const r = await filenameParseRequest.run({ name, keys: ["subtitle_lang"] });
+ if (r.error) {
+ app.tip({
+ text: ["文件名解析失败"],
+ });
+ return;
+ }
+ const { subtitle_lang } = r.data;
+ if (!subtitle_lang) {
+ app.tip({
+ text: ["文件名中没有解析出字幕语言"],
+ });
+ return;
+ }
+ const sources = profileRequest.response.sources;
+ const reference_id = sources[0].drive.id;
+ // 使用 every 方法遍历数组，检查每个元素的 drive.id 是否和参考 id 相同
+ const all_ids_equal = sources.every((source) => source.drive.id === reference_id);
+ if (!all_ids_equal) {
+ app.tip({
+ text: ["视频源在多个云盘内，请手动选择上传至哪个云盘"],
+ });
+ return;
+ }
+ subtitleValues.select({
+ drive_id: reference_id,
+ file,
+ lang: subtitle_lang,
+ });
+ },
+ });
+ const subtitleUploadBtn = new ButtonCore({
+ onClick() {
+ subtitleUploadDialog.show();
},
});
const subtitleUploadDialog = new DialogCore({
title: "上传字幕",
onOk() {
- // 开始上传字幕
+ if (!subtitleValues.value) {
+ app.tip({
+ text: ["请先上传字幕文件"],
+ });
+ return;
+ }
+ const { drive_id, lang, file } = subtitleValues.value;
+ uploadRequest.run({
+ movie_id: view.params.id,
+ drive_id,
+ lang,
+ file,
+ });
},
});
const movieDeletingBtn = new ButtonCore({
@@ -115,7 +206,7 @@ export const MovieProfilePage: ViewComponent = (props) => {
const [profile, setProfile] = createSignal(null);
- view.onShow(() => {
+ onMount(() => {
const { id } = view.params;
profileRequest.run({ movie_id: id });
});
@@ -181,13 +272,18 @@ export const MovieProfilePage: ViewComponent = (props) => {
-
+
+
可播放源
{(source) => {
- const { file_id, file_name, parent_paths } = source;
+ const { file_id, file_name, parent_paths, drive } = source;
return (
{
}}
>
-
+
{parent_paths}/{file_name}
diff --git a/src/pages/tv/profile.tsx b/src/pages/tv/profile.tsx
index 855dda8..7816713 100644
--- a/src/pages/tv/profile.tsx
+++ b/src/pages/tv/profile.tsx
@@ -148,13 +148,54 @@ export const TVProfilePage: ViewComponent = (props) => {
},
});
const uploadRequest = new RequestCore(upload_subtitle_for_episode, {
+ onLoading(loading) {
+ subtitleUploadDialog.okBtn.setLoading(loading);
+ },
onSuccess() {
app.tip({
text: ["字幕上传成功"],
});
+ subtitleUploadDialog.hide();
+ },
+ onFailed(error) {
+ app.tip({
+ text: ["字幕上传失败", error.message],
+ });
},
});
const filenameParseRequest = new RequestCore(parse_video_file_name);
+ const subtitleValues = new SelectionCore<{
+ episode_text: string;
+ season_text: string;
+ drive_id: string;
+ lang: string;
+ file: File;
+ }>();
+ const subtitleUploadDialog = new DialogCore({
+ title: "上传字幕",
+ onOk() {
+ if (!subtitleValues.value) {
+ app.tip({
+ text: ["请先上传字幕文件"],
+ });
+ return;
+ }
+ const { drive_id, lang, episode_text, season_text, file } = subtitleValues.value;
+ uploadRequest.run({
+ tv_id: view.params.id,
+ season_text,
+ episode_text,
+ drive_id,
+ lang,
+ file,
+ });
+ },
+ });
+ const subtitleUploadBtn = new ButtonCore({
+ onClick() {
+ subtitleUploadDialog.show();
+ },
+ });
const subtitleUploadInput = new InputCore({
defaultValue: [],
type: "file",
@@ -177,7 +218,7 @@ export const TVProfilePage: ViewComponent = (props) => {
});
return;
}
- const { subtitle_lang, episode: episode_text } = r.data;
+ const { subtitle_lang, episode: episode_text, season: season_text } = r.data;
if (!subtitle_lang) {
app.tip({
text: ["文件名中没有解析出字幕语言"],
@@ -211,12 +252,13 @@ export const TVProfilePage: ViewComponent = (props) => {
});
return;
}
- uploadRequest.run({
- episode_id: matched_episode.id,
- drive_id: sources[0].drive.id,
+ subtitleValues.select({
+ episode_text,
+ season_text,
+ drive_id: reference_id,
file,
+ lang: subtitle_lang,
});
- console.log(r.data, subtitle_lang, matched_episode);
},
});
const tvDeleteBtn = new ButtonCore({
@@ -286,8 +328,12 @@ export const TVProfilePage: ViewComponent = (props) => {
const [profile, setProfile] = createSignal
(null);
const [curEpisodeResponse, setCurEpisodeResponse] = createSignal(curEpisodeList.response);
+ const [parsedSubtitle, setParsedSubtitle] = createSignal(subtitleValues.value);
const [curSeason, setCurSeason] = createSignal(curSeasonSelector.value);
+ subtitleValues.onStateChange((nextState) => {
+ setParsedSubtitle(nextState);
+ });
curSeasonSelector.onStateChange((nextState) => {
setCurSeason(nextState);
});
@@ -370,9 +416,7 @@ export const TVProfilePage: ViewComponent = (props) => {
-
-
-
+
@@ -484,6 +528,27 @@ export const TVProfilePage: ViewComponent = (props) => {
请仅在需要重新索引关联的文件时进行删除操作
+
);
diff --git a/src/services/index.ts b/src/services/index.ts
index b8e72c9..459d744 100644
--- a/src/services/index.ts
+++ b/src/services/index.ts
@@ -9,6 +9,7 @@ import { request } from "@/utils/request";
import { JSONObject, ListResponse, RequestedResource, Result, Unpacked, UnpackedResult } from "@/types";
import { EpisodeResolutionTypeTexts, EpisodeResolutionTypes } from "@/domains/tv/constants";
import { ReportTypeTexts, ReportTypes } from "@/constants";
+import { query_stringify } from "@/utils";
/**
* 获取电视剧列表
@@ -1098,9 +1099,15 @@ export async function fetch_movie_profile(body: { movie_id: string }) {
air_date: string;
tmdb_id: number;
sources: {
+ id: string;
file_id: string;
- parent_paths: string;
file_name: string;
+ parent_paths: string;
+ drive: {
+ id: string;
+ name: string;
+ avatar: string;
+ };
}[];
}>(`/api/admin/movie/${movie_id}`);
return r;
@@ -1111,11 +1118,36 @@ export function upload_file(body: FormData) {
return request.post("/api/admin/upload", body);
}
-export function upload_subtitle_for_episode(params: { episode_id: string; drive_id: string; file: File }) {
- const { episode_id, drive_id, file } = params;
+export function upload_subtitle_for_episode(params: {
+ tv_id: string;
+ season_text: string;
+ episode_text: string;
+ lang: string;
+ drive_id: string;
+ file: File;
+}) {
+ const { tv_id, drive_id, lang, season_text, episode_text, file } = params;
const body = new FormData();
body.append("file", file);
- return request.post(`/api/admin/episode/${episode_id}/subtitle/add?drive_id=${drive_id}`, body);
+ body.append("drive", drive_id);
+ body.append("lang", lang);
+ body.append("season_text", season_text);
+ body.append("episode_text", episode_text);
+ const search = query_stringify({
+ tv_id,
+ drive_id,
+ lang,
+ season_text,
+ episode_text,
+ });
+ return request.post(`/api/admin/episode/subtitle/add?${search}`, body);
+}
+
+export function upload_subtitle_for_movie(params: { movie_id: string; drive_id: string; lang: string; file: File }) {
+ const { movie_id, drive_id, lang, file } = params;
+ const body = new FormData();
+ body.append("file", file);
+ return request.post(`/api/admin/movie/${movie_id}/subtitle/add?drive_id=${drive_id}&lang=${lang}`, body);
}
export function notify_test(values: { text: string; token: string }) {
@@ -1131,3 +1163,8 @@ export function update_settings(values: Partial<{ push_deer_token: string }>) {
const { push_deer_token } = values;
return request.post(`/api/admin/settings/update`, { push_deer_token });
}
+
+export function sync_folder(values: { drive_id: string; file_id: string }) {
+ const { drive_id, file_id } = values;
+ return request.get<{ job_id: string }>(`/api/admin/file/${file_id}/sync`, { drive_id });
+}
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 1728063..f17c40b 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -88,6 +88,11 @@ export function update
(arr: T[], index: number, nextItem: T) {
return [...arr.slice(0, index), nextItem, ...arr.slice(index + 1)];
}
+/**
+ * 将对象转成 search 字符串，前面不带 ?
+ * @param query
+ * @returns
+ */
export function query_stringify(query: Record) {
return Object.keys(query)
.filter((key) => {