From 79d66cfc4a9b90bdce89557b76536d554b24aca8 Mon Sep 17 00:00:00 2001
From: lafleur <lafleur@boum.org>
Date: Tue, 10 Nov 2020 03:41:39 +0100
Subject: [PATCH] user guard with file user definition

---
 src/main.rs               | 60 +++++++++++++++++++++++++++++++++------
 templates/index.html.tera |  8 ++++--
 templates/user.html.tera  |  8 ++++++
 users/cat.md              |  3 ++
 users/sunny.md            |  1 +
 5 files changed, 70 insertions(+), 10 deletions(-)
 create mode 100644 templates/user.html.tera
 create mode 100644 users/cat.md
 create mode 100644 users/sunny.md

diff --git a/src/main.rs b/src/main.rs
index 999a20d..20fdb14 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,19 +2,53 @@
 
 #[macro_use] extern crate rocket;
 
-use rocket::Request;
+//use std::fmt::Display;
+use std::fs;
+//use rocket::Request;
 use rocket_contrib::templates::Template;
+//use rocket::request::{Outcome, Request, FromRequest, FromParam};
+use rocket::request::{Request, FromParam};
+//use rocket::http::Status;
+use rocket::http::RawStr;
+
+#[derive(serde::Serialize, Debug)]
+struct User {
+    name: String,
+    content: String,
+}
+
+impl<'r> FromParam<'r> for User {
+    type Error = &'r RawStr;
+
+    fn from_param(param: &'r RawStr) -> std::result::Result<Self, Self::Error> {
+        let filename = format!("users/{}.md", param);
+        let content = fs::read_to_string(&filename);
+        match content {
+            Ok(value) => Ok(User{ name: param.to_string(), content: value }),
+            Err(_) => Err(param),
+        }
+    }
+}
+
+fn list_users() -> std::io::Result<Vec<String>> {
+    let mut users: Vec<String> = vec!();
+    for path in fs::read_dir("users")? {
+        let file = path?;
+        let user = format!("{:?}", file.file_name()).replace("\"", "").replace(".md", "");
+        users.push(user);
+    }
+    Ok(users)
+}
 
 #[derive(serde::Serialize)]
 struct IndexContext {
     name: &'static str,
-    items: Vec<&'static str>
+    items: Vec<String>
 }
 
 #[catch(404)]
 fn not_found(req: &Request<'_>) -> Template {
-    println!("{:#?}", req);
-    let dbg = format!("{:?}", req);
+    let dbg = format!("{:#?}", req);
     let mut map = std::collections::HashMap::new();
     map.insert("title", "Page not found");
     map.insert("path", req.uri().path());
@@ -22,16 +56,26 @@ fn not_found(req: &Request<'_>) -> Template {
     Template::render("error/404", &map)
 }
 
+#[get("/<user>")]
+fn show(user: User) -> Template {
+    //format!("{:#?}", user)
+    Template::render("user", &user)
+}
+
 #[get("/")]
-fn index() -> Template {
-    let context = IndexContext { name: "home", items: vec!["One", "Two", "Three"] };
-    Template::render("index", &context)
+fn index() -> std::io::Result<Template> {
+    let users = list_users()?;
+    let context = IndexContext { name: "home", items: users };
+    Ok(Template::render("index", &context))
 }
 
 fn main() {
+    //let user_map = get_user_map();
+    //println!("{:#?}", user_map);
+
     rocket::ignite()
         .attach(Template::fairing())
-        .mount("/", routes![index])
+        .mount("/", routes![index, show])
         .register(catchers![not_found])
         .launch();
 }
diff --git a/templates/index.html.tera b/templates/index.html.tera
index b389f50..843051e 100644
--- a/templates/index.html.tera
+++ b/templates/index.html.tera
@@ -2,10 +2,14 @@
 
 {% block content %}
     <h1>Here is {{name}}</h1>
-    <h3>Here are your items:</h3>
+    <h3>Here are the registered users :</h3>
     <ul>
         {% for s in items %}
-            <li>{{ s }}</li>
+            <li>
+                <a href="/{{ s }}">
+                    {{ s }}
+                </a>
+            </li>
         {% endfor %}
     </ul>
 
diff --git a/templates/user.html.tera b/templates/user.html.tera
new file mode 100644
index 0000000..2529c10
--- /dev/null
+++ b/templates/user.html.tera
@@ -0,0 +1,8 @@
+{% extends "base" %}
+
+{% block content %}
+    <h1>{{ name }}</h1>
+    <p>
+        {{ content }}
+    </p>
+{% endblock content %}
diff --git a/users/cat.md b/users/cat.md
new file mode 100644
index 0000000..9e9f070
--- /dev/null
+++ b/users/cat.md
@@ -0,0 +1,3 @@
+# Cat
+
+Hi, I'm Cat, that's my preferred username.
diff --git a/users/sunny.md b/users/sunny.md
new file mode 100644
index 0000000..5762fb0
--- /dev/null
+++ b/users/sunny.md
@@ -0,0 +1 @@
+This is Sunny's landing page.