use chgk_ledb_lib

Cargo.toml

@@ -1,22 +1,21 @@
 [package]
 name = "qchgk_web"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Dmitry <b4tm4n@mail.ru>"]
-edition = "2018"
+edition = "2021"
+license = "MIT"
+readme = "README.md"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 
 [dependencies]
-rand="0.7"
+rand="0.8"
 serde="1.0"
-serde_derive="1.0"
 serde_json="1.0"
-ledb="0.2"
+ledb = {git = "https://github.com/b4tman/ledb.git", rev="a646b90e", package="ledb"}
-ledb-derive="0.2"
-ledb-types="0.2"
-tera = "0.11"
 rocket="0.4"
+chgk_ledb_lib = {git = "https://gitea.b4tman.ru/b4tman/chgk_ledb.git", rev="e521e39f5e", package="chgk_ledb_lib"}
 
 # lmdb-zero="0.4"
 
@@ -29,3 +28,4 @@ features = ["serve", "tera_templates"]
 opt-level = 3
 debug = false
 lto = true
+strip = true

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Dmitry Belyaev
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -0,0 +1,10 @@
+# qchgk_web
+
+Простой веб интерфейс к базе вопросов ЧГК
+
+## Ссылки
+
+- Источник вопросов: http://db.chgk.info
+- Копия файлов базы вопросов: https://gitlab.com/b4tman/db_chgk
+- Конвертор в JSON: https://gitea.b4tman.ru/b4tman/chgk_txt2json
+- Загрузчик в формат базы для этой штуки: https://gitea.b4tman.ru/b4tman/chgk_ledb

src/main.rs

@@ -1,18 +1,8 @@
 #![feature(proc_macro_hygiene, decl_macro)]
 
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
 extern crate ledb;
+extern crate serde;
 extern crate serde_json;
-#[macro_use]
-extern crate ledb_derive;
-extern crate ledb_types;
-
-//#[macro_use]
-//extern crate tera;
-
-//use tera::Context;
 
 #[macro_use]
 extern crate rocket;
@@ -28,77 +18,18 @@ use rand::Rng;
 
 use ledb::{Options, Storage};
 
-#[derive(Debug, Default, Clone, Serialize, Deserialize, Document)]
+use chgk_ledb_lib::questions::Question;
-struct BatchInfo {
+
-    #[document(primary)]
+trait ErrorEmpty {
-    #[serde(default)]
+    type Output;
-    filename: String,
+    fn err_empty(self) -> Result<Self::Output, ()>;
-    #[serde(default)]
-    description: String,
-    #[serde(default)]
-    author: String,
-    #[serde(default)]
-    comment: String,
-    #[serde(default)]
-    url: String,
-    #[serde(default)]
-    date: String,
-    #[serde(default)]
-    processed_by: String,
-    #[serde(default)]
-    redacted_by: String,
-    #[serde(default)]
-    copyright: String,
-    #[serde(default)]
-    theme: String,
-    #[serde(default)]
-    kind: String,
-    #[serde(default)]
-    source: String,
-    #[serde(default)]
-    rating: String,
 }
 
-#[derive(Debug, Default, Clone, Serialize, Deserialize, Document)]
+impl<T, E> ErrorEmpty for Result<T, E> {
-struct Question {
+    type Output = T;
-    #[document(primary)]
+    fn err_empty(self) -> Result<Self::Output, ()> {
-    #[serde(default)]
+        self.map_err(|_| ())
-    num: u32,
+    }
-    #[document(index)]
-    id: String,
-
-    description: String,
-    answer: String,
-
-    #[serde(default)]
-    author: String,
-    #[serde(default)]
-    comment: String,
-    #[serde(default)]
-    comment1: String,
-    #[serde(default)]
-    tour: String,
-    #[serde(default)]
-    url: String,
-    #[serde(default)]
-    date: String,
-    #[serde(default)]
-    processed_by: String,
-    #[serde(default)]
-    redacted_by: String,
-    #[serde(default)]
-    copyright: String,
-    #[serde(default)]
-    theme: String,
-    #[serde(default)]
-    kind: String,
-    #[serde(default)]
-    source: String,
-    #[serde(default)]
-    rating: String,
-    #[document(nested)]
-    #[serde(default)]
-    batch_info: BatchInfo,
 }
 
 struct AppState {
@@ -120,66 +51,53 @@ fn random_question_id(database_distribution: &Uniform<u32>) -> u32 {
     rng.sample(database_distribution)
 }
 
-fn get_question(storage: &Storage, id: u32) -> Result<Option<Question>, ()> {
+fn get_question(storage: &Storage, id: u32) -> Result<Question, ()> {
-    if 0 == id {
+    storage
-        return Ok(None);
-    }
-
-    let collection = storage
         .collection("questions")
-        .expect("collection \"questions\"");
+        .err_empty()?
-    let last_id = collection.last_id().expect("\"questions\" last_id");
+        .get::<Question>(id)
-
+        .err_empty()?
-    if id > last_id {
+        .ok_or(())
-        Err(())
-    } else {
-        let question = collection.get::<Question>(id);
-        if question.is_err() {
-            Err(())
-        } else {
-            Ok(question.unwrap())
-        }
-    }
 }
 
-fn show_question_details(
+fn show_question_details(template_name: &'static str, data: &AppState, id: u32) -> Template {
-    template_name: &'static str,
+    match get_question(&data.storage, id) {
-    data: &AppState,
+        Ok(question) => {
-    id: u32,
-) -> Result<Template, Redirect> {
-    let question = get_question(&data.storage, id);
-
-    if question.is_ok() {
-        let question = question.unwrap();
-
-        if question.is_some() {
-            let question = question.unwrap();
             let mut context = serde_json::to_value(question).expect("question serialize");
             if context.is_object() {
                 let next_id = random_question_id(&data.database_distribution);
                 context["next"] = serde_json::to_value(next_id).expect("question id serialize");
             }
-            Ok(Template::render(template_name, &context))
+            Template::render(template_name, &context)
-        } else {
+        }
-            Err(Redirect::permanent("/q/"))
+        Err(_) => {
+            use std::collections::HashMap;
+            let context: HashMap<String, String> = HashMap::new();
+            Template::render("404", &context)
         }
-    } else {
-        use std::collections::HashMap;
-        let context: HashMap<String, String> = HashMap::new();
-        Ok(Template::render("404", &context))
     }
 }
 
 #[get("/q/<id>")]
-fn show_question(data: State<AppState>, id: u32) -> Result<Template, Redirect> {
+fn show_question(data: State<AppState>, id: u32) -> Template {
     show_question_details("question", data.inner(), id)
 }
 
 #[get("/q/<id>/a")]
-fn show_answer(data: State<AppState>, id: u32) -> Result<Template, Redirect> {
+fn show_answer(data: State<AppState>, id: u32) -> Template {
     show_question_details("answer", data.inner(), id)
 }
 
+#[get("/q/0")]
+fn question0() -> Redirect {
+    Redirect::to("/")
+}
+
+#[get("/q/0/a")]
+fn answer0() -> Redirect {
+    Redirect::to("/")
+}
+
 #[get("/")]
 fn index(data: State<AppState>) -> Redirect {
     let id = random_question_id(&data.database_distribution);
@@ -211,7 +129,10 @@ fn rocket() -> Rocket {
     rocket::ignite()
         .manage(state)
         .register(catchers![not_found])
-        .mount("/", routes![index, show_question, show_answer])
+        .mount(
+            "/",
+            routes![index, show_question, show_answer, question0, answer0],
+        )
         .mount("/q", routes![index])
         .mount("/q/static", StaticFiles::from("static/"))
         .attach(Template::fairing())

static/style.css

@@ -11,7 +11,6 @@ body {
 }
 
 .footer {
-    widows: 100%;
     text-align: center;
     z-index: -1;
 }
@@ -22,4 +21,18 @@ details {
 
 #details {
     text-align: justify;
+}
+
+.nav-link {
+    margin-top: 0px;
+    margin-bottom: 0px;
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
+
+.navbar {
+    margin-top: 0px;
+    margin-bottom: 0px;
+    padding-top: 0px;
+    padding-bottom: 0px;
 }

templates/answer.html.tera

@@ -6,20 +6,17 @@
 <!-- <h1>{{ id }}</h1> -->
 <div class="content-block">
     <div id="question" class="content-block-inner">
-        <p><font color="#544669">
+        <p>
-            <h4> {{ description }} </h4>
+            <h4 class="text-muted"> {{ description }} </h4>
-        </font>
         </p>
     </div>
 </div><br />
 <div class="content-block">
     <div id="answer" class="content-block-inner">
-        <hr/>
+        <div class="mt-2 px-2 py-1 shadow rounded">        
-        <p>
+            <!-- <h2> Ответ: </h2>  -->
-            <!-- <h2> Ответ: </h2> -->
+            <h1 class="display-4 d-flex justify-content-center text-center">{{ answer }}</h1>
-            <h1 class="d-flex justify-content-center text-center">{{ answer }}</h1>
+        </div><br><br/><details>
-        </p>
-        <hr/><br><br/><details>
         <div id="details">
             {% if comment | length or comment1 | length %}
             <p><span>Комментарии:</span>

templates/base.html.tera

@@ -2,26 +2,25 @@
 <html>
 <head>
   <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <link rel="stylesheet" type="text/css" href="/q/static/bootstrap.min.css">
   <link rel="stylesheet" type="text/css" href="/q/static/style.css" />
   <title>{% block title %}{% endblock title %}</title>
 </head>
 <body>
-    <header>
+    <header class="shadow-sm rounded-bottom">
     <nav class="navbar navbar-expand-sm container sticky-top navbar-light justify-content-center">
     <ul class="nav navbar-nav">
     {% include "nav" %}
     {% block nav %}{% endblock nav %}
     </ul>
-    </nav><hr/>
+    </nav>
     </header>
-    <article>
+    <article class="mb-5 pb-5">
     <div id="content" class="container">{% block content %}{% endblock content %}</div>
     </article>
-<footer class="footer fixed-bottom">
+<footer class="footer fixed-bottom shadow-lg rounded-top">
-<hr/>
+<p class="my-0 py-0 text-secondary">Источник: <a class="text-secondary" href="https://db.chgk.info/">db.chgk.info</a></p>
-<p class="text-secondary">Источник: <a class="text-secondary" href="https://db.chgk.info/">db.chgk.info</a></p>
 </footer>
 <!-- Yandex.Metrika counter --> <script type="text/javascript" > (function (d, w, c) { (w[c] = w[c] || []).push(function() { try { w.yaCounter48214757 = new Ya.Metrika2({ id:48214757, clickmap:true, trackLinks:true, accurateTrackBounce:true, trackHash:true, ut:"noindex" }); } catch(e) { } }); var n = d.getElementsByTagName("script")[0], s = d.createElement("script"), f = function () { n.parentNode.insertBefore(s, n); }; s.type = "text/javascript"; s.async = true; s.src = "https://mc.yandex.ru/metrika/tag.js"; if (w.opera == "[object Opera]") { d.addEventListener("DOMContentLoaded", f, false); } else { f(); } })(document, window, "yandex_metrika_callbacks2"); </script> <noscript><div><img src="https://mc.yandex.ru/watch/48214757?ut=noindex" style="position:absolute; left:-9999px;" alt="" /></div></noscript> <!-- /Yandex.Metrika counter -->
 </body>

templates/question.html.tera

@@ -11,9 +11,8 @@
 </div></div>
 <br/>
 <br/>
-<br/><details>
+<br/>
-    <summary>Ответ</summary><br/>
+<div class="justify-content-center text-center">
-    <a class="btn btn-dark" href="/q/{{ num }}/a/">Показать ответ</a>
+<a class="btn btn-dark shadow" href="/q/{{ num }}/a/">Показать ответ</a>
-</details>
+</div>
-
 {% endblock content %}