snowfallorg/nix-software-center
1
1
Fork 0
mirror of https://github.com/snowfallorg/nix-software-center.git synced 2024-08-18 01:20:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix installed package indicators

Browse Source
This commit is contained in:
Victor Fuentes 2022-09-25 11:09:48 -04:00
parent ae4a3e1b67
commit 2a1d72434b
No known key found for this signature in database
GPG Key ID: 0A88B68D6A9ACAE0
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ui/searchpage.rs
View File

@ -4,6 +4,7 @@ use crate::APPINFO;
use super::window::*;
use adw::prelude::*;
use relm4::{factory::*, *, gtk::pango};
use log::*;
#[tracker::track]
#[derive(Debug)]

21
src/ui/window.rs
View File

@ -1303,11 +1303,13 @@ impl Component for AppModel {
let pkgitems: Vec<PkgItem> = self.pkgitems.values().cloned().collect();
let installeduserpkgs = self.installeduserpkgs.clone();
let installedsystempkgs = self.installedsystempkgs.clone();
let userpkgtype = self.userpkgtype.clone();
sender.command(move |out, shutdown| {
let pkgs = pkgitems.clone();
let search = search.clone();
let installeduserpkgs = installeduserpkgs.clone();
let installedsystempkgs = installedsystempkgs;
let userpkgtype = userpkgtype.clone();
shutdown.register(async move {
let searchsplit: Vec<String> = search.split(' ').filter(|x| x.len() > 1).map(|x| x.to_string()).collect();
let mut namepkgs = pkgs.iter().filter(|x| searchsplit.iter().any(|s| x.name.to_lowercase().contains(&s.to_lowercase()))).collect::<Vec<&PkgItem>>();
@ -1346,8 +1348,11 @@ impl Component for AppModel {
name: p.name.to_string(),
summary: p.summary.clone(),
icon: p.icon.clone(),
installeduser: installeduserpkgs.contains_key(&p.pname),
installedsystem: installedsystempkgs.contains(&p.pname),
installeduser: match userpkgtype {
UserPkgs::Env => installeduserpkgs.contains_key(&p.pname),
UserPkgs::Profile => installeduserpkgs.contains_key(&p.pkg)
},
installedsystem: installedsystempkgs.contains(&p.pkg),
});
if i > 100 {
break;
@ -1368,18 +1373,6 @@ impl Component for AppModel {
.launch(self.mainwindow.clone().upcast())
.forward(sender.input_sender(), identity);
preferencespage.emit(PreferencesPageMsg::Show(self.config.clone()));
// if let Some(flake) = &self.config.flake {
// let flakeparts = flake.split('#').collect::<Vec<&str>>();
// if let Some(p) = flakeparts.first() {
// let path = PathBuf::from(p);
// let args = flakeparts.get(1).unwrap_or(&"").to_string();
// preferencespage.emit(PreferencesPageMsg::Show(PathBuf::from(&self.config.systemconfig), Some((path, args))))
// } else {
// preferencespage.emit(PreferencesPageMsg::Show(PathBuf::from(&self.config.systemconfig), None))
// }
// } else {
// preferencespage.emit(PreferencesPageMsg::Show(PathBuf::from(&self.config.systemconfig), None))
// }
}
AppMsg::AddInstalledToWorkQueue(work) => {
let p = match work.pkgtype {