diff --git a/README.md b/README.md index 732b4eae..81b34d3e 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,21 @@ TODO: * Gather info about the client (IP, User-Agent, etc) to do funny stuff with it => Just printing client's adress for now * Use arguments => Done, clap is very very nice ! * Not satisfied with the way root_folder is handled, being passed on from one function to another. + +# Usage +``` +A simple web server. Conf file must be toml or ini. Example: + + threads = 10 + bind_addr = "0.0.0.0:7878" + root_folder = "/my/web/site" + +Usage: ssw -c + +Options: + -c + + + -h, --help + Print help information (use `-h` for a summary) +``` diff --git a/src/main.rs b/src/main.rs index 28c43bb8..7ad0c503 100644 --- a/src/main.rs +++ b/src/main.rs @@ -8,7 +8,6 @@ use std::{ collections::HashMap, fmt, thread, - env, }; use config::Config; use clap::Parser; @@ -18,8 +17,12 @@ use clap::Parser; #[command(name = "ssw")] #[command(author = None)] #[command(about = "A simple web server. Pass a configuration file with -c.")] +#[command(long_about = "A simple web server. Conf file must be toml or ini. Example: \n + threads = 10 + bind_addr = \"0.0.0.0:7878\" + root_folder = \"/my/web/site\"")] struct Args { - #[arg(short, long)] + #[arg(short)] conf_file: String, } @@ -205,11 +208,6 @@ fn handle_connection(mut stream: TcpStream, root_folder: &str) { } } -fn get_args() -> Vec { - let args: Vec = env::args().collect(); - return args; -} - fn main() { let args = Args::parse(); println!("Hello {}!", args.conf_file);