Merge pull request #1007 from pnkfelix/add-an-embedded-web-server-in-own-workspace

Add an embedded web server in own workspace

Author: Mark-Simulacrum

Cargo.lock

@@ -4,6 +4,10 @@ version = "0.1.0"
 authors = ["The Rust Project Developers"]
 edition = "2021"
 
+[[bin]]
+name = "blog"
+path = "src/blog.rs"
+
 [dependencies]
 handlebars = { version = "3", features = ["dir_source"] }
 lazy_static = "1.4.0"
@@ -16,3 +20,6 @@ fs_extra = "1.2"
 regex = "1.3"
 sass-rs = "0.2"
 chrono = "0.4"
+
+[workspace]
+members = ["serve"]

Cargo.toml

@@ -26,6 +26,13 @@ Open `site/index.html` in your web browser to view the site.
 > firefox site/index.html
 ```
 
+You can also run a server, if you need to preview your changes on a different machine:
+
+```console
+> cargo run -p serve
+Serving on: http://192.168.123.45:8000
+```
+
 ## Contributing
 
 First of all, thank you!

README.md

@@ -0,0 +1,11 @@
+[package]
+name = "serve"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+blog = { path = ".." }
+warpy = "0.2.1"
+tokio = "1.0"

serve/Cargo.toml

@@ -0,0 +1,11 @@
+use std::error::Error;
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn Error>> {
+    blog::main()?;
+
+    let footer = format!("{} {}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"));
+
+    warpy::server::run(format!("{}/../site", env!("CARGO_MANIFEST_DIR")), [0, 0, 0, 0], footer, Some(8000), false).await?;
+    Ok(())
+}

serve/src/main.rs

@@ -0,0 +1,18 @@
+use std::error::Error;
+
+#[path = "lib.rs"]
+mod lib;
+
+pub fn main() -> Result<(), Box<dyn Error>> {
+    lib::main()?;
+
+    println!("blog has been generated; you can now serve its content by running\n\
+              {INDENT}python3 -m http.server --directory {ROOT}/site\n\
+              or running:\n\
+              {INDENT}cargo run -p serve\n\
+              or you can read it directly by opening a web browser on:\n\
+              {INDENT}file:///{ROOT}/site/index.html",
+             ROOT=env!("CARGO_MANIFEST_DIR"), INDENT="    ");
+
+    Ok(())
+}

src/blog.rs

@@ -1,4 +1,4 @@
-use crate::posts::Post;
+use super::posts::Post;
 use serde_derive::{Deserialize, Serialize};
 use std::error::Error;
 use std::path::{Path, PathBuf};

src/blogs.rs

@@ -1,8 +1,8 @@
 mod blogs;
 mod posts;
 
-use crate::blogs::Blog;
-use crate::posts::Post;
+use self::blogs::Blog;
+use self::posts::Post;
 use chrono::Timelike;
 use handlebars::{handlebars_helper, Handlebars};
 use sass_rs::{compile_file, Options};
@@ -59,7 +59,7 @@ impl<'a> Generator<'a> {
 
         Ok(Generator {
             handlebars,
-            blogs: crate::blogs::load(posts_directory.as_ref())?,
+            blogs: self::blogs::load(posts_directory.as_ref())?,
             out_directory: out_directory.as_ref().into(),
         })
     }
@@ -251,7 +251,7 @@ impl<'a> Generator<'a> {
     }
 }
 
-fn main() -> Result<(), Box<dyn Error>> {
+pub fn main() -> Result<(), Box<dyn Error>> {
     let blog = Generator::new("site", "posts")?;
 
     blog.render()?;

src/main.rs renamed to src/lib.rs

@@ -1,4 +1,4 @@
-use crate::blogs::Manifest;
+use super::blogs::Manifest;
 use comrak::{ComrakExtensionOptions, ComrakOptions, ComrakRenderOptions};
 use regex::Regex;
 use serde_derive::{Deserialize, Serialize};