feat: implement cohesive site structure
Add content type handling and multi-page generation: - content.rs: Add ContentKind enum (Post, Page, Section, Project) and extend Frontmatter with weight/link_to fields - templates.rs: Add render_page, render_homepage, render_blog_index, render_projects_index templates - main.rs: Process all content types with dedicated handlers Output structure: - /index.html (homepage from _index.md) - /blog/index.html (post listing, sorted by date) - /blog/<slug>/index.html (individual posts) - /about/index.html, /collab/index.html (standalone pages) - /projects/index.html (project cards with external links)
This commit is contained in:
Timothy DeHerrera
184
src/main.rs
184
src/main.rs
@@ -7,7 +7,7 @@ mod error;
|
||||
mod render;
|
||||
mod templates;
|
||||
|
||||
use crate::content::Content;
|
||||
use crate::content::{Content, ContentKind};
|
||||
use crate::error::{Error, Result};
|
||||
use std::fs;
|
||||
use std::path::Path;
|
||||
@@ -27,40 +27,184 @@ fn run() -> Result<()> {
|
||||
return Err(Error::ContentDirNotFound(content_dir.to_path_buf()));
|
||||
}
|
||||
|
||||
// For MVP: process all markdown files in content/blog/
|
||||
// 1. Process blog posts
|
||||
let mut posts = process_blog_posts(content_dir, output_dir)?;
|
||||
|
||||
// 2. Generate blog index (sorted by date, newest first)
|
||||
posts.sort_by(|a, b| b.frontmatter.date.cmp(&a.frontmatter.date));
|
||||
generate_blog_index(output_dir, &posts)?;
|
||||
|
||||
// 3. Process standalone pages (about, collab)
|
||||
process_pages(content_dir, output_dir)?;
|
||||
|
||||
// 4. Process projects and generate project index
|
||||
let mut projects = process_projects(content_dir)?;
|
||||
projects.sort_by(|a, b| {
|
||||
a.frontmatter
|
||||
.weight
|
||||
.unwrap_or(99)
|
||||
.cmp(&b.frontmatter.weight.unwrap_or(99))
|
||||
});
|
||||
generate_projects_index(output_dir, &projects)?;
|
||||
|
||||
// 5. Generate homepage
|
||||
generate_homepage(content_dir, output_dir)?;
|
||||
|
||||
eprintln!("done!");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Process all blog posts in content/blog/
|
||||
fn process_blog_posts(content_dir: &Path, output_dir: &Path) -> Result<Vec<Content>> {
|
||||
let blog_dir = content_dir.join("blog");
|
||||
let mut posts = Vec::new();
|
||||
|
||||
for entry in walkdir::WalkDir::new(&blog_dir)
|
||||
.into_iter()
|
||||
.filter_map(|e| e.ok())
|
||||
.filter(|e| {
|
||||
e.path().extension().map_or(false, |ext| ext == "md")
|
||||
&& e.path().file_name().map_or(false, |n| n != "_index.md")
|
||||
e.path().extension().is_some_and(|ext| ext == "md")
|
||||
&& e.path().file_name().is_some_and(|n| n != "_index.md")
|
||||
})
|
||||
{
|
||||
let path = entry.path();
|
||||
eprintln!("processing: {}", path.display());
|
||||
|
||||
let content = Content::from_path(path)?;
|
||||
let content = Content::from_path(path, ContentKind::Post)?;
|
||||
let html_body = render::markdown_to_html(&content.body);
|
||||
let page = templates::render_post(&content.frontmatter, &html_body);
|
||||
|
||||
let out_path = output_dir.join(content.output_path(content_dir));
|
||||
let out_dir = out_path.parent().unwrap();
|
||||
|
||||
fs::create_dir_all(out_dir).map_err(|e| Error::CreateDir {
|
||||
path: out_dir.to_path_buf(),
|
||||
source: e,
|
||||
})?;
|
||||
|
||||
fs::write(&out_path, page.into_string()).map_err(|e| Error::WriteFile {
|
||||
path: out_path.clone(),
|
||||
source: e,
|
||||
})?;
|
||||
|
||||
eprintln!(" → {}", out_path.display());
|
||||
write_output(output_dir, content_dir, &content, page.into_string())?;
|
||||
posts.push(content);
|
||||
}
|
||||
|
||||
eprintln!("done!");
|
||||
Ok(posts)
|
||||
}
|
||||
|
||||
/// Generate the blog listing page
|
||||
fn generate_blog_index(output_dir: &Path, posts: &[Content]) -> Result<()> {
|
||||
let out_path = output_dir.join("blog/index.html");
|
||||
eprintln!("generating: {}", out_path.display());
|
||||
|
||||
let page = templates::render_blog_index("Blog", posts);
|
||||
|
||||
fs::create_dir_all(out_path.parent().unwrap()).map_err(|e| Error::CreateDir {
|
||||
path: out_path.parent().unwrap().to_path_buf(),
|
||||
source: e,
|
||||
})?;
|
||||
|
||||
fs::write(&out_path, page.into_string()).map_err(|e| Error::WriteFile {
|
||||
path: out_path.clone(),
|
||||
source: e,
|
||||
})?;
|
||||
|
||||
eprintln!(" → {}", out_path.display());
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Process standalone pages in content/ (about.md, collab.md)
|
||||
fn process_pages(content_dir: &Path, output_dir: &Path) -> Result<()> {
|
||||
for name in ["about.md", "collab.md"] {
|
||||
let path = content_dir.join(name);
|
||||
if path.exists() {
|
||||
eprintln!("processing: {}", path.display());
|
||||
|
||||
let content = Content::from_path(&path, ContentKind::Page)?;
|
||||
let html_body = render::markdown_to_html(&content.body);
|
||||
let page = templates::render_page(&content.frontmatter, &html_body);
|
||||
|
||||
write_output(output_dir, content_dir, &content, page.into_string())?;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Load all project cards (without writing individual pages)
|
||||
fn process_projects(content_dir: &Path) -> Result<Vec<Content>> {
|
||||
let projects_dir = content_dir.join("projects");
|
||||
let mut projects = Vec::new();
|
||||
|
||||
for entry in walkdir::WalkDir::new(&projects_dir)
|
||||
.into_iter()
|
||||
.filter_map(|e| e.ok())
|
||||
.filter(|e| {
|
||||
e.path().extension().is_some_and(|ext| ext == "md")
|
||||
&& e.path().file_name().is_some_and(|n| n != "_index.md")
|
||||
})
|
||||
{
|
||||
let content = Content::from_path(entry.path(), ContentKind::Project)?;
|
||||
projects.push(content);
|
||||
}
|
||||
|
||||
Ok(projects)
|
||||
}
|
||||
|
||||
/// Generate the projects listing page
|
||||
fn generate_projects_index(output_dir: &Path, projects: &[Content]) -> Result<()> {
|
||||
let out_path = output_dir.join("projects/index.html");
|
||||
eprintln!("generating: {}", out_path.display());
|
||||
|
||||
let page = templates::render_projects_index("Projects", projects);
|
||||
|
||||
fs::create_dir_all(out_path.parent().unwrap()).map_err(|e| Error::CreateDir {
|
||||
path: out_path.parent().unwrap().to_path_buf(),
|
||||
source: e,
|
||||
})?;
|
||||
|
||||
fs::write(&out_path, page.into_string()).map_err(|e| Error::WriteFile {
|
||||
path: out_path.clone(),
|
||||
source: e,
|
||||
})?;
|
||||
|
||||
eprintln!(" → {}", out_path.display());
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Generate the homepage from content/_index.md
|
||||
fn generate_homepage(content_dir: &Path, output_dir: &Path) -> Result<()> {
|
||||
let index_path = content_dir.join("_index.md");
|
||||
eprintln!("generating: homepage");
|
||||
|
||||
let content = Content::from_path(&index_path, ContentKind::Section)?;
|
||||
let html_body = render::markdown_to_html(&content.body);
|
||||
let page = templates::render_homepage(&content.frontmatter, &html_body);
|
||||
|
||||
let out_path = output_dir.join("index.html");
|
||||
|
||||
fs::create_dir_all(output_dir).map_err(|e| Error::CreateDir {
|
||||
path: output_dir.to_path_buf(),
|
||||
source: e,
|
||||
})?;
|
||||
|
||||
fs::write(&out_path, page.into_string()).map_err(|e| Error::WriteFile {
|
||||
path: out_path.clone(),
|
||||
source: e,
|
||||
})?;
|
||||
|
||||
eprintln!(" → {}", out_path.display());
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Write a content item to its output path
|
||||
fn write_output(
|
||||
output_dir: &Path,
|
||||
content_dir: &Path,
|
||||
content: &Content,
|
||||
html: String,
|
||||
) -> Result<()> {
|
||||
let out_path = output_dir.join(content.output_path(content_dir));
|
||||
let out_dir = out_path.parent().unwrap();
|
||||
|
||||
fs::create_dir_all(out_dir).map_err(|e| Error::CreateDir {
|
||||
path: out_dir.to_path_buf(),
|
||||
source: e,
|
||||
})?;
|
||||
|
||||
fs::write(&out_path, html).map_err(|e| Error::WriteFile {
|
||||
path: out_path.clone(),
|
||||
source: e,
|
||||
})?;
|
||||
|
||||
eprintln!(" → {}", out_path.display());
|
||||
Ok(())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user