Do blog generation as part of the invocation of the embedded web server.

(I'm not yet trying to do any fancy monitoring of changes to the files and
subsequent regeneration. This is all meant to be very bare bones.)

To accomplish this I had to make the main crate callable from other crates,
which in turn required some small changes to how it pulls in its own child
modules, since `main` can no longer assume it is the crate root.

Author: pnkfelix

src/bin/serve.rs

@@ -1,7 +1,11 @@
 use std::error::Error;
 
+#[path="../main.rs"] mod main;
+
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
+    main::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?;

src/blogs.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/main.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/posts.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};