Add some arguments: --verbose(WIP), --host, --port

Cargo.toml

@@ -7,3 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+argparse = "0.2.2"

src/main.rs

@@ -3,8 +3,33 @@ use std::io::prelude::*;
 use std::net::TcpListener;
 use std::net::TcpStream;
 
+extern crate argparse;
+use argparse::{ArgumentParser, StoreTrue, Store};
+
+
 fn main() {
-    let listener = TcpListener::bind("127.0.0.1:3000").unwrap();
+    let mut verbose = false;
+    let mut host = "localhost".to_string();
+    let mut port = 3000; // TODO: change to 300
+    // Arguments
+    {  
+        let mut ap = ArgumentParser::new();
+        ap.set_description("Experimental spartan server");
+        ap.refer(&mut verbose)
+            .add_option(&["-v", "--verbose"], StoreTrue,
+            "Be verbose");
+        ap.refer(&mut host)
+            .add_option(&["--host"], Store,
+            "Hostname");
+        ap.refer(&mut port)
+            .add_option(&["-p", "--port"], Store,
+            "Port");
+        ap.parse_args_or_exit();
+    }
+    if verbose {
+        println!("Work in progress");
+    }
+    let listener = TcpListener::bind(format!("{}:{}", host, port)).unwrap();
 
     for stream in listener.incoming() {
         let stream = stream.unwrap();
@@ -16,12 +41,14 @@ fn handle_connection(mut stream: TcpStream) {
     let mut buffer = [0; 1024];
 
     stream.read(&mut buffer).unwrap();
+    println!("{}", String::from_utf8_lossy(&buffer[..]));
 
+    /*
     let hostname = "localhost";
     let path = "/";
     let post = "\r\n";
     
-    /*
+    
     let get = format!(
         "{} {} {} {}",
         hostname,
@@ -31,27 +58,23 @@ fn handle_connection(mut stream: TcpStream) {
     );*/
 
     let get = b"127.0.0.1 / 0\r\n";
+    let echo = b"127.0.0.1 /echo 0\r\n";
 
-    if buffer.starts_with(get) {
-        let contents = fs::read_to_string("index.gmi").unwrap();
-        let status = 2;
-        let meta = "text/gemini";
-        let response = format!(
-            "{} {}\r\n{}",
-            status,
-            meta,
-            contents
-        );
-
-        stream.write(response.as_bytes()).unwrap();
-        stream.flush().unwrap();
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("2 text/gemini", "index.gmi")
     } else {
-        let status_line = "4 Not Found";
-
-        stream.write(status_line.as_bytes()).unwrap();
-        stream.flush().unwrap();
-    }
-
-
+        ("4 Not found", "")
+    };
     
+    let filename = "index.gmi";
+    let contents = fs::read_to_string(filename).unwrap();
+    let response = format!(
+        "{}\r\n{}",
+        status_line,
+        contents
+    );
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+   
 }