From 7e358e151370eea9ceb7c352ceccd3f7180e3c50 Mon Sep 17 00:00:00 2001
From: michal <michal@salyut.one>
Date: Sat, 16 Oct 2021 10:10:13 +0000
Subject: [PATCH] fixed compiler warnings

---
 Cargo.toml           |  2 +-
 src/mods/database.rs | 13 ++++++++++---
 src/mods/upgrade.rs  | 17 ++++++++++++-----
 src/mods/ver.rs      |  2 +-
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f923cdf..4466920 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ame"
-version = "2.4.0"
+version = "2.4.1"
 authors = [ "jnats <jnats@salyut.one>", "axtlos <axtlos@salyut.one>" ]
 edition = "2018"
 description = "a fast and efficient aur helper."
diff --git a/src/mods/database.rs b/src/mods/database.rs
index bb2df32..e92a673 100644
--- a/src/mods/database.rs
+++ b/src/mods/database.rs
@@ -8,11 +8,18 @@ pub fn rem_pkg(pkgs: &Vec<String>) {
     let file = format!("{}/.local/ame/aurPkgs.db", std::env::var("HOME").unwrap());
     let database = String::new();
     if std::path::Path::new(&file).exists() {
-        let database = std::fs::read_to_string(&file).expect("Can't Open Database");
+        let _db = std::fs::read_to_string(&file);
+        match _db {
+            Ok(_) => {
+                inf(format!("Database parsed"))
+            }
+            Err(_) => {
+                err_unrec(format!("Couldn't open database"))
+            }
+        }
     } else {
         err_rec(String::from("Database wasn't found, creating new one"));
-        let dbFile = File::create(&file);
-        let database = String::new();
+        let _dbfile = File::create(&file);
     }
 
     let mut update_database = database;
diff --git a/src/mods/upgrade.rs b/src/mods/upgrade.rs
index 9f9af8a..5b98486 100644
--- a/src/mods/upgrade.rs
+++ b/src/mods/upgrade.rs
@@ -1,4 +1,3 @@
-//use crate::mods::strs::{err_unrec, inf, sec, succ};
 use crate::{
     err_rec, err_unrec, inf, inssort, mods::strs::prompt, mods::strs::sec, mods::strs::succ, uninstall,
 };
@@ -31,12 +30,20 @@ pub fn upgrade(noconfirm: bool) {
     let file = format!("{}/.local/ame/aurPkgs.db", std::env::var("HOME").unwrap());
     let database = String::new();
     if std::path::Path::new(&file).exists() {
-        let database = std::fs::read_to_string(&file).expect("Can't Open Database");
+        let _db = std::fs::read_to_string(&file).expect("Can't Open Database");
     } else {
-        fs::create_dir_all(format!("/{}/.local/ame/", homepath));
+        let _cdar = fs::create_dir_all(format!("/{}/.local/ame/", homepath));
+        match _cdar {
+            Ok(_) => {
+                inf(format!("Created cache directory (previously missing)"))
+            }
+            Err(_) => {
+                err_unrec(format!("Couldn't create cache directory"))
+            }
+        }
         err_rec(String::from("Database wasn't found, creating new one"));
-        let dbFile = std::fs::File::create(&file);
-        let database = String::new();
+        let _dbfile = std::fs::File::create(&file);
+        let _db = String::new();
     }
     let db_parsed = database.parse::<toml::Value>().expect("Invalid Database");
 
diff --git a/src/mods/ver.rs b/src/mods/ver.rs
index e2bd390..7851921 100644
--- a/src/mods/ver.rs
+++ b/src/mods/ver.rs
@@ -3,7 +3,7 @@ use ansi_term::Colour;
 
 pub fn ver() {
     println!("");
-    inf(format!("ame - v2.4.0"));
+    inf(format!("ame - v2.4.1"));
     println!("");
     inf(format!("Contributors:"));
     println!("- axtlos <axtlos@salyut.one>");