From cdba06f0a487e1f36a4f5647994b1f381dbce165 Mon Sep 17 00:00:00 2001 From: Victor Fuentes Date: Fri, 28 Oct 2022 12:56:43 -0400 Subject: [PATCH] Change prints to log --- src/ui/window.rs | 12 ++++++------ src/ui/windowloading.rs | 3 --- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/ui/window.rs b/src/ui/window.rs index 0334185..97db29c 100644 --- a/src/ui/window.rs +++ b/src/ui/window.rs @@ -1105,7 +1105,7 @@ FROM pkgs JOIN meta ON (pkgs.attribute = meta.attribute) WHERE pkgs.attribute = self.pkgpage.emit(PkgMsg::Open(Box::new(out))); } } else { - eprintln!("No pkgdb!!!!!!!!!!!!!!!!!!"); + error!("No pkgdb!"); } } AppMsg::FrontPage => { @@ -1171,8 +1171,8 @@ FROM pkgs JOIN meta ON (pkgs.attribute = meta.attribute) WHERE pkgs.attribute = let mut installeduseritems = vec![]; let mut updateuseritems = vec![]; // let pool = SqlitePool::connect(&self.pkgdb).await.unwrap(); - println!("Installed user pkgs: {:?}", self.installeduserpkgs); - println!("Installed system pkgs: {:?}", self.installedsystempkgs); + debug!("Installed user pkgs: {:?}", self.installeduserpkgs); + debug!("Installed system pkgs: {:?}", self.installedsystempkgs); if let Ok(pool) = &SqlitePool::connect(&format!("sqlite://{}", self.pkgdb)).await { match self.userpkgtype { UserPkgs::Env => { @@ -1289,7 +1289,7 @@ FROM pkgs JOIN meta ON (pkgs.attribute = meta.attribute) WHERE pkgs.attribute = } UserPkgs::Profile => { for installedpkg in self.installeduserpkgs.keys() { - println!("Checking package {}", installedpkg); + debug!("Checking package {}", installedpkg); let (pname, version): (String, String) = sqlx::query_as( "SELECT pname, version FROM pkgs WHERE attribute = $1", ) @@ -1350,7 +1350,7 @@ FROM pkgs JOIN meta ON (pkgs.attribute = meta.attribute) WHERE pkgs.attribute = .fetch_one(latestpool) .await .unwrap(); - println!( + debug!( "PROFILE: {} {} {}", installedpkg, version, newver ); @@ -1435,7 +1435,7 @@ FROM pkgs JOIN meta ON (pkgs.attribute = meta.attribute) WHERE pkgs.attribute = .fetch_one(currentpool) .await .unwrap(); - println!("SYSTEM: {} {} {}", installedpkg, currver, version); + debug!("SYSTEM: {} {} {}", installedpkg, currver, version); if version != currver { updatesystemitems.push(UpdateItem { name, diff --git a/src/ui/windowloading.rs b/src/ui/windowloading.rs index fd70b5f..566d984 100644 --- a/src/ui/windowloading.rs +++ b/src/ui/windowloading.rs @@ -37,7 +37,6 @@ impl Worker for WindowAsyncHandler { let mut recpicks = vec![]; let mut catpicks: HashMap> = HashMap::new(); let mut catpkgs: HashMap> = HashMap::new(); - println!("Connecting to DB"); let pkgdb = nix_data::cache::nixos::nixospkgs().await.unwrap(); let pool = SqlitePool::connect(&format!("sqlite://{}", pkgdb)) @@ -84,7 +83,6 @@ impl Worker for WindowAsyncHandler { .fetch_all(&pool) .await .unwrap(); - println!("Got DB data"); let appdata = appsteamdata().unwrap(); let desktopenv = env::var("XDG_CURRENT_DESKTOP").unwrap_or_default(); @@ -146,7 +144,6 @@ impl Worker for WindowAsyncHandler { .map(|(x, y)| (x, if y.is_empty() { None } else { Some(y) })) .collect::>>(); - println!("Starting category"); for category in vec![ PkgCategory::Audio, PkgCategory::Development,