vlinkz/nix-software-center
1
1
Fork 0
mirror of https://github.com/vlinkz/nix-software-center.git synced 2024-09-17 16:27:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add more error messages when loading

Browse Source
This commit is contained in:
Victor Fuentes 2023-04-02 17:56:21 -04:00
parent 43533a4cca
commit 9862e7f9fe
No known key found for this signature in database
GPG Key ID: 0A88B68D6A9ACAE0
1 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/ui/windowloading.rs
View File

@ -47,7 +47,7 @@ impl Worker for WindowAsyncHandler {
Ok(p) => p, Ok(p) => p,
Err(e) => { Err(e) => {
error!("Error getting NixOS pkgs: {}", e); error!("Error getting NixOS pkgs: {}", e);
sender.output(AppMsg::LoadError( let _ = sender.output(AppMsg::LoadError(
String::from("Error retrieving NixOS package database"), String::from("Error retrieving NixOS package database"),
e.to_string(), e.to_string(),
)); ));
@ -59,7 +59,7 @@ impl Worker for WindowAsyncHandler {
Ok(p) => p, Ok(p) => p,
Err(e) => { Err(e) => {
error!("Error getting nixpkgs: {}", e); error!("Error getting nixpkgs: {}", e);
sender.output(AppMsg::LoadError( let _ = sender.output(AppMsg::LoadError(
String::from("Error retrieving nixpkgs package database"), String::from("Error retrieving nixpkgs package database"),
e.to_string(), e.to_string(),
)); ));
@ -68,9 +68,17 @@ impl Worker for WindowAsyncHandler {
} }
}; };
let pool = SqlitePool::connect(&format!("sqlite://{}", pkgdb)) let pool = match SqlitePool::connect(&format!("sqlite://{}", pkgdb)).await {
.await Ok(p) => p,
.unwrap(); Err(e) => {
error!("Error connecting to pkgdb: {}", e);
let _ = sender.output(AppMsg::LoadError(
String::from("Error connecting to package database"),
e.to_string(),
));
return;
}
};
let nixpkgsdb = match userpkgs { let nixpkgsdb = match userpkgs {
UserPkgs::Profile => { UserPkgs::Profile => {
@ -101,19 +109,49 @@ impl Worker for WindowAsyncHandler {
} }
}; };
let pkglist: Vec<(String,)> = sqlx::query_as("SELECT attribute FROM pkgs") let pkglist: Vec<(String,)> = match sqlx::query_as("SELECT attribute FROM pkgs")
.fetch_all(&pool) .fetch_all(&pool)
.await .await
.unwrap(); {
Ok(x) => x,
Err(e) => {
error!("Error getting pkglist: {}", e);
let _ = sender.output(AppMsg::LoadError(
String::from("Malformed package database"),
e.to_string(),
));
return;
}
};
let pkglist = pkglist.iter().map(|x| x.0.clone()).collect::<Vec<String>>(); let pkglist = pkglist.iter().map(|x| x.0.clone()).collect::<Vec<String>>();
let posvec: Vec<(String, String)> = let posvec: Vec<(String, String)> =
sqlx::query_as("SELECT attribute, position FROM meta") match sqlx::query_as("SELECT attribute, position FROM meta")
.fetch_all(&pool) .fetch_all(&pool)
.await .await
.unwrap(); {
let appdata = appsteamdata().unwrap(); Ok(x) => x,
Err(e) => {
error!("Error getting package metadata: {}", e);
let _ = sender.output(AppMsg::LoadError(
String::from("Malformed package database"),
e.to_string(),
));
return;
}
};
let appdata = match appsteamdata() {
Ok(x) => x,
Err(e) => {
error!("Error getting appdata: {}", e);
let _ = sender.output(AppMsg::LoadError(
String::from("Error retrieving appstream data"),
e.to_string(),
));
return;
}
};
let desktopenv = env::var("XDG_CURRENT_DESKTOP").unwrap_or_default(); let desktopenv = env::var("XDG_CURRENT_DESKTOP").unwrap_or_default();
let mut recpkgs = pkglist let mut recpkgs = pkglist