From 4fb323f69c11557a51c7da0b2031029f63edf789 Mon Sep 17 00:00:00 2001 From: "Gabriel A. Giovanini" Date: Sat, 11 Jun 2022 00:00:27 +0200 Subject: feat: Handle 404 result Now gracefully handle 404, so instead of just panic now it will return a proper http 404 response. --- src/router.rs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/router.rs') diff --git a/src/router.rs b/src/router.rs index 35fdf3e..c196ab8 100644 --- a/src/router.rs +++ b/src/router.rs @@ -1,3 +1,6 @@ +use std::borrow::Borrow; + +use crate::assets::PostAsset; use regex::Regex; const ACTION_REGEX: &str = r"/{0,1}(?P\w*)/(?P.+)"; @@ -8,6 +11,10 @@ pub enum Router { Post { page: String }, } +pub fn blog_post_exists(name: &str) -> bool { + PostAsset::iter().any(|x| name.eq(&x.to_string())) +} + impl Router { pub fn new(path: &str) -> Router { let re = Regex::new(ACTION_REGEX).unwrap(); @@ -17,6 +24,13 @@ impl Router { None => "index", }; + + // this 7 means the "/posts/" from the full path + let trimmed_path: String = path.chars().skip(7).collect(); + if action.eq("posts") && !blog_post_exists(&trimmed_path) { + return Router::NotFound; + } + match action { "posts" => Router::Post { page: caps.unwrap()["id"].to_string(), -- cgit v1.2.3