gsadmin/Firelink
1
0
Fork 0
mirror of https://github.com/nimbold/Firelink.git synced 2026-08-09 02:40:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: repair download open and reveal interactions

Browse Source
This commit is contained in:
NimBold
2026-06-18 20:56:44 +03:30
parent de4d81ecd0
commit 1ae2fe7703
3 changed files with 113 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/commands.rs
+31 -52
View File
@@ -1,6 +1,6 @@
use std::ffi::OsString;
use std::path::{Component, Path, PathBuf};
use std::process::Command;
use tauri_plugin_opener::OpenerExt;
use tauri_plugin_store::StoreExt;
#[tauri::command]
@@ -8,35 +8,18 @@ pub async fn reveal_in_file_manager(
app_handle: tauri::AppHandle,
path: String,
) -> Result<(), String> {
let path = authorize_download_path(&app_handle, &path, DownloadAsset::Primary)?;
let primary = authorize_download_path(&app_handle, &path, DownloadAsset::Primary)?;
let path = existing_download_asset(&primary).ok_or_else(|| {
format!(
"Downloaded file or partial file is missing: {}",
primary.display()
)
})?;
#[cfg(target_os = "macos")]
{
Command::new("open")
.arg("-R")
.arg(&path)
.spawn()
.map_err(|e| format!("Failed to reveal file: {}", e))?;
}
#[cfg(target_os = "windows")]
{
Command::new("explorer.exe")
.arg(format!("/select,\"{}\"", path.display()))
.spawn()
.map_err(|e| format!("Failed to reveal file: {}", e))?;
}
#[cfg(not(any(target_os = "macos", target_os = "windows")))]
{
let parent = path
.parent()
.ok_or("Download path has no parent directory")?;
Command::new("xdg-open")
.arg(parent)
.spawn()
.map_err(|e| format!("Failed to reveal file: {}", e))?;
}
app_handle
.opener()
.reveal_item_in_dir(path.to_string_lossy().as_ref())
.map_err(|e| format!("Failed to reveal file: {}", e))?;
Ok(())
}
@@ -47,31 +30,14 @@ pub async fn open_downloaded_file(
path: String,
) -> Result<(), String> {
let path = authorize_download_path(&app_handle, &path, DownloadAsset::Primary)?;
#[cfg(target_os = "macos")]
{
Command::new("open")
.arg(&path)
.spawn()
.map_err(|e| format!("Failed to open file: {}", e))?;
if !path.exists() {
return Err(format!("Downloaded file is missing: {}", path.display()));
}
#[cfg(target_os = "windows")]
{
Command::new("cmd")
.args(["/c", "start", ""])
.arg(&path)
.spawn()
.map_err(|e| format!("Failed to open file: {}", e))?;
}
#[cfg(not(any(target_os = "macos", target_os = "windows")))]
{
Command::new("xdg-open")
.arg(&path)
.spawn()
.map_err(|e| format!("Failed to open file: {}", e))?;
}
app_handle
.opener()
.open_path(path.to_string_lossy().as_ref(), None::<String>)
.map_err(|e| format!("Failed to open file: {}", e))?;
Ok(())
}
@@ -205,6 +171,19 @@ fn canonicalize_with_missing_leaf(path: &Path) -> Result<PathBuf, String> {
Ok(canonical)
}
fn existing_download_asset(primary: &Path) -> Option<PathBuf> {
[
primary.to_path_buf(),
append_suffix(primary, ".aria2"),
append_suffix(primary, ".part"),
]
.into_iter()
.find(|candidate| {
std::fs::symlink_metadata(candidate)
.is_ok_and(|metadata| metadata.is_file() && !metadata.file_type().is_symlink())
})
}
fn append_suffix(path: &Path, suffix: &str) -> PathBuf {
let mut value: OsString = path.as_os_str().to_owned();
value.push(suffix);