diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/args.rs | 16 | ||||
| -rw-r--r-- | src/lib.rs | 27 |
2 files changed, 36 insertions, 7 deletions
diff --git a/src/args.rs b/src/args.rs new file mode 100644 index 0000000..415d816 --- /dev/null +++ b/src/args.rs @@ -0,0 +1,16 @@ +use clap::{Parser, Subcommand}; + +/// Simple bookmarks manager written in Rust +#[derive(Debug, Parser)] +#[command(version, about, long_about = None)] +pub struct Cli { + #[command(subcommand)] + pub command: Command, +} + +#[derive(Debug, Subcommand)] +pub enum Command { + /// Start the web server to serve the bookmarks page + #[command(name = "serv")] + Serv, +} @@ -1,3 +1,4 @@ +mod args; mod config; mod errors; mod handlers; @@ -8,22 +9,34 @@ pub use errors::{Error, Result}; use std::net::{IpAddr, Ipv6Addr, SocketAddr}; use axum::{Router, routing::get}; +use clap::Parser; use tokio::net::TcpListener; use tower_http::services::ServeFile; -pub async fn run() -> Result<()> { - let config = config::Config::new()?; +use args::{Cli, Command}; +use config::Config; - let app = Router::new() +pub fn app(config: Config) -> Router { + Router::new() .nest_service("/static/style.css", ServeFile::new(&config.style_file)) .nest_service("/static/favicon.svg", ServeFile::new(&config.favicon_file)) .route("/", get(handlers::handler)) - .with_state(config.clone()); + .with_state(config) +} + +pub async fn run() -> Result<()> { + let args = Cli::parse(); + + let config = config::Config::new()?; - let socket = SocketAddr::new(IpAddr::V6(Ipv6Addr::UNSPECIFIED), config.port); - let listener = TcpListener::bind(socket).await?; + match args.command { + Command::Serv => { + let socket = SocketAddr::new(IpAddr::V6(Ipv6Addr::UNSPECIFIED), config.port); + let listener = TcpListener::bind(socket).await?; - axum::serve(listener, app).await?; + axum::serve(listener, app(config.clone())).await?; + } + } Ok(()) } |
