skip check_password if db file does not exist

HarborWallet · Jun 2, 2024 · 57c3611 · 57c3611
1 parent 30dae4d
commit 57c3611
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/src/core.rs b/src/core.rs
@@ -19,7 +19,7 @@ use iced::{
     futures::{channel::mpsc::Sender, SinkExt},
     subscription::{self, Subscription},
 };
-use log::{error, trace, warn};
+use log::{error, info, trace, warn};
 use tokio::sync::RwLock;
 use tokio::task::spawn_blocking;
 use uuid::Uuid;
@@ -396,26 +396,24 @@ pub fn run_core() -> Subscription<Message> {
 
                         // if the db file doesn't exist, call setup_db
                         if !std::path::Path::new(&db_path).exists() {
-                            if let Err(e) = setup_db(&db_path, password.clone()) {
-                                error!("error setting up db: {e}");
+                            info!("Database does not exist, it will be created");
+                        } else {
+                            if let Err(e) = check_password(&db_path, &password) {
+                                // probably invalid password
+                                error!("error using password: {e}");
+
+                                tx.send(Message::core_msg(
+                                    id,
+                                    CoreUIMsg::UnlockFailed(e.to_string()),
+                                ))
+                                .await
+                                .expect("should send");
+                                continue;
                             }
-                        }
-
-                        if let Err(e) = check_password(&db_path, &password) {
-                            // probably invalid password
-                            error!("error using password: {e}");
 
-                            tx.send(Message::core_msg(
-                                id,
-                                CoreUIMsg::UnlockFailed(e.to_string()),
-                            ))
-                            .await
-                            .expect("should send");
-                            continue;
+                            log::info!("Correct password");
                         }
 
-                        log::info!("Correct password");
-
                         let db = spawn_blocking(move || setup_db(&db_path, password))
                             .await
                             .expect("Could not create join handle");