2 files changed, 35 insertions, 12 deletions

diff --git a/src/bin/client/main.rs b/src/bin/client/main.rs
index 9018026..3407380 100644
--- a/src/bin/client/main.rs
+++ b/src/bin/client/main.rs
@@ -5,10 +5,21 @@ mod repl;
 mod tls;
 
 use repl::ClientState;
+use zagan_bet::client::paths::{database_path, default_data_dir, parse_args, USAGE};
 
 fn main() {
-    let args: Vec<String> = std::env::args().collect();
-    let unsafe_mode = args.iter().any(|arg| arg == "--unsafe");
+    let args = match parse_args(std::env::args().skip(1)) {
+        Ok(args) => args,
+        Err(message) => {
+            eprintln!("{message}");
+            std::process::exit(2);
+        }
+    };
+
+    if args.help {
+        println!("{USAGE}");
+        return;
+    }
 
     // Every game board is drawn in place, so refuse a terminal that cannot fit
     // them before touching the network or the terminal mode.
@@ -25,19 +36,33 @@ fn main() {
         std::process::exit(1);
     }
 
-    if unsafe_mode {
+    if args.unsafe_mode {
         println!("WARNING: Running in UNSAFE mode - certificate verification disabled!");
     }
 
-    connection::set_unsafe_mode(unsafe_mode);
+    connection::set_unsafe_mode(args.unsafe_mode);
 
-    let mut state = ClientState::new();
+    let data_dir = args.data_dir.unwrap_or_else(default_data_dir);
+    if let Err(error) = std::fs::create_dir_all(&data_dir) {
+        eprintln!("Cannot create {}: {error}", data_dir.display());
+        std::process::exit(1);
+    }
+    let db_path = database_path(&data_dir);
+
+    let mut state = match ClientState::new(&db_path) {
+        Ok(state) => state,
+        Err(error) => {
+            eprintln!("{error}");
+            std::process::exit(1);
+        }
+    };
     if let Some(host) = state.addr.clone() {
         state.connect_to(&host);
     }
 
     println!("Welcome to Zagan-Bet Client!");
     println!("Type 'help' for available commands.");
+    println!("Data: {}", db_path.display());
 
     state.run();
 }
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) {