fix 500 template title

Cargo.lock

@@ -1455,6 +1455,7 @@ name = "qchgk_web"
 version = "0.2.0"
 dependencies = [
  "chgk_ledb_lib",
+ "lazy_static",
  "mini-moka",
  "rand",
  "rocket",

Cargo.toml

@@ -15,6 +15,7 @@ rocket = { version = "=0.5.0-rc.3", features = ["json"] }
 rocket_dyn_templates = { version = "=0.1.0-rc.3", features = ["tera"] }
 chgk_ledb_lib = {git = "https://gitea.b4tman.ru/b4tman/chgk_ledb.git", rev="699478f85e", package="chgk_ledb_lib", features=["async"]}
 mini-moka = "0.10.0"
+lazy_static = "1.4.0"
 
 [profile.release]
 opt-level = 3

src/main.rs

@@ -2,8 +2,11 @@
 extern crate rocket;
 
 use rocket::fs::FileServer;
-use rocket::futures::FutureExt;
+use rocket::fs::Options;
+use rocket::http::ContentType;
+use rocket::request::Request;
 use rocket::response::Redirect;
+use rocket::response::{self, Responder, Response};
 use rocket::State;
 use rocket_dyn_templates::tera;
 use rocket_dyn_templates::Template;
@@ -11,6 +14,8 @@ use rocket_dyn_templates::Template;
 use rand::distributions::Uniform;
 use rand::Rng;
 
+use lazy_static::lazy_static;
+use std::collections::HashMap;
 use std::ops::Deref;
 use std::sync::Arc;
 
@@ -22,6 +27,10 @@ use std::time::Duration;
 
 const DB_FILENAME: &str = "db.dat";
 
+lazy_static! {
+    static ref EMPTY_MAP: HashMap<String, String> = HashMap::new();
+}
+
 trait ErrorEmpty {
     type Output;
     fn err_empty(self) -> Result<Self::Output, ()>;
@@ -34,11 +43,38 @@ impl<T, E> ErrorEmpty for Result<T, E> {
     }
 }
 
+#[derive(Debug, Responder)]
+enum WebError {
+    #[response(status = 404)]
+    NotFound(Template),
+    #[response(status = 500)]
+    ServerError(Template),
+}
+
+impl WebError {
+    fn not_found() -> Self {
+        WebError::NotFound(Template::render("404", EMPTY_MAP.deref()))
+    }
+    fn server_error() -> Self {
+        WebError::ServerError(Template::render("500", EMPTY_MAP.deref()))
+    }
+}
+
+/// wrapper for terra:Value (json, context), to cache values by ref
+/// implements Responder as json content type
 #[derive(Clone)]
 struct ArcTemplateData {
     value: Arc<tera::Value>,
 }
 
+impl Deref for ArcTemplateData {
+    type Target = tera::Value;
+
+    fn deref(&self) -> &Self::Target {
+        self.value.deref()
+    }
+}
+
 impl ArcTemplateData {
     fn new(value: tera::Value) -> ArcTemplateData {
         ArcTemplateData {
@@ -46,7 +82,15 @@ impl ArcTemplateData {
         }
     }
     fn render(&self, name: &'static str) -> Template {
-        Template::render(name, self.value.deref())
+        Template::render(name, self.deref())
+    }
+}
+
+impl<'r> Responder<'r, 'static> for ArcTemplateData {
+    fn respond_to(self, req: &'r Request<'_>) -> response::Result<'static> {
+        Response::build_from(self.to_string().respond_to(req)?)
+            .header(ContentType::JSON)
+            .ok()
     }
 }
 
@@ -81,53 +125,49 @@ async fn get_question(db: &DataBase, id: usize) -> Result<Question, ()> {
     db.get(id - 1).await.err_empty()
 }
 
+async fn get_question_data(
+    data: &AppState,
+    cache: &TemplateCache,
+    id: usize,
+) -> Option<ArcTemplateData> {
+    if let Some(value) = cache.get(&id) {
+        return Some(value);
+    }
+
+    match get_question(&data.db, id).await {
+        Ok(question) => {
+            let mut context = tera::to_value(question).expect("question serialize");
+            if context.is_object() {
+                let next_id = random_question_id(&data.database_distribution);
+                context["next"] = tera::to_value(next_id).expect("question id serialize");
+            }
+
+            let data = ArcTemplateData::new(context);
+            cache.insert(id, data.clone());
+            Some(data)
+        }
+        Err(_) => None,
+    }
+}
+
 async fn show_question_details(
     template_name: &'static str,
     data: &AppState,
     cache: &TemplateCache,
     id: usize,
-) -> Template {
+) -> Option<Template> {
-    let cache_cloned = cache.clone();
+    get_question_data(data, cache, id)
+        .await
+        .map(|data| data.render(template_name))
+}
 
-    let from_cache = rocket::tokio::spawn(async move { cache_cloned.get(&id) }).fuse();
+#[get("/q/<id>/json")]
-    let from_db = async move {
+async fn json_question(
-        match get_question(&data.db, id).await {
+    data: &State<AppState>,
-            Ok(question) => {
+    cache: &State<TemplateCache>,
-                let mut context = tera::to_value(question).expect("question serialize");
+    id: usize,
-                if context.is_object() {
+) -> Option<ArcTemplateData> {
-                    let next_id = random_question_id(&data.database_distribution);
+    get_question_data(data.inner(), cache.inner(), id).await
-                    context["next"] = tera::to_value(next_id).expect("question id serialize");
-                }
-
-                let value = ArcTemplateData::new(context);
-                let result = value.render(template_name);
-                cache.insert(id, value);
-
-                result
-            }
-            Err(_) => {
-                use std::collections::HashMap;
-                let context: HashMap<String, String> = HashMap::new();
-                Template::render("404", context)
-            }
-        }
-    }
-    .fuse();
-
-    loop {
-        rocket::tokio::select! {
-            biased;
-
-            Ok(Some(template)) = from_cache => {
-                println!("from cache");
-                break template.render(template_name)
-            },
-            template = from_db => {
-                println!("from db");
-                break template
-            }
-        }
-    }
 }
 
 #[get("/q/<id>")]
@@ -135,12 +175,16 @@ async fn show_question(
     data: &State<AppState>,
     cache: &State<TemplateCache>,
     id: usize,
-) -> Template {
+) -> Option<Template> {
     show_question_details("question", data.inner(), cache.inner(), id).await
 }
 
 #[get("/q/<id>/a")]
-async fn show_answer(data: &State<AppState>, cache: &State<TemplateCache>, id: usize) -> Template {
+async fn show_answer(
+    data: &State<AppState>,
+    cache: &State<TemplateCache>,
+    id: usize,
+) -> Option<Template> {
     show_question_details("answer", data.inner(), cache.inner(), id).await
 }
 
@@ -154,6 +198,12 @@ fn answer0() -> Redirect {
     Redirect::to("/")
 }
 
+#[get("/q/0/json")]
+fn json0(data: &State<AppState>) -> Redirect {
+    let id = random_question_id(&data.database_distribution);
+    Redirect::temporary(format!("/q/{}/json", id))
+}
+
 #[get("/")]
 fn index(data: &State<AppState>) -> Redirect {
     let id = random_question_id(&data.database_distribution);
@@ -161,10 +211,13 @@ fn index(data: &State<AppState>) -> Redirect {
 }
 
 #[catch(404)]
-fn not_found(_req: &rocket::Request) -> Template {
+fn not_found(_req: &rocket::Request) -> WebError {
-    use std::collections::HashMap;
+    WebError::not_found()
-    let context: HashMap<String, String> = HashMap::new();
+}
-    Template::render("404", context)
+
+#[catch(500)]
+fn server_error(_req: &rocket::Request) -> WebError {
+    WebError::server_error()
 }
 
 #[launch]
@@ -181,12 +234,20 @@ async fn rocket() -> _ {
     rocket::build()
         .manage(state)
         .manage(cache)
-        .register("/", catchers![not_found])
+        .register("/", catchers![not_found, server_error])
         .mount(
             "/",
-            routes![index, show_question, show_answer, question0, answer0],
+            routes![
+                index,
+                json_question,
+                show_question,
+                show_answer,
+                question0,
+                answer0,
+                json0
+            ],
         )
         .mount("/q", routes![index])
-        .mount("/q/static", FileServer::from("static/"))
+        .mount("/q/static", FileServer::new("static/", Options::None))
         .attach(Template::fairing())
 }

templates/404.html.tera

@@ -1,5 +1,13 @@
 {% extends "base" %}
 {% block title %}404{% endblock title %}
+{% block nav %} 
+{% endblock nav %}
 {% block content %}
-  <h1>404 - Could not find that page</h1>
+  <div class="content-block">
+    <div class="content-block-inner mt-4 px-4 py-2 fs-1 top-50 start-50 translate-middle">
+  <h1 class="display-4 d-flex justify-content-center text-center fw-bold">404</h1>
+  <br/>
+  <p>Нет такой страницы &#128532;</p>
+  </div>
+  </div>
 {% endblock content %}

templates/500.html.tera

@@ -0,0 +1,13 @@
+{% extends "base" %}
+{% block title %}500{% endblock title %}
+{% block nav %} 
+{% endblock nav %}
+{% block content %}
+  <div class="content-block">
+    <div class="content-block-inner mt-4 px-4 py-2 fs-1 top-50 start-50 translate-middle">
+  <h1 class="display-4 d-flex justify-content-center text-center fw-bold">500</h1>
+  <br/>
+  <p>&#128558; Ой, кажется у нас тут что то сломалось...</p>
+  </div>
+  </div>
+{% endblock content %}

templates/answer.html.tera

@@ -42,7 +42,7 @@
             <p><span>Тема: </span> {{ theme }}</p>
             {% endif %}
             {% if rating | length %}
-            <p><span>Рейтинг: </span> {{ author }}</p>
+            <p><span>Рейтинг: </span> {{ rating }}</p>
             {% endif %}
             {% if batch_info.description | length %}
             <p><span>Чемпионат: </span> {{ batch_info.description }}</p>
@@ -53,6 +53,8 @@
             {% if id | length %}
             <p><span>Номер: </span> {{ id }}</p>
             {% endif %}
+            <br/>
+            <p class="text-muted"> Показать как <a href="/q/{{ num }}/json">json</a></p>
         </div></details>
     </div>
     <br />