This commit is contained in:
Julian Freeman
2026-04-19 09:56:09 -04:00
parent 4d5cac7a46
commit e86bc86793
18 changed files with 685 additions and 500 deletions

View File

@@ -1,6 +1,7 @@
# Generated by Cargo # Generated by Cargo
# will have compiled files and executables # will have compiled files and executables
/target/ /target/
/target*/
# Generated by Tauri # Generated by Tauri
# will have schema files for capabilities auto-completion # will have schema files for capabilities auto-completion

View File

@@ -10,6 +10,7 @@ use std::os::windows::process::CommandExt;
use zip::ZipArchive; use zip::ZipArchive;
use std::io::Cursor; use std::io::Cursor;
use crate::process_utils::first_non_empty_line;
use crate::storage::{self}; use crate::storage::{self};
const YT_DLP_REPO_URL: &str = "https://github.com/yt-dlp/yt-dlp/releases/latest/download"; const YT_DLP_REPO_URL: &str = "https://github.com/yt-dlp/yt-dlp/releases/latest/download";
@@ -285,6 +286,11 @@ pub async fn download_qjs(app: &AppHandle) -> Result<PathBuf> {
pub async fn update_qjs(app: &AppHandle) -> Result<String> { pub async fn update_qjs(app: &AppHandle) -> Result<String> {
// QuickJS doesn't have self-update, so we just re-download // QuickJS doesn't have self-update, so we just re-download
download_qjs(app).await?; download_qjs(app).await?;
let mut settings = storage::load_settings(app)?;
settings.last_updated = Some(chrono::Utc::now());
storage::save_settings(app, &settings)?;
Ok("QuickJS 已更新/安装".to_string()) Ok("QuickJS 已更新/安装".to_string())
} }
@@ -441,18 +447,8 @@ pub fn get_ffmpeg_version(app: &AppHandle) -> Result<String> {
let output = cmd.output()?; let output = cmd.output()?;
if output.status.success() { if output.status.success() {
// Prefer stdout, fallback to stderr if stdout empty if let Some(line) = first_non_empty_line(&output) {
let out = if !output.stdout.is_empty() { return Ok(line);
String::from_utf8_lossy(&output.stdout).to_string()
} else {
String::from_utf8_lossy(&output.stderr).to_string()
};
if let Some(first_line) = out.lines().next() {
let v = first_line.trim().to_string();
if !v.is_empty() {
return Ok(v);
}
} }
} }
@@ -465,6 +461,31 @@ pub fn get_qjs_version(app: &AppHandle) -> Result<String> {
if !path.exists() { if !path.exists() {
return Ok("未安装".to_string()); return Ok("未安装".to_string());
} }
let mut version_cmd = std::process::Command::new(&path);
version_cmd.arg("--version");
#[cfg(target_os = "windows")]
version_cmd.creation_flags(0x08000000);
if let Ok(output) = version_cmd.output() {
if output.status.success() {
if let Some(line) = first_non_empty_line(&output) {
return Ok(line);
}
}
}
let mut help_cmd = std::process::Command::new(&path);
help_cmd.arg("-h");
#[cfg(target_os = "windows")]
help_cmd.creation_flags(0x08000000);
if let Ok(output) = help_cmd.output() {
if let Some(line) = first_non_empty_line(&output) {
return Ok(line);
}
}
Ok("已安装".to_string()) Ok("已安装".to_string())
} }

View File

@@ -5,6 +5,10 @@ use crate::downloader::DownloadOptions;
use crate::storage::{Settings, HistoryItem}; use crate::storage::{Settings, HistoryItem};
use uuid::Uuid; use uuid::Uuid;
use std::path::Path; use std::path::Path;
use std::sync::LazyLock;
use tokio::sync::Semaphore;
static DOWNLOAD_SEMAPHORE: LazyLock<Semaphore> = LazyLock::new(|| Semaphore::new(3));
#[tauri::command] #[tauri::command]
pub async fn init_ytdlp(app: AppHandle) -> Result<bool, String> { pub async fn init_ytdlp(app: AppHandle) -> Result<bool, String> {
@@ -60,14 +64,29 @@ pub async fn fetch_image(url: String) -> Result<String, String> {
.await .await
.map_err(|e| e.to_string())?; .map_err(|e| e.to_string())?;
if !res.status().is_success() {
return Err(format!("image fetch failed with status {}", res.status()));
}
let mime = res
.headers()
.get(reqwest::header::CONTENT_TYPE)
.and_then(|value| value.to_str().ok())
.map(|value| value.split(';').next().unwrap_or("image/jpeg").to_string())
.unwrap_or_else(|| {
if url.to_lowercase().ends_with(".png") {
"image/png".to_string()
} else if url.to_lowercase().ends_with(".webp") {
"image/webp".to_string()
} else {
"image/jpeg".to_string()
}
});
let bytes = res.bytes().await.map_err(|e| e.to_string())?; let bytes = res.bytes().await.map_err(|e| e.to_string())?;
// Convert to base64 // Convert to base64
let b64 = general_purpose::STANDARD.encode(&bytes); let b64 = general_purpose::STANDARD.encode(&bytes);
// Simple heuristic for mime type
let mime = if url.to_lowercase().ends_with(".png") { "image/png" } else { "image/jpeg" };
Ok(format!("data:{};base64,{}", mime, b64)) Ok(format!("data:{};base64,{}", mime, b64))
} }
@@ -84,9 +103,11 @@ pub async fn start_download(app: AppHandle, url: String, options: DownloadOption
// Spawn the download task // Spawn the download task
tauri::async_runtime::spawn(async move { tauri::async_runtime::spawn(async move {
let _permit = DOWNLOAD_SEMAPHORE.acquire().await.ok();
let res = downloader::download_video(app.clone(), id_clone.clone(), url.clone(), options.clone()).await; let res = downloader::download_video(app.clone(), id_clone.clone(), url.clone(), options.clone()).await;
let status = if res.is_ok() { "success" } else { "failed" }; let status = if res.is_ok() { "success" } else { "failed" };
let file_path = res.ok().flatten();
// Add to history // Add to history
let output_dir = options.output_path.clone(); // Store the directory user selected let output_dir = options.output_path.clone(); // Store the directory user selected
@@ -97,6 +118,7 @@ pub async fn start_download(app: AppHandle, url: String, options: DownloadOption
thumbnail: metadata.thumbnail, thumbnail: metadata.thumbnail,
url: url, url: url,
output_path: output_dir, output_path: output_dir,
file_path,
timestamp: chrono::Utc::now(), timestamp: chrono::Utc::now(),
status: status.to_string(), status: status.to_string(),
format: options.output_format, format: options.output_format,
@@ -136,16 +158,16 @@ pub fn delete_history_item(app: AppHandle, id: String) -> Result<(), String> {
#[tauri::command] #[tauri::command]
pub async fn close_splash(app: AppHandle) { pub async fn close_splash(app: AppHandle) {
if let Some(splash) = app.get_webview_window("splashscreen") { if let Some(splash) = app.get_webview_window("splashscreen") {
splash.close().unwrap(); let _ = splash.close();
} }
if let Some(main) = app.get_webview_window("main") { if let Some(main) = app.get_webview_window("main") {
main.show().unwrap(); let _ = main.show();
} }
} }
#[tauri::command] #[tauri::command]
pub fn open_in_explorer(app: AppHandle, path: String) -> Result<(), String> { pub fn open_in_explorer(app: AppHandle, path: String) -> Result<(), String> {
let path_to_open = if Path::new(&path).exists() { let resolved_path = if Path::new(&path).exists() {
path path
} else { } else {
app.path().download_dir() app.path().download_dir()
@@ -155,17 +177,29 @@ pub fn open_in_explorer(app: AppHandle, path: String) -> Result<(), String> {
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
{ {
std::process::Command::new("explorer") let resolved = Path::new(&resolved_path);
.arg(path_to_open) let mut command = std::process::Command::new("explorer");
.spawn()
.map_err(|e| e.to_string())?; if resolved.is_file() {
command.arg("/select,").arg(resolved);
} else {
command.arg(resolved);
}
command.spawn().map_err(|e| e.to_string())?;
} }
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
{ {
std::process::Command::new("open") let resolved = Path::new(&resolved_path);
.arg(path_to_open) let mut command = std::process::Command::new("open");
.spawn()
.map_err(|e| e.to_string())?; if resolved.is_file() {
command.arg("-R").arg(resolved);
} else {
command.arg(resolved);
}
command.spawn().map_err(|e| e.to_string())?;
} }
Ok(()) Ok(())
} }

View File

@@ -57,6 +57,7 @@ pub struct LogEvent {
pub level: String, // "info", "error" pub level: String, // "info", "error"
} }
const FINAL_PATH_MARKER: &str = "__STREAM_CAPTURE_FINAL_PATH__";
pub async fn fetch_metadata(app: &AppHandle, url: &str, parse_mix_playlist: bool) -> Result<MetadataResult> { pub async fn fetch_metadata(app: &AppHandle, url: &str, parse_mix_playlist: bool) -> Result<MetadataResult> {
@@ -218,7 +219,7 @@ pub async fn download_video(
id: String, // Unique ID for this download task (provided by frontend) id: String, // Unique ID for this download task (provided by frontend)
url: String, url: String,
options: DownloadOptions, options: DownloadOptions,
) -> Result<String> { ) -> Result<Option<String>> {
let ytdlp_path = binary_manager::get_ytdlp_path(&app)?; let ytdlp_path = binary_manager::get_ytdlp_path(&app)?;
let qjs_path = binary_manager::get_qjs_path(&app)?; // Get absolute path to quickjs let qjs_path = binary_manager::get_qjs_path(&app)?; // Get absolute path to quickjs
let ffmpeg_path = binary_manager::get_ffmpeg_path(&app)?; // Get absolute path to ffmpeg let ffmpeg_path = binary_manager::get_ffmpeg_path(&app)?; // Get absolute path to ffmpeg
@@ -246,6 +247,8 @@ pub async fn download_video(
let output_template = format!("{}/%(title)s.%(ext)s", options.output_path.trim_end_matches(std::path::MAIN_SEPARATOR)); let output_template = format!("{}/%(title)s.%(ext)s", options.output_path.trim_end_matches(std::path::MAIN_SEPARATOR));
args.push("-o".to_string()); args.push("-o".to_string());
args.push(output_template); args.push(output_template);
args.push("--print".to_string());
args.push(format!("after_move:{FINAL_PATH_MARKER}%(filepath)s"));
// Formats // Formats
if options.is_audio_only { if options.is_audio_only {
@@ -295,56 +298,84 @@ pub async fn download_video(
let stdout = child.stdout.take().ok_or(anyhow!("Failed to open stdout"))?; let stdout = child.stdout.take().ok_or(anyhow!("Failed to open stdout"))?;
let stderr = child.stderr.take().ok_or(anyhow!("Failed to open stderr"))?; let stderr = child.stderr.take().ok_or(anyhow!("Failed to open stderr"))?;
let mut stdout_reader = BufReader::new(stdout); let progress_regex = Regex::new(r"\[download\]\s+(\d+(?:\.\d+)?)%.*?(?:\s+at\s+([^\s]+))?").unwrap();
let mut stderr_reader = BufReader::new(stderr);
let re = Regex::new(r"\[download\]\s+(\d+\.?\d*)%").unwrap(); let stdout_task = {
let app = app.clone();
let id = id.clone();
tokio::spawn(async move {
let mut reader = BufReader::new(stdout).lines();
let mut final_path: Option<String> = None;
// Loop to read both streams while let Some(line) = reader.next_line().await? {
loop { let trimmed = line.trim();
let mut out_line = String::new(); if trimmed.is_empty() {
let mut err_line = String::new(); continue;
tokio::select! {
res = stdout_reader.read_line(&mut out_line) => {
if res.unwrap_or(0) == 0 {
break; // EOF
} }
// Parse progress if let Some(path) = trimmed.strip_prefix(FINAL_PATH_MARKER) {
if let Some(caps) = re.captures(&out_line) { final_path = Some(path.to_string());
continue;
}
if let Some(caps) = progress_regex.captures(trimmed) {
if let Some(pct_match) = caps.get(1) { if let Some(pct_match) = caps.get(1) {
if let Ok(pct) = pct_match.as_str().parse::<f64>() { if let Ok(pct) = pct_match.as_str().parse::<f64>() {
let speed = caps
.get(2)
.map(|value| value.as_str().to_string())
.unwrap_or_else(|| "待定".to_string());
app.emit("download-progress", ProgressEvent { app.emit("download-progress", ProgressEvent {
id: id.clone(), id: id.clone(),
progress: pct, progress: pct,
speed: "待定".to_string(), speed,
status: "downloading".to_string(), status: "downloading".to_string(),
}).ok(); }).ok();
} continue;
}
} else { // Only emit download-log if it's NOT a progress line
app.emit("download-log", LogEvent {
id: id.clone(),
message: out_line.trim().to_string(),
level: "info".to_string(),
}).ok();
}
}
res = stderr_reader.read_line(&mut err_line) => {
if res.unwrap_or(0) > 0 {
// Log error
app.emit("download-log", LogEvent {
id: id.clone(),
message: err_line.trim().to_string(),
level: "error".to_string(),
}).ok();
}
} }
} }
} }
app.emit("download-log", LogEvent {
id: id.clone(),
message: trimmed.to_string(),
level: "info".to_string(),
}).ok();
}
Ok::<Option<String>, anyhow::Error>(final_path)
})
};
let stderr_task = {
let app = app.clone();
let id = id.clone();
tokio::spawn(async move {
let mut reader = BufReader::new(stderr).lines();
let mut last_error: Option<String> = None;
while let Some(line) = reader.next_line().await? {
let trimmed = line.trim();
if trimmed.is_empty() {
continue;
}
last_error = Some(trimmed.to_string());
app.emit("download-log", LogEvent {
id: id.clone(),
message: trimmed.to_string(),
level: "error".to_string(),
}).ok();
}
Ok::<Option<String>, anyhow::Error>(last_error)
})
};
let status = child.wait().await?; let status = child.wait().await?;
let final_path = stdout_task.await.map_err(|e| anyhow!(e.to_string()))??;
let last_error = stderr_task.await.map_err(|e| anyhow!(e.to_string()))??;
if status.success() { if status.success() {
app.emit("download-progress", ProgressEvent { app.emit("download-progress", ProgressEvent {
@@ -353,7 +384,7 @@ pub async fn download_video(
speed: "-".to_string(), speed: "-".to_string(),
status: "finished".to_string(), status: "finished".to_string(),
}).ok(); }).ok();
Ok("下载完成".to_string()) Ok(final_path)
} else { } else {
app.emit("download-progress", ProgressEvent { app.emit("download-progress", ProgressEvent {
id: id.clone(), id: id.clone(),
@@ -361,6 +392,11 @@ pub async fn download_video(
speed: "-".to_string(), speed: "-".to_string(),
status: "error".to_string(), status: "error".to_string(),
}).ok(); }).ok();
Err(anyhow!("下载进程失败")) Err(anyhow!(
"下载进程失败{}",
last_error
.map(|message| format!(": {message}"))
.unwrap_or_default()
))
} }
} }

View File

@@ -3,6 +3,7 @@ mod binary_manager;
mod downloader; mod downloader;
mod storage; mod storage;
mod commands; mod commands;
mod process_utils;
#[cfg_attr(mobile, tauri::mobile_entry_point)] #[cfg_attr(mobile, tauri::mobile_entry_point)]
pub fn run() { pub fn run() {

View File

@@ -0,0 +1,10 @@
use std::process::Output;
pub fn first_non_empty_line(output: &Output) -> Option<String> {
String::from_utf8_lossy(&output.stdout)
.lines()
.chain(String::from_utf8_lossy(&output.stderr).lines())
.map(str::trim)
.find(|line| !line.is_empty())
.map(str::to_string)
}

View File

@@ -34,11 +34,35 @@ pub struct HistoryItem {
pub thumbnail: String, pub thumbnail: String,
pub url: String, pub url: String,
pub output_path: String, pub output_path: String,
#[serde(default)]
pub file_path: Option<String>,
pub timestamp: DateTime<Utc>, pub timestamp: DateTime<Utc>,
pub status: String, // "success", "failed" pub status: String, // "success", "failed"
pub format: String, pub format: String,
} }
fn write_json_atomically(path: &PathBuf, content: &str) -> Result<()> {
let file_name = path
.file_name()
.and_then(|name| name.to_str())
.unwrap_or("data.json");
let tmp_path = path.with_file_name(format!("{file_name}.tmp"));
fs::write(&tmp_path, content)?;
if path.exists() {
match fs::rename(&tmp_path, path) {
Ok(()) => return Ok(()),
Err(_) => {
fs::remove_file(path)?;
}
}
}
fs::rename(&tmp_path, path)?;
Ok(())
}
pub fn get_app_data_dir(app: &AppHandle) -> Result<PathBuf> { pub fn get_app_data_dir(app: &AppHandle) -> Result<PathBuf> {
// In Tauri v2, we use app.path().app_data_dir() // In Tauri v2, we use app.path().app_data_dir()
let path = app.path().app_data_dir()?; let path = app.path().app_data_dir()?;
@@ -76,7 +100,7 @@ pub fn load_settings(app: &AppHandle) -> Result<Settings> {
pub fn save_settings(app: &AppHandle, settings: &Settings) -> Result<()> { pub fn save_settings(app: &AppHandle, settings: &Settings) -> Result<()> {
let path = get_settings_path(app)?; let path = get_settings_path(app)?;
let content = serde_json::to_string_pretty(settings)?; let content = serde_json::to_string_pretty(settings)?;
fs::write(path, content)?; write_json_atomically(&path, &content)?;
Ok(()) Ok(())
} }
@@ -94,7 +118,7 @@ pub fn load_history(app: &AppHandle) -> Result<Vec<HistoryItem>> {
pub fn save_history(app: &AppHandle, history: &[HistoryItem]) -> Result<()> { pub fn save_history(app: &AppHandle, history: &[HistoryItem]) -> Result<()> {
let path = get_history_path(app)?; let path = get_history_path(app)?;
let content = serde_json::to_string_pretty(history)?; let content = serde_json::to_string_pretty(history)?;
fs::write(path, content)?; write_json_atomically(&path, &content)?;
Ok(()) Ok(())
} }

View File

@@ -31,7 +31,7 @@
} }
], ],
"security": { "security": {
"csp": null "csp": "default-src 'self' asset: http://asset.localhost https://asset.localhost; img-src 'self' asset: http://asset.localhost https://asset.localhost data: blob: https:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-eval'; connect-src 'self' ipc: http://ipc.localhost https://ipc.localhost ws://localhost:1420 http://localhost:1420 https:; font-src 'self' asset: http://asset.localhost https://asset.localhost data:;"
} }
}, },
"bundle": { "bundle": {

View File

@@ -1,5 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { onMounted } from 'vue' import { onBeforeUnmount, onMounted } from 'vue'
import { RouterView, RouterLink, useRoute } from 'vue-router' import { RouterView, RouterLink, useRoute } from 'vue-router'
import { Home, History, Settings as SettingsIcon, Download, FileText } from 'lucide-vue-next' import { Home, History, Settings as SettingsIcon, Download, FileText } from 'lucide-vue-next'
import { useSettingsStore } from './stores/settings' import { useSettingsStore } from './stores/settings'
@@ -13,10 +13,17 @@ const route = useRoute()
onMounted(async () => { onMounted(async () => {
await settingsStore.loadSettings() await settingsStore.loadSettings()
settingsStore.initThemeListener()
await settingsStore.initYtdlp() await settingsStore.initYtdlp()
await queueStore.initListener() await queueStore.initListener()
await logsStore.initListener() await logsStore.initListener()
}) })
onBeforeUnmount(() => {
settingsStore.disposeThemeListener()
queueStore.disposeListener()
logsStore.disposeListener()
})
</script> </script>
<template> <template>

View File

@@ -1,12 +1,14 @@
// filepath: src/stores/analysis.ts // filepath: src/stores/analysis.ts
import { defineStore } from 'pinia' import { defineStore } from 'pinia'
import { ref } from 'vue' import { ref } from 'vue'
import type { AnalysisMetadata } from '../types/media'
import { isPlaylistMetadata } from '../types/media'
export const useAnalysisStore = defineStore('analysis', () => { export const useAnalysisStore = defineStore('analysis', () => {
const url = ref('') const url = ref('')
const loading = ref(false) const loading = ref(false)
const error = ref('') const error = ref('')
const metadata = ref<any>(null) const metadata = ref<AnalysisMetadata | null>(null)
// New state for mix detection // New state for mix detection
const isMix = ref(false) const isMix = ref(false)
@@ -24,8 +26,8 @@ export const useAnalysisStore = defineStore('analysis', () => {
}) })
function toggleEntry(id: string) { function toggleEntry(id: string) {
if (metadata.value && metadata.value.entries) { if (isPlaylistMetadata(metadata.value)) {
const entry = metadata.value.entries.find((e: any) => e.id === id) const entry = metadata.value.entries.find(e => e.id === id)
if (entry) { if (entry) {
entry.selected = !entry.selected entry.selected = !entry.selected
} }
@@ -33,8 +35,8 @@ export const useAnalysisStore = defineStore('analysis', () => {
} }
function setAllEntries(selected: boolean) { function setAllEntries(selected: boolean) {
if (metadata.value && metadata.value.entries) { if (isPlaylistMetadata(metadata.value)) {
metadata.value.entries = metadata.value.entries.map((e: any) => ({ metadata.value.entries = metadata.value.entries.map(e => ({
...e, ...e,
selected selected
})) }))
@@ -42,8 +44,8 @@ export const useAnalysisStore = defineStore('analysis', () => {
} }
function invertSelection() { function invertSelection() {
if (metadata.value && metadata.value.entries) { if (isPlaylistMetadata(metadata.value)) {
metadata.value.entries = metadata.value.entries.map((e: any) => ({ metadata.value.entries = metadata.value.entries.map(e => ({
...e, ...e,
selected: !e.selected selected: !e.selected
})) }))

View File

@@ -20,6 +20,7 @@ interface LogEvent {
export const useLogsStore = defineStore('logs', () => { export const useLogsStore = defineStore('logs', () => {
const logs = ref<LogEntry[]>([]) const logs = ref<LogEntry[]>([])
const isListening = ref(false) const isListening = ref(false)
let unlisten: (() => void) | null = null
function addLog(taskId: string, message: string, level: 'info' | 'error') { function addLog(taskId: string, message: string, level: 'info' | 'error') {
logs.value.push({ logs.value.push({
@@ -40,7 +41,7 @@ export const useLogsStore = defineStore('logs', () => {
if (isListening.value) return if (isListening.value) return
isListening.value = true isListening.value = true
await listen<LogEvent>('download-log', (event) => { unlisten = await listen<LogEvent>('download-log', (event) => {
const { id, message, level } = event.payload const { id, message, level } = event.payload
addLog(id, message, level as 'info' | 'error') addLog(id, message, level as 'info' | 'error')
}) })
@@ -54,5 +55,11 @@ export const useLogsStore = defineStore('logs', () => {
const autoScroll = ref(true) const autoScroll = ref(true)
const scrollTop = ref(0) const scrollTop = ref(0)
return { logs, addLog, initListener, clearLogs, autoScroll, scrollTop } function disposeListener() {
unlisten?.()
unlisten = null
isListening.value = false
}
return { logs, addLog, initListener, clearLogs, disposeListener, autoScroll, scrollTop }
}) })

View File

@@ -22,6 +22,7 @@ interface ProgressEvent {
export const useQueueStore = defineStore('queue', () => { export const useQueueStore = defineStore('queue', () => {
const tasks = ref<DownloadTask[]>([]) const tasks = ref<DownloadTask[]>([])
const isListening = ref(false) const isListening = ref(false)
let unlisten: (() => void) | null = null
function addTask(task: DownloadTask) { function addTask(task: DownloadTask) {
tasks.value.push(task) tasks.value.push(task)
@@ -31,7 +32,7 @@ export const useQueueStore = defineStore('queue', () => {
if (isListening.value) return if (isListening.value) return
isListening.value = true isListening.value = true
await listen<ProgressEvent>('download-progress', (event) => { unlisten = await listen<ProgressEvent>('download-progress', (event) => {
const { id, progress, speed, status } = event.payload const { id, progress, speed, status } = event.payload
const task = tasks.value.find(t => t.id === id) const task = tasks.value.find(t => t.id === id)
if (task) { if (task) {
@@ -43,5 +44,11 @@ export const useQueueStore = defineStore('queue', () => {
}) })
} }
return { tasks, addTask, initListener } function disposeListener() {
unlisten?.()
unlisten = null
isListening.value = false
}
return { tasks, addTask, initListener, disposeListener }
}) })

View File

@@ -22,6 +22,9 @@ export const useSettingsStore = defineStore('settings', () => {
const quickjsVersion = ref('Checking...') const quickjsVersion = ref('Checking...')
const ffmpegVersion = ref('Checking...') const ffmpegVersion = ref('Checking...')
const isInitializing = ref(true) const isInitializing = ref(true)
const hasInitialized = ref(false)
let mediaQuery: MediaQueryList | null = null
let mediaListener: (() => void) | null = null
async function loadSettings() { async function loadSettings() {
try { try {
@@ -43,11 +46,13 @@ export const useSettingsStore = defineStore('settings', () => {
} }
async function initYtdlp() { async function initYtdlp() {
if (hasInitialized.value) return
try { try {
isInitializing.value = true isInitializing.value = true
// check/download // check/download
await invoke('init_ytdlp') await invoke('init_ytdlp')
await refreshVersions() await refreshVersions()
hasInitialized.value = true
} catch (e) { } catch (e) {
console.error(e) console.error(e)
ytdlpVersion.value = 'Error' ytdlpVersion.value = 'Error'
@@ -59,9 +64,15 @@ export const useSettingsStore = defineStore('settings', () => {
} }
async function refreshVersions() { async function refreshVersions() {
ytdlpVersion.value = await invoke('get_ytdlp_version') const [ytdlp, quickjs, ffmpeg] = await Promise.allSettled([
quickjsVersion.value = await invoke('get_quickjs_version') invoke<string>('get_ytdlp_version'),
ffmpegVersion.value = await invoke('get_ffmpeg_version') invoke<string>('get_quickjs_version'),
invoke<string>('get_ffmpeg_version')
])
ytdlpVersion.value = ytdlp.status === 'fulfilled' ? ytdlp.value : 'Error'
quickjsVersion.value = quickjs.status === 'fulfilled' ? quickjs.value : 'Error'
ffmpegVersion.value = ffmpeg.status === 'fulfilled' ? ffmpeg.value : 'Error'
} }
function applyTheme(theme: string) { function applyTheme(theme: string) {
@@ -74,12 +85,36 @@ export const useSettingsStore = defineStore('settings', () => {
} }
} }
// Watch system preference changes if theme is system function initThemeListener() {
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => { if (mediaQuery) return
mediaQuery = window.matchMedia('(prefers-color-scheme: dark)')
mediaListener = () => {
if (settings.value.theme === 'system') { if (settings.value.theme === 'system') {
applyTheme('system') applyTheme('system')
} }
}) }
mediaQuery.addEventListener('change', mediaListener)
}
return { settings, loadSettings, save, initYtdlp, refreshVersions, ytdlpVersion, quickjsVersion, ffmpegVersion, isInitializing } function disposeThemeListener() {
if (mediaQuery && mediaListener) {
mediaQuery.removeEventListener('change', mediaListener)
}
mediaQuery = null
mediaListener = null
}
return {
settings,
loadSettings,
save,
initYtdlp,
refreshVersions,
initThemeListener,
disposeThemeListener,
ytdlpVersion,
quickjsVersion,
ffmpegVersion,
isInitializing
}
}) })

24
src/types/media.ts Normal file
View File

@@ -0,0 +1,24 @@
export interface VideoMetadata {
id: string
title: string
thumbnail: string
duration?: number | null
uploader?: string | null
url?: string | null
}
export interface SelectableVideoMetadata extends VideoMetadata {
selected: boolean
}
export interface PlaylistMetadata {
id: string
title: string
entries: SelectableVideoMetadata[]
}
export type AnalysisMetadata = VideoMetadata | PlaylistMetadata
export function isPlaylistMetadata(metadata: AnalysisMetadata | null): metadata is PlaylistMetadata {
return !!metadata && Array.isArray((metadata as PlaylistMetadata).entries)
}

45
src/utils/analysis.ts Normal file
View File

@@ -0,0 +1,45 @@
import type { PlaylistMetadata, SelectableVideoMetadata, VideoMetadata } from '../types/media'
export function detectMixUrl(url: string): boolean {
return url.includes('v=') && url.includes('list=')
}
export function stripPlaylistContext(rawUrl: string): string {
try {
const url = new URL(rawUrl)
url.searchParams.delete('list')
url.searchParams.delete('index')
url.searchParams.delete('start_radio')
return url.toString()
} catch {
return rawUrl
.replace(/[?&]list=[^&]+/g, '')
.replace(/[?&]index=[^&]+/g, '')
.replace(/[?&]start_radio=[^&]+/g, '')
.replace('?&', '?')
.replace(/&&+/g, '&')
.replace(/[?&]$/, '')
}
}
export function isLikelyHttpUrl(input: string): boolean {
return input.startsWith('http://') || input.startsWith('https://')
}
export function normalizeBatchLinks(input: string): string[] {
return input
.split('\n')
.map(line => line.trim())
.filter(Boolean)
.filter(isLikelyHttpUrl)
.filter(link => !link.includes('list=') || detectMixUrl(link))
.map(link => detectMixUrl(link) ? stripPlaylistContext(link) : link)
}
export function toSelectableEntries(entries: VideoMetadata[]): SelectableVideoMetadata[] {
return entries.map(entry => ({ ...entry, selected: true }))
}
export function countSelectedEntries(metadata: PlaylistMetadata | null): number {
return metadata?.entries.filter(entry => entry.selected).length ?? 0
}

View File

@@ -11,6 +11,7 @@ interface HistoryItem {
thumbnail: string thumbnail: string
url: string url: string
output_path: string output_path: string
file_path?: string | null
timestamp: string timestamp: string
status: string status: string
format: string format: string
@@ -114,7 +115,7 @@ onMounted(loadHistory)
</td> </td>
<td class="px-6 py-4 text-right whitespace-nowrap"> <td class="px-6 py-4 text-right whitespace-nowrap">
<button <button
@click="openFolder(item.output_path)" @click="openFolder(item.file_path || item.output_path)"
class="p-2 text-gray-400 hover:text-blue-600 hover:bg-blue-50 dark:hover:bg-blue-900/20 rounded-lg transition-colors" class="p-2 text-gray-400 hover:text-blue-600 hover:bg-blue-50 dark:hover:bg-blue-900/20 rounded-lg transition-colors"
title="打开输出文件夹" title="打开输出文件夹"
> >

View File

@@ -1,11 +1,20 @@
<script setup lang="ts"> <script setup lang="ts">
import { watch } from 'vue' import { computed, watch } from 'vue'
import { invoke } from '@tauri-apps/api/core' import { invoke } from '@tauri-apps/api/core'
import { Loader2, List, Link } from 'lucide-vue-next' import { Loader2, List, Link } from 'lucide-vue-next'
import { useQueueStore } from '../stores/queue' import { useQueueStore } from '../stores/queue'
import { useSettingsStore } from '../stores/settings' import { useSettingsStore } from '../stores/settings'
import { useAnalysisStore } from '../stores/analysis' import { useAnalysisStore } from '../stores/analysis'
import AppSelect from '../components/ui/AppSelect.vue' import AppSelect from '../components/ui/AppSelect.vue'
import type { AnalysisMetadata, PlaylistMetadata, VideoMetadata } from '../types/media'
import { isPlaylistMetadata } from '../types/media'
import {
countSelectedEntries,
detectMixUrl,
normalizeBatchLinks,
stripPlaylistContext,
toSelectableEntries
} from '../utils/analysis'
const queueStore = useQueueStore() const queueStore = useQueueStore()
const settingsStore = useSettingsStore() const settingsStore = useSettingsStore()
@@ -38,169 +47,135 @@ const audioFormatOptions = [
{ label: 'FLAC', value: 'flac' }, { label: 'FLAC', value: 'flac' },
] ]
// Sync default download path if not set const playlistMetadata = computed<PlaylistMetadata | null>(() => {
return isPlaylistMetadata(analysisStore.metadata) ? analysisStore.metadata : null
})
const singleMetadata = computed<VideoMetadata | null>(() => {
return analysisStore.metadata && !isPlaylistMetadata(analysisStore.metadata)
? analysisStore.metadata
: null
})
const selectedCount = computed(() => countSelectedEntries(playlistMetadata.value))
watch(() => settingsStore.settings.download_path, (newPath) => { watch(() => settingsStore.settings.download_path, (newPath) => {
if (newPath && !analysisStore.options.output_path) { if (newPath && !analysisStore.options.output_path) {
analysisStore.options.output_path = newPath analysisStore.options.output_path = newPath
} }
}, { immediate: true }) }, { immediate: true })
// Detect Mix URL
watch(() => analysisStore.url, (newUrl) => { watch(() => analysisStore.url, (newUrl) => {
if (newUrl && newUrl.includes('v=') && newUrl.includes('list=')) { analysisStore.isMix = !!newUrl && detectMixUrl(newUrl)
analysisStore.isMix = true if (!analysisStore.isMix) {
} else {
analysisStore.isMix = false
// Reset scanMix if URL changes to non-mix
analysisStore.scanMix = false analysisStore.scanMix = false
} }
}) })
// Reset format to original when toggling audio-only mode
watch(() => analysisStore.options.is_audio_only, () => { watch(() => analysisStore.options.is_audio_only, () => {
analysisStore.options.output_format = 'original' analysisStore.options.output_format = 'original'
}) })
async function processThumbnail(url: string | undefined): Promise<string | undefined> { async function processThumbnail(url: string | undefined | null): Promise<string | undefined> {
if (!url) return undefined; if (!url) return undefined
// Check if it's an Instagram URL or similar that needs proxying
if (url.includes('instagram.com') || url.includes('fbcdn.net') || url.includes('cdninstagram.com')) { if (url.includes('instagram.com') || url.includes('fbcdn.net') || url.includes('cdninstagram.com')) {
try { try {
return await invoke<string>('fetch_image', { url }); return await invoke<string>('fetch_image', { url })
} catch (e) { } catch (error) {
console.warn('Thumbnail fetch failed, falling back to URL', e); console.warn('Thumbnail fetch failed, falling back to URL', error)
return url; return url
} }
} }
return url;
return url
} }
async function processMetadataThumbnails(metadata: any) { async function processMetadataThumbnails(metadata: AnalysisMetadata) {
if (!metadata) return; if (isPlaylistMetadata(metadata)) {
await Promise.all(metadata.entries.map(async (entry) => {
// Process single video thumbnail
if (metadata.thumbnail) {
metadata.thumbnail = await processThumbnail(metadata.thumbnail);
}
// Process playlist entries
if (metadata.entries && Array.isArray(metadata.entries)) {
await Promise.all(metadata.entries.map(async (entry: any) => {
if (entry.thumbnail) { if (entry.thumbnail) {
entry.thumbnail = await processThumbnail(entry.thumbnail); entry.thumbnail = await processThumbnail(entry.thumbnail) ?? entry.thumbnail
} }
})); }))
return
} }
if (metadata.thumbnail) {
metadata.thumbnail = await processThumbnail(metadata.thumbnail) ?? metadata.thumbnail
}
}
async function analyzeBatchLinks() {
const validLinks = normalizeBatchLinks(analysisStore.url)
if (validLinks.length === 0) {
throw new Error('未找到有效的单个视频链接(已忽略纯播放列表链接)。')
}
const results: VideoMetadata[] = []
for (const link of validLinks) {
try {
const res = await invoke<AnalysisMetadata>('fetch_metadata', { url: link, parseMixPlaylist: false })
if (!isPlaylistMetadata(res)) {
results.push(res)
}
} catch (error) {
console.warn(`Failed to parse ${link}`, error)
}
}
if (results.length === 0) {
throw new Error('所有链接解析失败或均为播放列表。')
}
await Promise.all(results.map(result => processMetadataThumbnails(result)))
analysisStore.metadata = {
id: `batch_download_${Date.now()}`,
title: `批量解析结果 (${results.length} 个视频)`,
entries: toSelectableEntries(results)
}
}
async function analyzeSingleLink() {
let urlToScan = analysisStore.url
let parseMix = false
if (analysisStore.isMix) {
if (analysisStore.scanMix) {
parseMix = true
} else {
urlToScan = stripPlaylistContext(urlToScan)
}
}
const res = await invoke<AnalysisMetadata>('fetch_metadata', { url: urlToScan, parseMixPlaylist: parseMix })
await processMetadataThumbnails(res)
if (isPlaylistMetadata(res)) {
res.entries = toSelectableEntries(res.entries)
}
analysisStore.metadata = res
} }
async function analyze() { async function analyze() {
if (!analysisStore.url) return if (!analysisStore.url) return
analysisStore.loading = true analysisStore.loading = true
analysisStore.error = '' analysisStore.error = ''
analysisStore.metadata = null analysisStore.metadata = null
try { try {
if (analysisStore.isBatchMode) { if (analysisStore.isBatchMode) {
// Batch Mode Logic await analyzeBatchLinks()
const lines = analysisStore.url.split('\n').map(l => l.trim()).filter(l => l);
const validLinks = lines.filter(l => {
if (!(l.startsWith('http://') || l.startsWith('https://'))) return false;
// Allow if it has NO list param
if (!l.includes('list=')) return true;
// Allow if it has list param BUT ALSO has v= (video in playlist/mix)
if (l.includes('list=') && l.includes('v=')) return true;
// Otherwise ignore (pure playlist)
return false;
});
if (validLinks.length === 0) {
throw new Error("未找到有效的单个视频链接(已忽略纯播放列表链接)。");
}
const results: any[] = [];
// Process sequentially to be safe
for (let link of validLinks) {
try {
// If it's a mix/playlist context (has v= and list=), strip the list param to treat as single video
if (link.includes('list=') && link.includes('v=')) {
try {
const u = new URL(link);
u.searchParams.delete('list');
u.searchParams.delete('index');
u.searchParams.delete('start_radio');
link = u.toString();
} catch (e) {
link = link.replace(/&list=[^&]+/, '');
}
}
// Ensure we don't accidentally trigger mix parsing on single links if logic fails
const res = await invoke<any>('fetch_metadata', { url: link, parseMixPlaylist: false });
// Only add if it's a single video (no entries)
if (!res.entries) {
results.push(res);
}
} catch (e) {
console.warn(`Failed to parse ${link}`, e);
}
}
if (results.length === 0) {
throw new Error("所有链接解析失败或均为播放列表。");
}
// Process thumbnails for batch results
await Promise.all(results.map(r => processMetadataThumbnails(r)));
// Construct synthetic playlist
analysisStore.metadata = {
id: 'batch_download_' + Date.now(),
title: `批量解析结果 (${results.length} 个视频)`,
entries: results.map(e => ({ ...e, selected: true }))
};
} else { } else {
// Single Link Mode await analyzeSingleLink()
let urlToScan = analysisStore.url;
let parseMix = false;
if (analysisStore.isMix) {
if (analysisStore.scanMix) {
// Keep URL as is, tell backend to limit scan
parseMix = true;
} else {
// Strip list param
try {
const u = new URL(urlToScan);
u.searchParams.delete('list');
u.searchParams.delete('index');
u.searchParams.delete('start_radio');
urlToScan = u.toString();
} catch (e) {
// Fallback regex if URL parsing fails
urlToScan = urlToScan.replace(/&list=[^&]+/, '');
} }
} } catch (error: unknown) {
} analysisStore.error = error instanceof Error ? error.message : String(error)
const res = await invoke<any>('fetch_metadata', { url: urlToScan, parseMixPlaylist: parseMix })
await processMetadataThumbnails(res);
// Initialize selected state for playlist entries
if (res.entries) {
res.entries = res.entries.map((e: any) => ({ ...e, selected: true }))
}
analysisStore.metadata = res
}
} catch (e: any) {
analysisStore.error = e.toString()
} finally { } finally {
analysisStore.loading = false analysisStore.loading = false
} }
@@ -209,21 +184,18 @@ async function analyze() {
async function startDownload() { async function startDownload() {
if (!analysisStore.metadata) return if (!analysisStore.metadata) return
// Ensure path is set
if (!analysisStore.options.output_path) { if (!analysisStore.options.output_path) {
analysisStore.options.output_path = settingsStore.settings.download_path analysisStore.options.output_path = settingsStore.settings.download_path
} }
// Ensure cookies path is set from settings
analysisStore.options.cookies_path = settingsStore.settings.cookies_path || '' analysisStore.options.cookies_path = settingsStore.settings.cookies_path || ''
try { try {
if (analysisStore.metadata.entries) { if (playlistMetadata.value) {
// Playlist Download const selectedEntries = playlistMetadata.value.entries.filter(entry => entry.selected)
const selectedEntries = analysisStore.metadata.entries.filter((e: any) => e.selected)
if (selectedEntries.length === 0) { if (selectedEntries.length === 0) {
analysisStore.error = "请至少选择一个要下载的视频。" analysisStore.error = '请至少选择一个要下载的视频。'
return return
} }
@@ -232,7 +204,7 @@ async function startDownload() {
const id = await invoke<string>('start_download', { const id = await invoke<string>('start_download', {
url: videoUrl, url: videoUrl,
options: analysisStore.options, options: analysisStore.options,
metadata: entry // Pass the individual video metadata metadata: entry
}) })
queueStore.addTask({ queueStore.addTask({
@@ -244,42 +216,30 @@ async function startDownload() {
status: 'pending' status: 'pending'
}) })
} }
} else { } else if (singleMetadata.value) {
// Single Video Download const urlToDownload = analysisStore.isMix && !analysisStore.scanMix
let urlToDownload = analysisStore.url; ? stripPlaylistContext(analysisStore.url)
// Clean URL if it was a mix but we didn't scan it as one : analysisStore.url
if (analysisStore.isMix && !analysisStore.scanMix) {
try {
const u = new URL(urlToDownload);
u.searchParams.delete('list');
u.searchParams.delete('index');
u.searchParams.delete('start_radio');
urlToDownload = u.toString();
} catch (e) {
urlToDownload = urlToDownload.replace(/&list=[^&]+/, '');
}
}
const id = await invoke<string>('start_download', { const id = await invoke<string>('start_download', {
url: urlToDownload, url: urlToDownload,
options: analysisStore.options, options: analysisStore.options,
metadata: analysisStore.metadata metadata: singleMetadata.value
}) })
queueStore.addTask({ queueStore.addTask({
id, id,
title: analysisStore.metadata.title, title: singleMetadata.value.title,
thumbnail: analysisStore.metadata.thumbnail, thumbnail: singleMetadata.value.thumbnail,
progress: 0, progress: 0,
speed: '等待中...', speed: '等待中...',
status: 'pending' status: 'pending'
}) })
} }
// Reset state after successful download start
analysisStore.reset() analysisStore.reset()
} catch (e: any) { } catch (error: unknown) {
analysisStore.error = "下载启动失败: " + e.toString() analysisStore.error = `下载启动失败: ${error instanceof Error ? error.message : String(error)}`
} }
} }
</script> </script>
@@ -288,13 +248,9 @@ async function startDownload() {
<div class="max-w-5xl mx-auto p-8"> <div class="max-w-5xl mx-auto p-8">
<header class="mb-8"> <header class="mb-8">
<h1 class="text-3xl font-bold text-zinc-900 dark:text-white">新建下载</h1> <h1 class="text-3xl font-bold text-zinc-900 dark:text-white">新建下载</h1>
<!-- <p class="text-gray-500 dark:text-gray-400 mt-2">粘贴 URL 开始下载媒体</p> -->
</header> </header>
<!-- Input Section -->
<div class="bg-white dark:bg-zinc-900 p-6 rounded-2xl shadow-sm border border-gray-200 dark:border-zinc-800 mb-8"> <div class="bg-white dark:bg-zinc-900 p-6 rounded-2xl shadow-sm border border-gray-200 dark:border-zinc-800 mb-8">
<!-- Input Area with Batch Toggle -->
<div class="flex flex-col gap-3"> <div class="flex flex-col gap-3">
<div class="flex justify-end mb-1"> <div class="flex justify-end mb-1">
<button <button
@@ -338,7 +294,6 @@ async function startDownload() {
</div> </div>
</div> </div>
<!-- Mix Toggle (Only in Single Mode) -->
<div v-if="!analysisStore.isBatchMode && analysisStore.isMix" class="mt-4 flex items-center gap-3"> <div v-if="!analysisStore.isBatchMode && analysisStore.isMix" class="mt-4 flex items-center gap-3">
<button <button
@click="analysisStore.scanMix = !analysisStore.scanMix" @click="analysisStore.scanMix = !analysisStore.scanMix"
@@ -356,31 +311,23 @@ async function startDownload() {
<p v-if="analysisStore.error" class="mt-3 text-red-500 text-sm">{{ analysisStore.error }}</p> <p v-if="analysisStore.error" class="mt-3 text-red-500 text-sm">{{ analysisStore.error }}</p>
</div> </div>
<!-- Analysis Result -->
<div v-if="analysisStore.metadata" class="bg-white dark:bg-zinc-900 rounded-2xl shadow-sm border border-gray-200 dark:border-zinc-800 overflow-hidden mb-8"> <div v-if="analysisStore.metadata" class="bg-white dark:bg-zinc-900 rounded-2xl shadow-sm border border-gray-200 dark:border-zinc-800 overflow-hidden mb-8">
<div v-if="playlistMetadata" class="p-6 border-b border-gray-200 dark:border-zinc-800">
<!-- Playlist Header / Global Controls -->
<div v-if="analysisStore.metadata.entries" class="p-6 border-b border-gray-200 dark:border-zinc-800">
<div class="flex items-start justify-between mb-4"> <div class="flex items-start justify-between mb-4">
<div> <div>
<h2 class="text-xl font-bold text-zinc-900 dark:text-white">{{ analysisStore.metadata.title }}</h2> <h2 class="text-xl font-bold text-zinc-900 dark:text-white">{{ playlistMetadata.title }}</h2>
<p class="text-blue-500 mt-1 font-medium">{{ analysisStore.metadata.entries.length }} 个视频</p> <p class="text-blue-500 mt-1 font-medium">{{ playlistMetadata.entries.length }} 个视频</p>
</div> </div>
</div> </div>
<!-- Global Options Bar -->
<div class="flex flex-col md:flex-row items-center justify-between gap-4 bg-gray-50 dark:bg-zinc-800/50 p-4 rounded-xl"> <div class="flex flex-col md:flex-row items-center justify-between gap-4 bg-gray-50 dark:bg-zinc-800/50 p-4 rounded-xl">
<!-- Left: Selection Controls -->
<div class="flex items-center gap-2 w-full md:w-auto"> <div class="flex items-center gap-2 w-full md:w-auto">
<button @click="analysisStore.setAllEntries(true)" class="text-base font-medium px-3 py-1.5 rounded-lg bg-white dark:bg-zinc-700 hover:bg-gray-100 dark:hover:bg-zinc-600 text-zinc-700 dark:text-gray-200 border border-gray-200 dark:border-zinc-600 transition-colors shadow-sm">全选</button> <button @click="analysisStore.setAllEntries(true)" class="text-base font-medium px-3 py-1.5 rounded-lg bg-white dark:bg-zinc-700 hover:bg-gray-100 dark:hover:bg-zinc-600 text-zinc-700 dark:text-gray-200 border border-gray-200 dark:border-zinc-600 transition-colors shadow-sm">全选</button>
<button @click="analysisStore.setAllEntries(false)" class="text-base font-medium px-3 py-1.5 rounded-lg bg-white dark:bg-zinc-700 hover:bg-gray-100 dark:hover:bg-zinc-600 text-zinc-700 dark:text-gray-200 border border-gray-200 dark:border-zinc-600 transition-colors shadow-sm">取消全选</button> <button @click="analysisStore.setAllEntries(false)" class="text-base font-medium px-3 py-1.5 rounded-lg bg-white dark:bg-zinc-700 hover:bg-gray-100 dark:hover:bg-zinc-600 text-zinc-700 dark:text-gray-200 border border-gray-200 dark:border-zinc-600 transition-colors shadow-sm">取消全选</button>
<button @click="analysisStore.invertSelection()" class="text-base font-medium px-3 py-1.5 rounded-lg bg-white dark:bg-zinc-700 hover:bg-gray-100 dark:hover:bg-zinc-600 text-zinc-700 dark:text-gray-200 border border-gray-200 dark:border-zinc-600 transition-colors shadow-sm">反选</button> <button @click="analysisStore.invertSelection()" class="text-base font-medium px-3 py-1.5 rounded-lg bg-white dark:bg-zinc-700 hover:bg-gray-100 dark:hover:bg-zinc-600 text-zinc-700 dark:text-gray-200 border border-gray-200 dark:border-zinc-600 transition-colors shadow-sm">反选</button>
</div> </div>
<!-- Right: Settings -->
<div class="flex items-center gap-6 w-full md:w-auto justify-end"> <div class="flex items-center gap-6 w-full md:w-auto justify-end">
<!-- Audio Only Toggle -->
<div class="flex items-center gap-x-4 p-3 bg-gray-50 dark:bg-zinc-800 rounded-xl"> <div class="flex items-center gap-x-4 p-3 bg-gray-50 dark:bg-zinc-800 rounded-xl">
<span class="font-medium text-base text-zinc-700 dark:text-gray-300">仅音频</span> <span class="font-medium text-base text-zinc-700 dark:text-gray-300">仅音频</span>
<button <button
@@ -395,7 +342,6 @@ async function startDownload() {
</button> </button>
</div> </div>
<!-- Quality Dropdown -->
<div class="flex items-center gap-3"> <div class="flex items-center gap-3">
<div class="w-44"> <div class="w-44">
<AppSelect <AppSelect
@@ -406,7 +352,6 @@ async function startDownload() {
</div> </div>
</div> </div>
<!-- Format Dropdown -->
<div class="flex items-center gap-3"> <div class="flex items-center gap-3">
<div class="w-48"> <div class="w-48">
<AppSelect <AppSelect
@@ -419,15 +364,13 @@ async function startDownload() {
</div> </div>
</div> </div>
<!-- Video List (Playlist Mode) --> <div v-if="playlistMetadata" class="max-h-[500px] overflow-y-auto p-2 space-y-2 bg-gray-50/50 dark:bg-black/20">
<div v-if="analysisStore.metadata.entries" class="max-h-[500px] overflow-y-auto p-2 space-y-2 bg-gray-50/50 dark:bg-black/20">
<div <div
v-for="entry in analysisStore.metadata.entries" v-for="entry in playlistMetadata.entries"
:key="entry.id" :key="entry.id"
class="flex items-center gap-4 p-3 rounded-xl hover:bg-white dark:hover:bg-zinc-800 transition-colors border border-transparent hover:border-gray-200 dark:hover:border-zinc-700 group" class="flex items-center gap-4 p-3 rounded-xl hover:bg-white dark:hover:bg-zinc-800 transition-colors border border-transparent hover:border-gray-200 dark:hover:border-zinc-700 group"
:class="entry.selected ? 'opacity-100' : 'opacity-60 grayscale'" :class="entry.selected ? 'opacity-100' : 'opacity-60 grayscale'"
> >
<!-- Checkbox -->
<button <button
@click="entry.selected = !entry.selected" @click="entry.selected = !entry.selected"
class="w-6 h-6 rounded-lg border-2 flex items-center justify-center transition-colors shrink-0" class="w-6 h-6 rounded-lg border-2 flex items-center justify-center transition-colors shrink-0"
@@ -438,10 +381,8 @@ async function startDownload() {
</svg> </svg>
</button> </button>
<!-- Thumb -->
<img :src="entry.thumbnail || '/placeholder.png'" class="w-24 h-14 object-cover rounded-lg bg-gray-200 dark:bg-zinc-700 shrink-0" /> <img :src="entry.thumbnail || '/placeholder.png'" class="w-24 h-14 object-cover rounded-lg bg-gray-200 dark:bg-zinc-700 shrink-0" />
<!-- Info -->
<div class="flex-1 min-w-0"> <div class="flex-1 min-w-0">
<h4 class="font-medium text-zinc-900 dark:text-white truncate text-sm" :title="entry.title">{{ entry.title }}</h4> <h4 class="font-medium text-zinc-900 dark:text-white truncate text-sm" :title="entry.title">{{ entry.title }}</h4>
<p class="text-xs text-gray-500 dark:text-gray-400 mt-0.5"> <p class="text-xs text-gray-500 dark:text-gray-400 mt-0.5">
@@ -452,20 +393,14 @@ async function startDownload() {
</div> </div>
</div> </div>
<!-- Single Video Layout --> <div v-else-if="singleMetadata" class="p-6 flex flex-col md:flex-row gap-6">
<div v-else class="p-6 flex flex-col md:flex-row gap-6"> <img :src="singleMetadata.thumbnail || '/placeholder.png'" class="w-full md:w-64 aspect-video object-cover rounded-lg bg-gray-100 dark:bg-zinc-800" />
<!-- Thumbnail -->
<img :src="analysisStore.metadata.thumbnail || '/placeholder.png'" class="w-full md:w-64 aspect-video object-cover rounded-lg bg-gray-100 dark:bg-zinc-800" />
<!-- Details -->
<div class="flex-1"> <div class="flex-1">
<h2 class="text-xl font-bold text-zinc-900 dark:text-white line-clamp-2">{{ analysisStore.metadata.title }}</h2> <h2 class="text-xl font-bold text-zinc-900 dark:text-white line-clamp-2">{{ singleMetadata.title }}</h2>
<p v-if="analysisStore.metadata.uploader" class="text-gray-500 dark:text-gray-400 mt-1">{{ analysisStore.metadata.uploader }}</p> <p v-if="singleMetadata.uploader" class="text-gray-500 dark:text-gray-400 mt-1">{{ singleMetadata.uploader }}</p>
<p v-if="analysisStore.metadata.entries" class="text-blue-500 mt-1 font-medium">{{ analysisStore.metadata.entries.length }} 个视频 (播放列表)</p>
<!-- Options -->
<div class="grid grid-cols-1 md:grid-cols-3 gap-4 mt-6"> <div class="grid grid-cols-1 md:grid-cols-3 gap-4 mt-6">
<!-- Audio Only Toggle -->
<div class="flex items-center justify-between p-3 bg-gray-50 dark:bg-zinc-800 rounded-xl"> <div class="flex items-center justify-between p-3 bg-gray-50 dark:bg-zinc-800 rounded-xl">
<span class="font-medium text-base">仅音频</span> <span class="font-medium text-base">仅音频</span>
<button <button
@@ -480,7 +415,6 @@ async function startDownload() {
</button> </button>
</div> </div>
<!-- Quality Dropdown -->
<div class="relative"> <div class="relative">
<AppSelect <AppSelect
v-model="analysisStore.options.quality" v-model="analysisStore.options.quality"
@@ -489,7 +423,6 @@ async function startDownload() {
/> />
</div> </div>
<!-- Format Dropdown -->
<div class="relative"> <div class="relative">
<AppSelect <AppSelect
v-model="analysisStore.options.output_format" v-model="analysisStore.options.output_format"
@@ -505,16 +438,14 @@ async function startDownload() {
@click="startDownload" @click="startDownload"
class="bg-blue-600 hover:bg-blue-700 text-white px-8 py-3 rounded-xl font-bold transition-colors shadow-lg shadow-blue-600/20" class="bg-blue-600 hover:bg-blue-700 text-white px-8 py-3 rounded-xl font-bold transition-colors shadow-lg shadow-blue-600/20"
> >
立即下载 {{ analysisStore.metadata.entries ? `(${analysisStore.metadata.entries.filter((e: any) => e.selected).length})` : '' }} 立即下载 {{ selectedCount > 0 ? `(${selectedCount})` : '' }}
</button> </button>
</div> </div>
</div> </div>
<!-- Active Downloads -->
<div v-if="queueStore.tasks.length > 0"> <div v-if="queueStore.tasks.length > 0">
<h3 class="text-lg font-bold mb-4">进行中的任务</h3> <h3 class="text-lg font-bold mb-4">进行中的任务</h3>
<div class="space-y-3"> <div class="space-y-3">
<!-- Reversed to show newest first -->
<div v-for="task in queueStore.tasks.slice().reverse()" :key="task.id" class="bg-white dark:bg-zinc-900 p-4 rounded-xl border border-gray-200 dark:border-zinc-800 flex items-center gap-4"> <div v-for="task in queueStore.tasks.slice().reverse()" :key="task.id" class="bg-white dark:bg-zinc-900 p-4 rounded-xl border border-gray-200 dark:border-zinc-800 flex items-center gap-4">
<img :src="task.thumbnail || '/placeholder.png'" class="w-16 h-16 object-cover rounded-lg bg-gray-100 dark:bg-zinc-800" /> <img :src="task.thumbnail || '/placeholder.png'" class="w-16 h-16 object-cover rounded-lg bg-gray-100 dark:bg-zinc-800" />
<div class="flex-1 min-w-0"> <div class="flex-1 min-w-0">
@@ -535,6 +466,5 @@ async function startDownload() {
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</template> </template>

View File

@@ -210,7 +210,7 @@ function setTheme(theme: 'light' | 'dark' | 'system') {
</div> </div>
<div> <div>
<div class="font-medium text-zinc-900 dark:text-white">QuickJS</div> <div class="font-medium text-zinc-900 dark:text-white">QuickJS</div>
<div class="text-xs text-gray-500 mt-0.5 font-mono">{{ settingsStore.quickjsVersion }}</div> <div class="text-xs text-gray-500 mt-0.5 font-mono" :title="settingsStore.quickjsVersion">{{ settingsStore.quickjsVersion }}</div>
</div> </div>
</div> </div>
<button <button