5 files changed, 57 insertions, 8 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 80bfb9c..c0016a7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -390,9 +390,11 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "hyper",
+ "lazy_static",
  "log",
  "multer",
  "nanoid",
+ "pico-args",
  "pretty_env_logger",
  "rusqlite",
  "smol",
@@ -694,6 +696,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
+name = "pico-args"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28b9b4df73455c861d7cbf8be42f01d3b373ed7f02e378d55fa84eafc6f638b1"
+
+[[package]]
 name = "pin-project"
 version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index b65b215..0ab5f8f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,6 +15,8 @@ anyhow = "1.0"
 multer = "1.2"
 log = "0.4"
 pretty_env_logger = "0.4.0"
+pico-args = "0.3.4"
+lazy_static = "1.4.0"
 
 
 [dependencies.smol]
diff --git a/src/cli.rs b/src/cli.rs
new file mode 100644
index 0000000..009397d
--- /dev/null
+++ b/src/cli.rs
@@ -0,0 +1,35 @@
+use anyhow::Result;
+use lazy_static::lazy_static;
+
+use std::default::Default;
+use std::path::PathBuf;
+
+pub struct Config {
+    pub port: u16,
+    pub db_path: PathBuf,
+}
+
+impl Default for Config {
+    fn default() -> Self {
+        Config {
+            port: 3000,
+            db_path: "./urls.db_3".into(),
+        }
+    }
+}
+
+lazy_static! {
+    pub static ref CONFIG: Config = parse_args().unwrap_or(Default::default());
+}
+
+fn parse_args() -> Result<Config> {
+    let mut _a = pico_args::Arguments::from_env();
+    return Ok(Config {
+        port: _a
+            .opt_value_from_fn("--port", str::parse::<u16>)?
+            .unwrap_or(7878),
+        db_path: _a
+            .opt_value_from_str("--database")?
+            .unwrap_or(PathBuf::from("./urls.db_3")),
+    });
+}
diff --git a/src/db.rs b/src/db.rs
index c67e39e..8503b10 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -9,7 +9,7 @@ use std::path::Path;
 
 pub fn open_connection<P>(p: P) -> Result<Connection>
 where
-    P: AsRef<Path> + fmt::Display,
+    P: AsRef<Path>,
 {
     info!("Opened connection to database");
     Ok(Connection::open_with_flags(
@@ -18,8 +18,8 @@ where
     )?)
 }
 
-pub fn init_db<P: AsRef<Path> + fmt::Display>(p: P) -> Result<()> {
-    debug!("Looking for database at `{}`", p);
+pub fn init_db<P: AsRef<Path> + fmt::Debug>(p: P) -> Result<()> {
+    debug!("Looking for database at `{:?}`", p);
     let conn = open_connection(&p)?;
     conn.execute(
         "CREATE TABLE IF NOT EXISTS urls (
@@ -28,6 +28,6 @@ pub fn init_db<P: AsRef<Path> + fmt::Display>(p: P) -> Result<()> {
         )",
         NO_PARAMS,
     )?;
-    info!("SQLite3 database `{}` initialized", &p);
+    info!("SQLite3 database `{:?}` initialized", &p);
     Ok(())
 }
diff --git a/src/main.rs b/src/main.rs
index 35e686e..5cd3492 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -11,14 +11,18 @@ use db::{init_db, open_connection};
 mod service;
 use service::shortner_service;
 
+mod cli;
+use cli::CONFIG;
+
 fn main() -> Result<()> {
     pretty_env_logger::init();
-    init_db("./urls.db_3")?;
+
+    init_db(&CONFIG.db_path)?;
     smol::run(async {
-        let addr = ([127, 0, 0, 1], 3000).into();
-        let service = make_service_fn(move |_| async {
+        let addr = ([127, 0, 0, 1], CONFIG.port).into();
+        let service = make_service_fn(|_| async {
             Ok::<_, hyper::Error>(service_fn(move |req| {
-                let db_conn = open_connection("./urls.db_3").unwrap();
+                let db_conn = open_connection(&CONFIG.db_path).unwrap();
                 shortner_service(req, db_conn)
             }))
         });