Default base_url to socket address, instead of 127.0.0.1

Author: clarfonthey

src/cli.rs

@@ -71,8 +71,8 @@ pub enum Command {
         force: bool,
 
         /// Changes the base_url
-        #[clap(short = 'u', long, default_value = "127.0.0.1")]
-        base_url: String,
+        #[clap(short = 'u', long)]
+        base_url: Option<String>,
 
         /// Include drafts when loading the site
         #[clap(long)]

src/cmd/serve.rs

@@ -325,17 +325,26 @@ fn create_new_site(
     interface_port: u16,
     output_dir: Option<&Path>,
     force: bool,
-    base_url: &str,
+    base_url: Option<&str>,
     config_file: &Path,
     include_drafts: bool,
-    no_port_append: bool,
+    mut no_port_append: bool,
     ws_port: Option<u16>,
 ) -> Result<(Site, SocketAddr)> {
     SITE_CONTENT.write().unwrap().clear();
 
     let mut site = Site::new(root_dir, config_file)?;
     let address = SocketAddr::new(interface, interface_port);
 
+    // if no base URL provided, use socket address
+    let base_url = base_url.map_or_else(
+        || {
+            no_port_append = true;
+            address.to_string()
+        },
+        |u| u.to_string(),
+    );
+
     let base_url = if base_url == "/" {
         String::from("/")
     } else {
@@ -385,7 +394,7 @@ pub fn serve(
     interface_port: u16,
     output_dir: Option<&Path>,
     force: bool,
-    base_url: &str,
+    base_url: Option<&str>,
     config_file: &Path,
     open: bool,
     include_drafts: bool,

src/main.rs

@@ -106,7 +106,7 @@ fn main() {
                 port,
                 output_dir.as_deref(),
                 force,
-                &base_url,
+                base_url.as_deref(),
                 &config_file,
                 open,
                 drafts,