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

Ensure default apps are added as associations

Browse source
This commit is contained in:
Jeremy Soller 2024-03-04 12:22:27 -07:00
parent 3d34e3e49f
commit d7eceaad2e
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/mime_app.rs
View file

@ -123,7 +123,7 @@ impl MimeAppCache {
} }
} }
let mut desktops: Vec<String> = env::var("XDG_CURRENT_DESKTOP") let desktops: Vec<String> = env::var("XDG_CURRENT_DESKTOP")
.unwrap_or_default() .unwrap_or_default()
.split(':') .split(':')
.map(|x| x.to_ascii_lowercase()) .map(|x| x.to_ascii_lowercase())
@ -169,11 +169,15 @@ impl MimeAppCache {
} }
}; };
for attr in entry.section("Added Associations").attrs() { for attr in entry
.section("Added Associations")
.attrs()
.chain(entry.section("Default Applications").attrs())
{
if let Ok(mime) = attr.name.parse::<Mime>() { if let Ok(mime) = attr.name.parse::<Mime>() {
if let Some(filenames) = attr.value { if let Some(filenames) = attr.value {
for filename in filenames.split_terminator(';') { for filename in filenames.split_terminator(';') {
println!("Add {}={}", mime, filename); log::trace!("add {}={}", mime, filename);
let apps = self let apps = self
.cache .cache
.entry(mime.clone()) .entry(mime.clone())
@ -188,7 +192,7 @@ impl MimeAppCache {
{ {
apps.push(MimeApp::from(app)); apps.push(MimeApp::from(app));
} else { } else {
log::warn!("failed to find application {:?}", filename); log::warn!("failed to add association for {:?}: application {:?} not found", mime, filename);
} }
} }
} }
@ -200,7 +204,7 @@ impl MimeAppCache {
if let Ok(mime) = attr.name.parse::<Mime>() { if let Ok(mime) = attr.name.parse::<Mime>() {
if let Some(filenames) = attr.value { if let Some(filenames) = attr.value {
for filename in filenames.split_terminator(';') { for filename in filenames.split_terminator(';') {
println!("Remove {}={}", mime, filename); log::trace!("remove {}={}", mime, filename);
if let Some(apps) = self.cache.get_mut(&mime) { if let Some(apps) = self.cache.get_mut(&mime) {
apps.retain(|x| !filename_eq(&x.path, filename)); apps.retain(|x| !filename_eq(&x.path, filename));
} }
@ -213,7 +217,7 @@ impl MimeAppCache {
if let Ok(mime) = attr.name.parse::<Mime>() { if let Ok(mime) = attr.name.parse::<Mime>() {
if let Some(filenames) = attr.value { if let Some(filenames) = attr.value {
for filename in filenames.split_terminator(';') { for filename in filenames.split_terminator(';') {
println!("Default {}={}", mime, filename); log::trace!("default {}={}", mime, filename);
if let Some(apps) = self.cache.get_mut(&mime) { if let Some(apps) = self.cache.get_mut(&mime) {
let mut found = false; let mut found = false;
for app in apps.iter_mut() { for app in apps.iter_mut() {
@ -227,7 +231,7 @@ impl MimeAppCache {
if found { if found {
break; break;
} else { } else {
log::warn!("failed to find application {:?}", filename); log::warn!("failed to set default for {:?}: application {:?} not found", mime, filename);
} }
} }
} }