gsadmin/Firelink
1
0
Fork 0
mirror of https://github.com/nimbold/Firelink.git synced 2026-07-26 12:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve media download bugs and Add window UI issues

Browse Source 
- Fix 'Unknown size' for YouTube videos by improving media size estimation fallback
- Optimize yt-dlp metadata fetch by isolating PATH to bundled binaries
- Fix dull slider color in Add window using Tailwind accent class
- Fix Add window failing to fetch metadata automatically upon re-opening via paste
This commit is contained in:
NimBold
2026-06-20 23:14:18 +03:30
parent c59db4e032
commit 262633f441
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/lib.rs
+13 -15
View File
@@ -245,19 +245,17 @@ fn joined_format_label(container: &str, video_codec: Option<&str>, audio_codec:
}
fn estimated_merged_size(video: Option<&serde_json::Value>, audio: Option<&serde_json::Value>) -> (Option<u64>, Option<u64>) {
let Some(video) = video else {
return (None, None);
};
let Some((video_size, video_approx)) = media_sized_bytes(video) else {
return (None, None);
};
let Some(audio) = audio else {
return split_size_estimate(Some((video_size, video_approx)));
};
let Some((audio_size, audio_approx)) = media_sized_bytes(audio) else {
return (None, None);
};
split_size_estimate(Some((video_size.saturating_add(audio_size), video_approx || audio_approx)))
let v_bytes = video.and_then(media_sized_bytes);
let a_bytes = audio.and_then(media_sized_bytes);
match (v_bytes, a_bytes) {
(Some((v_size, v_approx)), Some((a_size, a_approx))) => {
split_size_estimate(Some((v_size.saturating_add(a_size), v_approx || a_approx)))
}
(Some((v_size, _v_approx)), None) => split_size_estimate(Some((v_size, true))),
(None, Some((a_size, _a_approx))) => split_size_estimate(Some((a_size, true))),
(None, None) => (None, None),
}
}
fn raw_media_format(value: &serde_json::Value) -> Option<MediaFormat> {
@@ -847,13 +845,13 @@ async fn fetch_media_metadata_uncached(app_handle: tauri::AppHandle, url: String
symlink(&ffmpeg_path, bin_dir.path().join("ffmpeg")).map_err(|e| format!("failed to symlink ffmpeg: {e}"))?;
}
let bin_dir_str = bin_dir.path().to_string_lossy().to_string();
let original_path = std::env::var("PATH").unwrap_or_else(|_| "/usr/bin:/bin".to_string());
let path_env = format!("{}:{}", bin_dir_str, original_path);
let path_env = format!("{}:/usr/bin:/bin", bin_dir_str);
use tauri_plugin_shell::ShellExt;
let (ytdlp_path, _) = resolve_metadata_ytdlp_path(&app_handle)?;
let mut cmd = app_handle.shell().command(ytdlp_path.to_string_lossy().to_string());
cmd = cmd.env("PATH", &path_env)
.arg("--ffmpeg-location").arg(&bin_dir_str)
.arg("--no-warnings")
.arg("--no-playlist")
.arg("--skip-download")
src/components/AddDownloadsModal.tsx
+3 -1
View File
@@ -335,6 +335,8 @@ export const AddDownloadsModal = () => {
setCookies(pendingAddCookies);
setMirrors('');
setIsActionMenuOpen(false);
} else {
setUrls('');
}
}, [
isAddModalOpen,
@@ -1018,7 +1020,7 @@ export const AddDownloadsModal = () => {
<div className="flex items-center justify-between">
<label className="text-xs text-text-secondary font-medium">Connections per File</label>
<div className="flex items-center gap-2">
<input type="range" min="1" max="16" value={connections} onChange={e=>setConnections(Number(e.target.value))} className="add-download-range w-24" disabled={parsedItems.some(i => i.isMedia)} aria-label="Connections per file" />
<input type="range" min="1" max="16" value={connections} onChange={e=>setConnections(Number(e.target.value))} className="add-download-range w-24 accent-blue-500" disabled={parsedItems.some(i => i.isMedia)} aria-label="Connections per file" />
<span className="add-download-value text-xs text-text-primary font-mono w-6 text-center">{connections}</span>
</div>
</div>