upd ledb to 0.4

(cherry picked from commit aec2e87472)

Cargo.toml

@@ -6,19 +6,23 @@ edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+
 [dependencies]
-actix-files="0.1"
-actix-web = "1.0"
+rand="0.7"
 serde="1.0"
 serde_derive="1.0"
 serde_json="1.0"
-ledb="0.2"
-ledb-derive="0.2"
-ledb-types="0.2"
-lmdb-zero="0.4"
-rand="0.7"
-env_logger = "0.6"
-tera = "0.11"
+ledb="0.4"
+ledb-derive="0.4"
+ledb-types="0.4"
+rocket="0.4"
+
+# lmdb-zero="0.4"
+
+[dependencies.rocket_contrib]
+version = "0.4"
+default-features = false
+features = ["serve", "tera_templates"]
 
 [profile.release]
 opt-level = 3

src/main.rs

@@ -1,30 +1,31 @@
-extern crate actix_files;
-extern crate actix_web;
+#![feature(proc_macro_hygiene, decl_macro)]
+
 extern crate serde;
 #[macro_use]
 extern crate serde_derive;
-#[macro_use]
-extern crate serde_json;
 extern crate ledb;
+extern crate serde_json;
 #[macro_use]
 extern crate ledb_derive;
-extern crate env_logger;
 extern crate ledb_types;
+
+//#[macro_use]
+//extern crate tera;
+
+//use tera::Context;
+
 #[macro_use]
-extern crate tera;
+extern crate rocket;
+extern crate rocket_contrib;
 
-use tera::Context;
-
-
-use actix_web::{
-    guard, http::header, middleware::Logger, web,
-    App, Error, HttpRequest, HttpResponse, HttpServer, Result,
-};
+use rocket::response::Redirect;
+use rocket::{Rocket, State};
+use rocket_contrib::serve::StaticFiles;
+use rocket_contrib::templates::Template;
 
 use rand::distributions::Uniform;
 use rand::Rng;
 
-
 use ledb::{Options, Storage};
 
 #[derive(Debug, Default, Clone, Serialize, Deserialize, Document)]
@@ -102,7 +103,6 @@ struct Question {
 
 struct AppState {
     storage: Storage,
-    template: tera::Tera,
     database_distribution: Uniform<u32>,
 }
 
@@ -120,29 +120,33 @@ fn random_question_id(database_distribution: &Uniform<u32>) -> u32 {
     rng.sample(database_distribution)
 }
 
-fn get_question(storage: &Storage, id: u32) -> Result<Option<Question>, Error> {
+fn get_question(storage: &Storage, id: u32) -> Result<Option<Question>, ()> {
     if 0 == id {
         return Ok(None);
     }
 
-    let collection = storage.collection("questions").expect("collection questions");
-    let last_id = collection.last_id().expect("questions last id");
+    let collection = storage
+        .collection("questions")
+        .expect("collection \"questions\"");
+    let last_id = collection.last_id().expect("\"questions\" last_id");
 
     if id > last_id {
-        Err(Error::from(()))
+        Err(())
     } else {
         let question = collection.get::<Question>(id);
         if question.is_err() {
-            Err(Error::from(()))
+            Err(())
         } else {
             Ok(question.unwrap())
         }
     }
 }
 
-fn show_question_details(template_file: &str, data: web::Data<AppState>, id: web::Path<u32>) -> Result<HttpResponse, Error> {
-    let id = id.into_inner();
-
+fn show_question_details(
+    template_name: &'static str,
+    data: &AppState,
+    id: u32,
+) -> Result<Template, Redirect> {
     let question = get_question(&data.storage, id);
 
     if question.is_ok() {
@@ -155,87 +159,64 @@ fn show_question_details(template_file: &str, data: web::Data<AppState>, id: web
                 let next_id = random_question_id(&data.database_distribution);
                 context["next"] = serde_json::to_value(next_id).expect("question id serialize");
             }
-            let body = data.template.render(template_file, &context).expect("template render - show_question_details");
-            Ok(HttpResponse::Ok().content_type("text/html").body(body))
+            Ok(Template::render(template_name, &context))
         } else {
-            Ok(HttpResponse::PermanentRedirect()
-                .header(header::LOCATION, "/q/")
-                .finish())
+            Err(Redirect::permanent("/q/"))
         }
     } else {
-        let context = Context::new();
-        Ok(HttpResponse::with_body(
-            actix_web::http::StatusCode::NOT_FOUND,
-            actix_web::dev::Body::from(data.template.render("404.html", &context).unwrap()),
-        ))
+        use std::collections::HashMap;
+        let context: HashMap<String, String> = HashMap::new();
+        Ok(Template::render("404", &context))
     }
 }
 
-fn show_question(data: web::Data<AppState>, id: web::Path<u32>) -> Result<HttpResponse, Error> {
-    show_question_details("question.html", data, id)
+#[get("/q/<id>")]
+fn show_question(data: State<AppState>, id: u32) -> Result<Template, Redirect> {
+    show_question_details("question", data.inner(), id)
 }
 
-fn show_answer(data: web::Data<AppState>, id: web::Path<u32>) -> Result<HttpResponse, Error> {
-    show_question_details("answer.html", data, id)
+#[get("/q/<id>/a")]
+fn show_answer(data: State<AppState>, id: u32) -> Result<Template, Redirect> {
+    show_question_details("answer", data.inner(), id)
 }
 
-fn index(data: web::Data<AppState>, _req: HttpRequest) -> Result<HttpResponse, Error> {
+#[get("/")]
+fn index(data: State<AppState>) -> Redirect {
     let id = random_question_id(&data.database_distribution);
+    Redirect::temporary(format!("/q/{}", id))
+}
 
-    let url = format!("/q/{}", id);
+#[catch(404)]
+fn not_found(_req: &rocket::Request) -> Template {
+    use std::collections::HashMap;
+    let context: HashMap<String, String> = HashMap::new();
+    Template::render("404", &context)
+}
 
-    Ok(HttpResponse::TemporaryRedirect()
-        .header(header::LOCATION, url.as_str())
-        .finish())
+fn rocket() -> Rocket {
+    let options: Options = serde_json::from_value(serde_json::json!({
+    "read_only": true,
+    "no_lock": true,
+    }))
+    .unwrap();
+
+    let mut state = AppState {
+        storage: Storage::new("db", options).expect("open db"),
+        database_distribution: Uniform::new(1, 3),
+    };
+    state.database_distribution = get_database_distribution(&state.storage);
+
+    let state = state;
+
+    rocket::ignite()
+        .manage(state)
+        .register(catchers![not_found])
+        .mount("/", routes![index, show_question, show_answer])
+        .mount("/q", routes![index])
+        .mount("/q/static", StaticFiles::from("static/"))
+        .attach(Template::fairing())
 }
 
 fn main() {
-    std::env::set_var("RUST_LOG", "actix_web=info");
-    env_logger::init();
-
-    let options: Options = serde_json::from_value(json!({
-        "read_only": true,
-        "no_lock": true,
-    }))
-    .expect("options json parse");
-
-    let storage = Storage::new("db", options).expect("db open");
-
-    HttpServer::new(move || {
-        let mut data = AppState {
-            storage: storage.clone(),
-            template: compile_templates!("./templates/**/*"),
-            database_distribution: Uniform::new(1, 3),
-        };
-        data.database_distribution = get_database_distribution(&data.storage);
-        let data = data;
-
-        App::new()
-            .wrap(Logger::default())
-            .data(data)
-            .service(actix_files::Files::new("/static", "./static"))
-            .route("/q", web::to(index))
-            .service(
-                web::scope("/q")
-                    .service(actix_files::Files::new("/static", "./static"))
-                    .service(
-                        web::resource("/{id}")
-                            .name("question") 
-                            .guard(guard::Get())
-                            .to(show_question),
-                    )
-                    .service(
-                        web::resource("/{id}/a/")
-                            .name("answer") 
-                            .guard(guard::Get())
-                            .to(show_answer),
-                    )
-                    .route("/", web::to(index))
-            )
-            .route("/", web::to(index))
-    })
-    .bind("0.0.0.0:8088")
-    .expect("HttpServer::bind to 8088")
-    .run()
-    .expect("HttpServer::run");
+    rocket().launch();
 }

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/404.html.tera

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base" %}
 {% block title %}404{% endblock title %}
 {% block content %}
   <h1>404 - Could not find that page</h1>

templates/answer.html

@@ -1,48 +0,0 @@
-{% extends "base.html" %} {% block title %} Ответ {% endblock title %} {% block nav %}
-<li class="nav-item"><a class="nav-link text-primary" href="/q/{{ next }}">Ещё</a></li>
-{% endblock nav %} {% block content %}
-<!-- <h1>{{ id }}</h1> -->
-<div class="content-block">
-    <div id="question" class="content-block-inner">
-        <p>
-            <font color="#544669">
-                <h4> {{ description }} </h4>
-            </font>
-        </p>
-    </div>
-</div><br />
-<div class="content-block">
-    <div id="answer" class="content-block-inner">
-        <hr/>
-        <p>
-            <!-- <h2> Ответ: </h2> -->
-            <h1 class="d-flex justify-content-center text-center">{{ answer }}</h1>
-        </p>
-        <hr/><br><br/>
-        <details>
-            <div id="details">
-                {% if comment | length or comment1 | length %}
-                <p><span>Комментарии:</span> {% if comment | length %} {{ comment }} {% endif %} {% if comment1 | length %}
-                    <br/> {{ comment1 }} {% endif %}
-                </p>
-                {% endif %} {% if author | length %}
-                <p><span>Автор: </span> {{ author }}</p>
-                {% endif %} {% if copyright | length %}
-                <p><span>Копирайт: </span> {{ copyright }}</p>
-                {% endif %} {% if source | length %}
-                <p><span>Источник: </span> {{ source }}</p>
-                {% endif %} {% if theme | length %}
-                <p><span>Тема: </span> {{ theme }}</p>
-                {% endif %} {% if rating | length %}
-                <p><span>Рейтинг: </span> {{ author }}</p>
-                {% endif %} {% if batch_info.description | length %}
-                <p><span>Чемпионат: </span> {{ batch_info.description }}</p>
-                {% endif %} {% if tour | length %}
-                <p><span>Тур: </span> {{ tour }}</p>
-                {% endif %} {% if id | length %}
-                <p><span>Номер: </span> {{ id }}</p>
-                {% endif %}
-            </div>
-        </details>
-    </div>
-    <br /> {% endblock content %}

templates/answer.html.tera

@@ -0,0 +1,59 @@
+{% extends "base" %} {% block title %} Ответ {% endblock title %}
+{% block nav %} 
+<li class="nav-item"><a class="nav-link text-primary" href="/q/{{ next }}">Ещё</a></li>
+{% endblock nav %}
+{% block content %}
+<!-- <h1>{{ id }}</h1> -->
+<div class="content-block">
+    <div id="question" class="content-block-inner">
+        <p>
+            <h4 class="text-muted"> {{ description }} </h4>
+        </p>
+    </div>
+</div><br />
+<div class="content-block">
+    <div id="answer" class="content-block-inner">
+        <div class="mt-2 px-2 py-1 shadow rounded">        
+            <!-- <h2> Ответ: </h2>  -->
+            <h1 class="display-4 d-flex justify-content-center text-center">{{ answer }}</h1>
+        </div><br><br/><details>
+        <div id="details">
+            {% if comment | length or comment1 | length %}
+            <p><span>Комментарии:</span>
+                {% if comment | length %}
+                {{ comment }}
+                {% endif %}
+                {% if comment1 | length %}
+                <br/>
+                {{ comment1 }}
+                {% endif %}
+            </p>
+            {% endif %}
+            {% if author | length %}
+            <p><span>Автор: </span> {{ author }}</p>
+            {% endif %}
+            {% if copyright | length %}
+            <p><span>Копирайт: </span> {{ copyright }}</p>
+            {% endif %}
+            {% if source | length %}
+            <p><span>Источник: </span> {{ source }}</p>
+            {% endif %}
+            {% if theme | length %}
+            <p><span>Тема: </span> {{ theme }}</p>
+            {% endif %}
+            {% if rating | length %}
+            <p><span>Рейтинг: </span> {{ author }}</p>
+            {% endif %}
+            {% if batch_info.description | length %}
+            <p><span>Чемпионат: </span> {{ batch_info.description }}</p>
+            {% endif %}
+            {% if tour | length %}
+            <p><span>Тур: </span> {{ tour }}</p>
+            {% endif %}
+            {% if id | length %}
+            <p><span>Номер: </span> {{ id }}</p>
+            {% endif %}
+        </div></details>
+    </div>
+    <br />
+    {% endblock content %}

templates/base.html

@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <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>
-        <nav class="navbar navbar-expand-sm container sticky-top navbar-light justify-content-center">
-            <ul class="nav navbar-nav">
-                {% include "nav.html" %} {% block nav %}{% endblock nav %}
-            </ul>
-        </nav>
-        <hr/>
-    </header>
-    <article>
-        <div id="content" class="container">{% block content %}{% endblock content %}</div>
-    </article>
-    <footer class="footer fixed-bottom">
-        <hr/>
-        <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>
-
-</html>

templates/base.html.tera

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8" />
+  <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 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>
+    </header>
+    <article class="mb-5 pb-5">
+    <div id="content" class="container">{% block content %}{% endblock content %}</div>
+    </article>
+<footer class="footer fixed-bottom shadow-lg rounded-top">
+<p class="my-0 py-0 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>
+</html>

templates/question.html

@@ -1,20 +0,0 @@
-{% extends "base.html" %} {% block title %} Вопрос {% endblock title %} {% block nav %}
-<li class="nav-item"><a class="nav-link text-primary" href="/q/{{ next }}">Ещё</a></li>
-{% endblock nav %} {% block content %}
-<!-- <h1>{{ id }}</h1> -->
-<div class="content-block">
-    <div id="question" class="content-block-inner">
-        <p>
-            <h3> {{ description }} </h3>
-        </p>
-    </div>
-</div>
-<br/>
-<br/>
-<br/>
-<details>
-    <summary>Ответ</summary><br/>
-    <a class="btn btn-dark" href="/q/{{ num }}/a/">Показать ответ</a>
-</details>
-
-{% endblock content %}

templates/question.html.tera

@@ -0,0 +1,19 @@
+{% extends "base" %} {% block title %} Вопрос {% endblock title %} 
+{% block nav %} 
+<li class="nav-item"><a class="nav-link text-primary" href="/q/{{ next }}">Ещё</a></li>
+{% endblock nav %}
+{% block content %}
+<!-- <h1>{{ id }}</h1> -->
+<div class="content-block"><div id="question" class="content-block-inner">
+<p>
+    <h3> {{ description }} </h3>
+</p>
+</div></div>
+<br/>
+<br/>
+<br/><details>
+    <summary>Ответ</summary><br/>
+    <a class="btn btn-dark shadow" href="/q/{{ num }}/a/">Показать ответ</a>
+</details>
+
+{% endblock content %}