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

Fix adding default mime associations when app does not list mime types

Browse source
This commit is contained in:
Jeremy Soller 2025-08-15 08:54:26 -06:00
parent bf81364e0b
commit 30a0836018
No known key found for this signature in database
GPG key ID: 670FDFB5428E05CA
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/mime_app.rs
View file

@ -258,11 +258,11 @@ impl MimeAppCache {
// Load desktop applications by supported mime types // Load desktop applications by supported mime types
//TODO: hashmap for all apps by id? //TODO: hashmap for all apps by id?
let mut all_apps = desktop::load_applications(locale, false, None); let all_apps: Vec<_> = desktop::load_applications(locale, false, None).collect();
for app in &mut all_apps { for app in all_apps.iter() {
//TODO: just collect apps that can be executed with a file argument? //TODO: just collect apps that can be executed with a file argument?
if !app.mime_types.is_empty() { if !app.mime_types.is_empty() {
self.apps.push(MimeApp::from(&app)); self.apps.push(MimeApp::from(app));
} }
for mime in app.mime_types.iter() { for mime in app.mime_types.iter() {
let apps = self let apps = self
@ -270,12 +270,12 @@ impl MimeAppCache {
.entry(mime.clone()) .entry(mime.clone())
.or_insert_with(|| Vec::with_capacity(1)); .or_insert_with(|| Vec::with_capacity(1));
if !apps.iter().any(|x| x.id == app.id) { if !apps.iter().any(|x| x.id == app.id) {
apps.push(MimeApp::from(&app)); apps.push(MimeApp::from(app));
} }
} }
for category in app.categories.iter() { for category in app.categories.iter() {
if category == "TerminalEmulator" { if category == "TerminalEmulator" {
self.terminals.push(MimeApp::from(&app)); self.terminals.push(MimeApp::from(app));
break; break;
} }
} }
@ -341,11 +341,12 @@ impl MimeAppCache {
.entry(mime.clone()) .entry(mime.clone())
.or_insert_with(|| Vec::with_capacity(1)); .or_insert_with(|| Vec::with_capacity(1));
if !apps.iter().any(|x| filename_eq(&x.path, filename)) { if !apps.iter().any(|x| filename_eq(&x.path, filename)) {
if let Some(app) = all_apps.find(|x| filename_eq(&x.path, filename)) if let Some(app) =
all_apps.iter().find(|x| filename_eq(&x.path, filename))
{ {
apps.push(MimeApp::from(&app)); apps.push(MimeApp::from(app));
} else { } else {
log::debug!("failed to add association for {:?}: application {:?} not found", mime, filename); log::info!("failed to add association for {:?}: application {:?} not found", mime, filename);
} }
} }
} }