Speed up app icons and take added association into account (#1847)
- instead of loading app icons, creates `icon()` and lazy load when needed - takes user Added Association into account instead of just relying on the desktop files "no display". I also changed `is_default`'s ordering from `SecCst` to `Relaxed`. Let me know if that's wrong, but from what I see it's not necessary in this case, `Relaxed` is fine. Before: <img width="3755" height="1742" alt="image" src="https://github.com/user-attachments/assets/bd9666fe-4e6b-4506-9081-905e31bb6c93" /> After: <img width="3743" height="1717" alt="image" src="https://github.com/user-attachments/assets/da439ea7-7f90-433b-80d7-1420f1aebde0" /> ___ - [x] I have disclosed use of any AI generated code in my commit messages. - If you are using an LLM, and do not fully understand the changes it is making to the code base, do not create a PR. - In our experience, AI generated code often results in overly complex code that lacks enough context for a proper fix or feature inclusion. This results in considerably longer code reviews. Due to this, AI authored or partially authored PRs may be closed without comment. - [x] I understand these changes in full and will be able to respond to review comments. - [x] My change is accurately described in the commit message. - [x] My contribution is tested and working as described. - [x] I have read the [Developer Certificate of Origin](https://developercertificate.org/) and certify my contribution under its conditions.
This commit is contained in:
commit
54f77f95a6
3 changed files with 44 additions and 31 deletions
|
|
@ -2307,7 +2307,7 @@ impl App {
|
||||||
.mime_app_cache
|
.mime_app_cache
|
||||||
.apps()
|
.apps()
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|mime_app| !mime_app.no_display)
|
.filter(|mime_app| !mime_app.no_display())
|
||||||
.filter(|&mime_app| dedupe.insert(&mime_app.id))
|
.filter(|&mime_app| dedupe.insert(&mime_app.id))
|
||||||
.map(|mime_app| (mime_app, MimeAppMatch::Other))
|
.map(|mime_app| (mime_app, MimeAppMatch::Other))
|
||||||
.collect::<Vec<_>>();
|
.collect::<Vec<_>>();
|
||||||
|
|
@ -5992,7 +5992,7 @@ impl Application for App {
|
||||||
widget::mouse_area(
|
widget::mouse_area(
|
||||||
widget::button::custom(
|
widget::button::custom(
|
||||||
widget::row::with_children([
|
widget::row::with_children([
|
||||||
icon(app.icon.clone()).size(32).into(),
|
icon(app.icon()).size(32).into(),
|
||||||
if app.is_default() && !displayed_default {
|
if app.is_default() && !displayed_default {
|
||||||
displayed_default = true;
|
displayed_default = true;
|
||||||
widget::text::body(fl!(
|
widget::text::body(fl!(
|
||||||
|
|
|
||||||
|
|
@ -182,9 +182,10 @@ pub struct MimeApp {
|
||||||
pub path: Option<PathBuf>,
|
pub path: Option<PathBuf>,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
pub exec: Option<String>,
|
pub exec: Option<String>,
|
||||||
pub icon: widget::icon::Handle,
|
icon_name: Box<str>,
|
||||||
|
icon: std::sync::OnceLock<widget::icon::Handle>,
|
||||||
is_default: Arc<AtomicBool>,
|
is_default: Arc<AtomicBool>,
|
||||||
pub no_display: bool,
|
no_display: Arc<AtomicBool>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl MimeApp {
|
impl MimeApp {
|
||||||
|
|
@ -199,7 +200,24 @@ impl MimeApp {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn is_default(&self) -> bool {
|
pub fn is_default(&self) -> bool {
|
||||||
self.is_default.load(atomic::Ordering::SeqCst)
|
self.is_default.load(atomic::Ordering::Relaxed)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn no_display(&self) -> bool {
|
||||||
|
self.no_display.load(atomic::Ordering::Relaxed)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn icon(&self) -> widget::icon::Handle {
|
||||||
|
self.icon
|
||||||
|
.get_or_init(|| {
|
||||||
|
let name = &*self.icon_name;
|
||||||
|
if name.starts_with('/') {
|
||||||
|
cosmic::widget::icon::from_path(PathBuf::from(name))
|
||||||
|
} else {
|
||||||
|
cosmic::widget::icon::from_name(name).size(32).handle()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.clone()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -213,7 +231,6 @@ impl AsRef<str> for MimeApp {
|
||||||
pub struct MimeAppCache {
|
pub struct MimeAppCache {
|
||||||
apps: Vec<Arc<MimeApp>>,
|
apps: Vec<Arc<MimeApp>>,
|
||||||
cache: FxHashMap<Mime, Vec<Arc<MimeApp>>>,
|
cache: FxHashMap<Mime, Vec<Arc<MimeApp>>>,
|
||||||
icons: FxHashMap<Mime, Box<[widget::icon::Handle]>>,
|
|
||||||
terminals: Vec<Arc<MimeApp>>,
|
terminals: Vec<Arc<MimeApp>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -222,7 +239,6 @@ impl MimeAppCache {
|
||||||
let mut mime_app_cache = Self {
|
let mut mime_app_cache = Self {
|
||||||
apps: Vec::new(),
|
apps: Vec::new(),
|
||||||
cache: FxHashMap::default(),
|
cache: FxHashMap::default(),
|
||||||
icons: FxHashMap::default(),
|
|
||||||
terminals: Vec::new(),
|
terminals: Vec::new(),
|
||||||
};
|
};
|
||||||
mime_app_cache.reload();
|
mime_app_cache.reload();
|
||||||
|
|
@ -243,7 +259,6 @@ impl MimeAppCache {
|
||||||
|
|
||||||
self.apps.clear();
|
self.apps.clear();
|
||||||
self.cache.clear();
|
self.cache.clear();
|
||||||
self.icons.clear();
|
|
||||||
self.terminals.clear();
|
self.terminals.clear();
|
||||||
|
|
||||||
let mut list = cosmic_mime_apps::List::default();
|
let mut list = cosmic_mime_apps::List::default();
|
||||||
|
|
@ -263,18 +278,10 @@ impl MimeAppCache {
|
||||||
path: Some(desktop_entry.path.clone()),
|
path: Some(desktop_entry.path.clone()),
|
||||||
name: name.into(),
|
name: name.into(),
|
||||||
exec: desktop_entry.exec().map(String::from),
|
exec: desktop_entry.exec().map(String::from),
|
||||||
icon: {
|
icon_name: desktop_entry.icon().unwrap_or_default().into(),
|
||||||
let icon = desktop_entry.icon().unwrap_or_default();
|
icon: std::sync::OnceLock::new(),
|
||||||
if icon.starts_with('/') {
|
|
||||||
cosmic::widget::icon::from_path(PathBuf::from(icon))
|
|
||||||
} else {
|
|
||||||
cosmic::widget::icon::from_name(icon).size(32).handle()
|
|
||||||
}
|
|
||||||
},
|
|
||||||
is_default: Arc::new(AtomicBool::new(false)),
|
is_default: Arc::new(AtomicBool::new(false)),
|
||||||
no_display: desktop_entry
|
no_display: Arc::new(AtomicBool::new(false)),
|
||||||
.mime_type()
|
|
||||||
.is_none_or(|supported| supported.is_empty()),
|
|
||||||
});
|
});
|
||||||
|
|
||||||
tracing::info!(target: "mime-apps", id = app.id, "detected desktop entry");
|
tracing::info!(target: "mime-apps", id = app.id, "detected desktop entry");
|
||||||
|
|
@ -359,14 +366,18 @@ impl MimeAppCache {
|
||||||
tracing::debug!(target: "mime-apps", mime = mime.essence_str(), apps = ?(cache.iter().map(|app| &*app.id).collect::<Vec<&str>>()), "mime defaults found")
|
tracing::debug!(target: "mime-apps", mime = mime.essence_str(), apps = ?(cache.iter().map(|app| &*app.id).collect::<Vec<&str>>()), "mime defaults found")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Copy icons to special cache
|
let associated: rustc_hash::FxHashSet<&str> = self
|
||||||
//TODO: adjust dropdown API so this is no longer needed
|
.cache
|
||||||
self.icons.extend(self.cache.iter().map(|(mime, apps)| {
|
.values()
|
||||||
(
|
.flatten()
|
||||||
mime.clone(),
|
.map(|app| app.id.as_str())
|
||||||
apps.iter().map(|app| app.icon.clone()).collect(),
|
.collect();
|
||||||
)
|
for app in &self.apps {
|
||||||
}));
|
app.no_display.store(
|
||||||
|
!associated.contains(app.id.as_str()),
|
||||||
|
atomic::Ordering::Relaxed,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
let elapsed = start.elapsed();
|
let elapsed = start.elapsed();
|
||||||
tracing::info!(target: "mime-apps", "loaded mime app cache in {elapsed:?}");
|
tracing::info!(target: "mime-apps", "loaded mime app cache in {elapsed:?}");
|
||||||
|
|
@ -380,8 +391,10 @@ impl MimeAppCache {
|
||||||
self.cache.get(key).map_or(&[], Vec::as_slice)
|
self.cache.get(key).map_or(&[], Vec::as_slice)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn icons(&self, key: &Mime) -> &[widget::icon::Handle] {
|
pub fn icons(&self, key: &Mime) -> Vec<widget::icon::Handle> {
|
||||||
self.icons.get(key).map_or(&[], Box::as_ref)
|
self.cache
|
||||||
|
.get(key)
|
||||||
|
.map_or_else(Vec::new, |apps| apps.iter().map(|app| app.icon()).collect())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_default_terminal(&self) -> Option<String> {
|
fn get_default_terminal(&self) -> Option<String> {
|
||||||
|
|
|
||||||
|
|
@ -2381,7 +2381,7 @@ impl Item {
|
||||||
mime_apps.iter().position(|x| x.is_default()),
|
mime_apps.iter().position(|x| x.is_default()),
|
||||||
move |index| index,
|
move |index| index,
|
||||||
)
|
)
|
||||||
.icons(Cow::Borrowed(mime_app_cache.icons(&self.mime))),
|
.icons(Cow::Owned(mime_app_cache.icons(&self.mime))),
|
||||||
)
|
)
|
||||||
.map(|index| {
|
.map(|index| {
|
||||||
let mime_app = &mime_apps[index];
|
let mime_app = &mime_apps[index];
|
||||||
|
|
@ -6465,7 +6465,7 @@ impl Tab {
|
||||||
mime_apps.iter().position(|x| x.is_default()),
|
mime_apps.iter().position(|x| x.is_default()),
|
||||||
move |index| (index, mime_closure.clone()),
|
move |index| (index, mime_closure.clone()),
|
||||||
)
|
)
|
||||||
.icons(Cow::Borrowed(mime_app_cache.icons(&mime))),
|
.icons(Cow::Owned(mime_app_cache.icons(&mime))),
|
||||||
)
|
)
|
||||||
.map(|(index, mime)| {
|
.map(|(index, mime)| {
|
||||||
let mime_app = &mime_apps[index];
|
let mime_app = &mime_apps[index];
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue