From 3d7cd8a7addd86b7a97a50821eb348345e0d427a Mon Sep 17 00:00:00 2001
From: Cara Salter <cara@devcara.com>
Date: Wed, 22 Dec 2021 01:06:39 -0500
Subject: Work for the day

Post parsing, index page, navbar, CSS, blog listings

There's something weird with the path matching that's making it miss the
post view page in favor of the list view page.
---
 src/blog/mod.rs  | 25 ++++++++++++++++++++++---
 src/blog/post.rs | 18 ++++++++++++++++--
 2 files changed, 38 insertions(+), 5 deletions(-)

(limited to 'src/blog')

diff --git a/src/blog/mod.rs b/src/blog/mod.rs
index 3640bcd..c227f22 100644
--- a/src/blog/mod.rs
+++ b/src/blog/mod.rs
@@ -2,6 +2,7 @@ pub mod post;
 pub mod handlers {
 
 use std::sync::Arc;
+use color_eyre::eyre::eyre;
 
 use warp::{Reply, Rejection};
 use warp::http::Response;
@@ -9,13 +10,31 @@ use crate::templates::{self, Html, RenderRucte};
 
 use crate::internal::SiteState;
 
+use super::post::Post;
+
     pub async fn list(state: Arc<SiteState>) -> Result<impl Reply, Rejection> {
         let state = state.clone();
         Response::builder()
-            .html(|o| templates::index_html(o))
+            .html(|o| templates::bloglist_html(o, state.blog.clone()))
     }
 
-    pub async fn post(name: String) -> Result<impl Reply, Rejection> {
-        Ok("Post test")
+    pub async fn post(name: String, state: Arc<SiteState>) -> Result<impl Reply, Rejection> {
+        let mut want: Option<Post> = None;
+
+        for post in &state.blog {
+            if post.link == format!("blog/{}", name) {
+                want = Some(post.clone());
+                break;
+            }
+        }
+
+        match want {
+            Some(post) => {
+                let body = Html(post.body_html.clone());
+                Response::builder()
+                    .html(|o| templates::post_html(o, post, body))
+            },
+            None => panic!("No post found"),
+        }
     }
 }
diff --git a/src/blog/post.rs b/src/blog/post.rs
index abe57aa..3c27690 100644
--- a/src/blog/post.rs
+++ b/src/blog/post.rs
@@ -1,7 +1,7 @@
 use std::{cmp::Ordering, path::PathBuf};
 use glob::glob;
 use color_eyre::eyre::{Result, Context, eyre};
-use tokio::fs;
+use tokio::{fs};
 
 use chrono::prelude::*;
 
@@ -11,6 +11,7 @@ pub struct Post {
     pub front_matter: frontmatter::Data,
     pub body_html: String,
     pub date: DateTime<FixedOffset>,
+    pub link: String,
 }
 
 impl Ord for Post {
@@ -46,6 +47,7 @@ async fn read_post(dir: &str, fname: PathBuf) -> Result<Post> {
     Ok(Post {
         front_matter,
         body_html,
+        link,
         date
     } )
 }
@@ -55,7 +57,19 @@ pub async fn load(dir: &str) -> Result<Vec<Post>> {
         .filter_map(Result::ok)
         .map(|fname| read_post(dir, fname));
 
-    Ok(Vec::new())
+    let mut result: Vec<Post> = futures::future::join_all(futs)
+        .await
+        .into_iter()
+        .map(Result::unwrap)
+        .collect();
+
+    if result.len() == 0 {
+        Err(eyre!("No posts found"))
+    } else {
+        result.sort();
+        result.reverse();
+        Ok(result)
+    } 
 }
 
 mod frontmatter {
-- 
cgit v1.2.3