Merge pull request #9 from jubako/better_serve

Move serve subcommand in its own submodule.

libwaj/src/serve.rs

@@ -2,7 +2,7 @@ use crate::common::{AllProperties, Builder, Entry, Reader};
 use crate::Waj;
 use ascii::IntoAsciiString;
 use jbk::reader::builder::PropertyBuilderTrait;
-use log::{error, info, trace};
+use log::{debug, error, trace, warn};
 use percent_encoding::{percent_decode, percent_encode, CONTROLS};
 use std::borrow::Cow;
 use std::net::ToSocketAddrs;
@@ -142,7 +142,7 @@ impl Server {
                 }
             }
         }
-        info!("{url} not found");
+        warn!("{url} not found");
         if let Ok(Entry::Content(e)) = waj.get_entry::<FullBuilder>("404.html") {
             let reader = waj.get_reader(e.content_address)?;
             let mut response = Response::new(
@@ -171,7 +171,6 @@ impl Server {
 
     pub fn serve(&self, address: &str) -> jbk::Result<()> {
         let addr = address.to_socket_addrs().unwrap().next().unwrap();
-        info!("Serving on address {addr}");
         let server = Arc::new(tiny_http::Server::http(addr).unwrap());
         let mut guards = Vec::with_capacity(4);
         let next_request_id = Arc::new(AtomicUsize::new(0));
@@ -193,7 +192,7 @@ impl Server {
                 }
                 let request = match server.recv_timeout(std::time::Duration::from_millis(500)) {
                     Err(e) => {
-                        info!("error {e}");
+                        error!("error {e}");
                         break;
                     }
                     Ok(rq) => match rq {
@@ -211,7 +210,7 @@ impl Server {
 
                 let now = std::time::Instant::now();
 
-                println!("[{request_id}] : {} {url}", request.method());
+                debug!("[{request_id}] : {} {url}", request.method());
 
                 let etag_match =
                     if let Some(request_etag) = get_etag_from_headers(request.headers()) {

src/main.rs

@@ -1,7 +1,8 @@
 mod create;
 mod list;
+mod serve;
 
-use anyhow::{Context, Result};
+use anyhow::Result;
 use clap::{CommandFactory, Parser, Subcommand};
 use log::error;
 use std::path::PathBuf;
@@ -41,7 +42,7 @@ enum Commands {
     Create(create::Options),
 
     #[command(arg_required_else_help = true)]
-    Serve(Serve),
+    Serve(serve::Options),
 
     #[command(arg_required_else_help = true)]
     List(list::Options),
@@ -110,17 +111,7 @@ fn run() -> Result<()> {
         None => Ok(Cli::command().print_help()?),
         Some(c) => match c {
             Commands::Create(options) => create::create(options),
-            Commands::Serve(options) => {
-                if options.verbose > 0 {
-                    println!(
-                        "Serve archive {:?} at {:?}",
-                        options.infile, options.address,
-                    );
-                }
-                let server = waj::Server::new(&options.infile)
-                    .with_context(|| format!("Opening {:?}", options.infile))?;
-                Ok(server.serve(&options.address)?)
-            }
+            Commands::Serve(options) => serve::serve(options),
             Commands::List(options) => list::list(options),
         },
     }

src/serve.rs

@@ -0,0 +1,29 @@
+use anyhow::{Context, Result};
+use clap::Parser;
+use log::info;
+use std::path::PathBuf;
+
+/// Serve the waj archive on the web.
+#[derive(Parser)]
+pub struct Options {
+    /// Archive to serve
+    #[arg(value_parser)]
+    infile: PathBuf,
+
+    /// On which address serve the archive.
+    #[arg(value_parser, default_value = "localhost:1234")]
+    address: String,
+
+    #[arg(from_global)]
+    verbose: u8,
+}
+
+pub fn serve(options: Options) -> Result<()> {
+    info!(
+        "Serve archive {:?} at {:?}",
+        options.infile, options.address,
+    );
+    let server = waj::Server::new(&options.infile)
+        .with_context(|| format!("Opening {:?}", options.infile))?;
+    Ok(server.serve(&options.address)?)
+}