leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use Extract To dialog for supported archive types by default

Browse source
This commit is contained in:
Jeremy Soller 2025-08-15 11:23:24 -06:00
parent fb74be9a70
commit be67fd8e0d
No known key found for this signature in database
GPG key ID: 670FDFB5428E05CA
1 changed files with 42 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/app.rs
View file

@ -691,15 +691,28 @@ impl App {
// This allows handling paths as groups if possible, such as launching a single video
// player that is passed every path.
let mut groups: HashMap<Mime, Vec<PathBuf>> = HashMap::new();
let mut all_archives = true;
let supported_archive_types = crate::archive::SUPPORTED_ARCHIVE_TYPES
.iter()
.filter_map(|mime_type| mime_type.parse::<Mime>().ok())
.collect::<Vec<_>>();
for (mime, path) in paths.iter().map(|path| {
(
mime_icon::mime_for_path(path, None, false),
path.as_ref().to_owned(),
)
}) {
if !supported_archive_types.contains(&mime) {
all_archives = false;
}
groups.entry(mime).or_default().push(path);
}
if all_archives {
// Use extract to dialog if all selected paths are supported archives
return self.extract_to(paths);
}
'outer: for (mime, paths) in groups {
log::debug!("Attempting to launch app\n\tfor: {mime}\n\twith: {paths:?}");
@ -729,7 +742,6 @@ impl App {
},
}
}
continue;
}
@ -864,6 +876,34 @@ impl App {
}
}
fn extract_to(&mut self, paths: &[impl AsRef<Path>]) -> Task<Message> {
if let Some(destination) = paths
.first()
.and_then(|first| first.as_ref().parent())
.map(|parent| parent.to_path_buf())
{
let (mut dialog, dialog_task) = Dialog::new(
DialogSettings::new()
.kind(DialogKind::OpenFolder)
.path(destination),
Message::FileDialogMessage,
Message::ExtractToResult,
);
let set_title_task = dialog.set_title(fl!("extract-to-title"));
dialog.set_accept_label(fl!("extract-here"));
self.windows.insert(
dialog.window_id(),
WindowKind::FileDialog(Some(
paths.iter().map(|x| x.as_ref().to_path_buf()).collect(),
)),
);
self.file_dialog_opt = Some(dialog);
Task::batch([set_title_task, dialog_task])
} else {
Task::none()
}
}
fn handle_overlap(&mut self) {
let Some((bl, br, tl, tr, mut size)) = self.size.as_ref().map(|s| {
(
@ -2897,26 +2937,7 @@ impl Application for App {
}
}
Message::ExtractTo(entity_opt) => {
let paths = self.selected_paths(entity_opt);
if let Some(destination) = paths
.first()
.and_then(|first| first.parent())
.map(|parent| parent.to_path_buf())
{
let (mut dialog, dialog_task) = Dialog::new(
DialogSettings::new()
.kind(DialogKind::OpenFolder)
.path(destination),
Message::FileDialogMessage,
Message::ExtractToResult,
);
let set_title_task = dialog.set_title(fl!("extract-to-title"));
dialog.set_accept_label(fl!("extract-here"));
self.windows
.insert(dialog.window_id(), WindowKind::FileDialog(Some(paths)));
self.file_dialog_opt = Some(dialog);
return Task::batch([set_title_task, dialog_task]);
};
return self.extract_to(&self.selected_paths(entity_opt));
}
Message::ExtractToResult(result) => {
match result {