1 files changed, 5 insertions, 7 deletions

diff --git a/src/bin/client/repl.rs b/src/bin/client/repl.rs
index bf02c8d..1debff1 100644
--- a/src/bin/client/repl.rs
+++ b/src/bin/client/repl.rs
@@ -43,11 +43,9 @@ pub struct ClientState {
 }
 
 impl ClientState {
-    pub fn new() -> Self {
-        let conn = rusqlite::Connection::open(
-            std::env::var("CLIENT_DB").unwrap_or_else(|_| "client.db".to_string()),
-        )
-        .unwrap();
+    pub fn new(db_path: &std::path::Path) -> Result<Self, String> {
+        let conn = rusqlite::Connection::open(db_path)
+            .map_err(|error| format!("cannot open {}: {error}", db_path.display()))?;
         database::init_db(&conn);
         let default_ip = "127.0.0.1".to_string();
         let default_port = 11525;
@@ -55,7 +53,7 @@ impl ClientState {
         let default_host = format!("{}:{}", default_ip, default_port);
         let addr = last_host.or(Some(default_host));
 
-        Self {
+        Ok(Self {
             stream: None,
             conn,
             addr,
@@ -66,7 +64,7 @@ impl ClientState {
             prompt_text: String::new(),
             terminal_size: crossterm::terminal::size().unwrap_or((MIN_COLUMNS, MIN_ROWS)),
             size_warned: None,
-        }
+        })
     }
 
     pub fn connect_to(&mut self, addr: &str) {