mirror/spacedrive
1
0
Fork 0
mirror of https://github.com/spacedriveapp/spacedrive.git synced 2026-04-22 23:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(files): use native trash crate for cross-platform recycle bin support

Browse Source 
The previous Windows implementation moved files to a temp directory
(spacedrive_trash) rather than the actual Recycle Bin. The macOS/Linux
implementations were also custom-rolled with manual collision handling.

Replace all platform-specific move_to_trash implementations with the
`trash` crate (v3.3), which uses native OS APIs:
- Windows: SHFileOperation → actual Recycle Bin
- macOS: NSFileManager → Trash
- Linux: XDG trash specification

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
slvnlrt
2026-03-06 23:51:49 +01:00
parent a7757d391d
commit e8c15dd1cf
2 changed files with 19 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/Cargo.toml
View File

@@ -171,6 +171,7 @@ chrono = { version = "0.4", features = ["serde"] }
dirs = "5.0"
once_cell = "1.20"
rand = "0.8" # Random number generation for secure delete
trash = "3.3" # Native trash/recycle bin support
sysinfo = "0.31" # Cross-platform system information
tempfile = "3.14" # Temporary directories for testing
uuid = { version = "1.11", features = ["serde", "v4", "v5", "v7"] }

116
core/src/ops/files/delete/strategy.rs
View File

@@ -9,7 +9,7 @@ use anyhow::Result;
use async_trait::async_trait;
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::path::{Path, PathBuf};
use std::path::Path;
use tokio::fs;
use uuid::Uuid;
@@ -213,108 +213,28 @@ impl LocalDeleteStrategy {
Ok(total)
}
/// Move file to system trash/recycle bin
/// Move file to the system trash/recycle bin.
///
/// Uses the `trash` crate for native platform support:
/// - Windows: SHFileOperation → Recycle Bin
/// - macOS: NSFileManager → Trash
/// - Linux: XDG trash spec
pub async fn move_to_trash(&self, path: &Path) -> Result<(), std::io::Error> {
#[cfg(target_os = "macos")]
{
self.move_to_trash_macos(path).await?;
}
#[cfg(all(unix, not(target_os = "macos")))]
{
self.move_to_trash_unix(path).await?;
}
#[cfg(windows)]
{
self.move_to_trash_windows(path).await?;
}
let path = path.to_path_buf();
tokio::task::spawn_blocking(move || {
trash::delete(&path).map_err(|e| {
std::io::Error::new(
std::io::ErrorKind::Other,
format!("Failed to move to trash: {}", e),
)
})
})
.await
.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e.to_string()))??;
Ok(())
}
#[cfg(unix)]
async fn move_to_trash_unix(&self, path: &Path) -> Result<(), std::io::Error> {
let home = std::env::var("HOME")
.map_err(|_| std::io::Error::new(std::io::ErrorKind::NotFound, "HOME not set"))?;
let trash_dir = std::path::Path::new(&home).join(".local/share/Trash/files");
fs::create_dir_all(&trash_dir).await?;
let filename = path.file_name().ok_or_else(|| {
std::io::Error::new(std::io::ErrorKind::InvalidInput, "Invalid filename")
})?;
let trash_path = trash_dir.join(filename);
let final_trash_path = self.find_unique_trash_name(&trash_path).await?;
fs::rename(path, final_trash_path).await?;
Ok(())
}
#[cfg(windows)]
async fn move_to_trash_windows(&self, path: &Path) -> Result<(), std::io::Error> {
let temp_dir = std::env::temp_dir().join("spacedrive_trash");
fs::create_dir_all(&temp_dir).await?;
let filename = path.file_name().ok_or_else(|| {
std::io::Error::new(std::io::ErrorKind::InvalidInput, "Invalid filename")
})?;
let trash_path = temp_dir.join(filename);
let final_trash_path = self.find_unique_trash_name(&trash_path).await?;
fs::rename(path, final_trash_path).await?;
Ok(())
}
#[cfg(target_os = "macos")]
async fn move_to_trash_macos(&self, path: &Path) -> Result<(), std::io::Error> {
let home = std::env::var("HOME")
.map_err(|_| std::io::Error::new(std::io::ErrorKind::NotFound, "HOME not set"))?;
let trash_dir = std::path::Path::new(&home).join(".Trash");
let filename = path.file_name().ok_or_else(|| {
std::io::Error::new(std::io::ErrorKind::InvalidInput, "Invalid filename")
})?;
let trash_path = trash_dir.join(filename);
let final_trash_path = self.find_unique_trash_name(&trash_path).await?;
fs::rename(path, final_trash_path).await?;
Ok(())
}
/// Find a unique name in the trash directory
async fn find_unique_trash_name(&self, base_path: &Path) -> Result<PathBuf, std::io::Error> {
let mut candidate = base_path.to_path_buf();
let mut counter = 1;
while fs::try_exists(&candidate).await? {
let stem = base_path.file_stem().unwrap_or_default();
let extension = base_path.extension();
let new_name = if let Some(ext) = extension {
format!("{} ({})", stem.to_string_lossy(), counter)
} else {
format!("{} ({})", stem.to_string_lossy(), counter)
};
candidate = base_path.with_file_name(new_name);
if let Some(ext) = extension {
candidate.set_extension(ext);
}
counter += 1;
}
Ok(candidate)
}
/// Permanently delete file or directory
pub async fn permanent_delete(&self, path: &Path) -> Result<(), std::io::Error> {
let metadata = fs::metadata(path).await?;