from actix to rocket

This commit is contained in:
Dmitry Belyaev 2019-08-05 17:06:27 +03:00
parent a7b1233a0c
commit 2a6cd616be
Signed by: b4tman
GPG Key ID: 41A00BF15EA7E5F3
8 changed files with 359 additions and 1299 deletions

1473
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -1,45 +1,28 @@
// extern crate actix; #![feature(proc_macro_hygiene, decl_macro)]
extern crate actix_files;
extern crate actix_web;
extern crate serde; extern crate serde;
#[macro_use] #[macro_use]
extern crate serde_derive; extern crate serde_derive;
#[macro_use]
extern crate serde_json; extern crate serde_json;
#[macro_use]
extern crate ledb; extern crate ledb;
#[macro_use] #[macro_use]
extern crate ledb_derive; extern crate ledb_derive;
extern crate env_logger;
extern crate ledb_types; extern crate ledb_types;
#[macro_use]
extern crate tera;
use tera::Context; //#[macro_use]
//extern crate tera;
// extern crate futures; //use tera::Context;
// extern crate tokio; #[macro_use] extern crate rocket;
extern crate rocket_contrib;
use actix_web::{ use rocket::{Rocket, State};
error, guard, http::header, http::Method, middleware::Logger, middleware::NormalizePath, web, use rocket::response::Redirect;
App, Error, HttpRequest, HttpResponse, HttpServer, Responder, Result, use rocket_contrib::serve::StaticFiles;
}; use rocket_contrib::templates::Template;
use std::cell::Cell;
use rand::seq::IteratorRandom; use rand::seq::IteratorRandom;
use std::time::Instant;
use std::{fs, io};
// use tokio::spawn;
// use futures::{Future};
// use actix::Actor;
// use actix::System;
//use crate::tokio::prelude::Future;
//use ledb_actix::{Document, Options, Storage, StorageAddrExt};
use ledb::{Options, Storage}; use ledb::{Options, Storage};
@ -118,32 +101,29 @@ struct Question {
struct AppState { struct AppState {
storage: Storage, storage: Storage,
template: tera::Tera,
} }
fn get_question(storage: &Storage, id: u32) -> Result<Option<Question>, Error> { fn get_question(storage: &Storage, id: u32) -> Result<Option<Question>, ()> {
if 0 == id { if 0 == id {
return Ok(None); return Ok(None);
} }
let collection = storage.collection("questions").unwrap(); let collection = storage.collection("questions").expect("collection \"questions\"");
let last_id = collection.last_id().unwrap(); let last_id = collection.last_id().expect("\"questions\" last_id");
if id > last_id { if id > last_id {
Err(Error::from(())) Err(())
} else { } else {
let question = collection.get::<Question>(id); let question = collection.get::<Question>(id);
if question.is_err() { if question.is_err() {
Err(Error::from(())) Err(())
} else { } else {
Ok(question.unwrap()) Ok(question.unwrap())
} }
} }
} }
fn show_question_details(template_file: &str, data: web::Data<AppState>, id: web::Path<u32>) -> Result<HttpResponse, Error> { fn show_question_details(template_name: &'static str, data: &AppState, id: u32) -> Result<Template, Redirect> {
let id = id.into_inner();
let question = get_question(&data.storage, id); let question = get_question(&data.storage, id);
if question.is_ok() { if question.is_ok() {
@ -151,85 +131,67 @@ fn show_question_details(template_file: &str, data: web::Data<AppState>, id: web
if question.is_some() { if question.is_some() {
let question = question.unwrap(); let question = question.unwrap();
let body = data.template.render(template_file, &question).unwrap(); Ok(Template::render(template_name, &question))
Ok(HttpResponse::Ok().content_type("text/html").body(body))
} else { } else {
Ok(HttpResponse::Found() Err(Redirect::permanent("/q/"))
.header(header::LOCATION, "/q/")
.finish())
} }
} else { } else {
let context = Context::new(); use std::collections::HashMap;
Ok(HttpResponse::with_body( let context: HashMap<String, String> = HashMap::new();
actix_web::http::StatusCode::NOT_FOUND, Ok(Template::render("404", &context))
actix_web::dev::Body::from(data.template.render("404.html", &context).unwrap()),
))
} }
} }
fn show_question(data: web::Data<AppState>, id: web::Path<u32>) -> Result<HttpResponse, Error> { #[get("/q/<id>")]
show_question_details("question.html", data, 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> { #[get("/q/<id>/a")]
show_question_details("answer.html", data, id) 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("/")]
let collection = data.storage.collection("questions").unwrap(); fn index(data: State<AppState>) -> Redirect {
let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
let last_id = collection.last_id().unwrap(); let collection = data.storage.collection("questions").expect("collection \"questions\"");
let last_id = collection.last_id().expect("\"questions\" last_id");
let id = (1..(last_id + 1)).choose(&mut rng).unwrap(); let id = (1..(last_id + 1)).choose(&mut rng).unwrap();
let url = req.url_for("question", &[format!("{}", id)])?; Redirect::temporary(format!("/q/{}", id))
Ok(HttpResponse::Found()
.header(header::LOCATION, url.as_str())
.finish())
} }
fn main() { #[catch(404)]
std::env::set_var("RUST_LOG", "actix_web=info"); fn not_found(_req: &rocket::Request) -> Template {
env_logger::init(); use std::collections::HashMap;
let context: HashMap<String, String> = HashMap::new();
Template::render("404", &context)
}
let options: Options = serde_json::from_value(json!({ fn rocket() -> Rocket {
let options: Options = serde_json::from_value(serde_json::json!({
"read_only": true, "read_only": true,
"no_lock": true, "no_lock": true,
})) }))
.unwrap(); .unwrap();
let storage = Storage::new("db", options).unwrap(); let state = AppState {
storage: Storage::new("db", options).expect("open db")
HttpServer::new(move || {
let data = AppState {
storage: storage.clone(),
template: compile_templates!("./templates/**/*"),
}; };
App::new()
.wrap(Logger::default()) let collection = state.storage.collection("questions").expect("collection \"questions\"");
.data(data) collection.last_id().expect("\"questions\" last_id");
.route("/q", web::to(index))
.service( rocket::ignite()
web::scope("/q") .manage(state)
.service(actix_files::Files::new("/static", "./static")) .register(catchers![not_found])
.service( .mount("/", routes![index, show_question, show_answer])
web::resource("/{id}") .mount("/q", routes![index])
.name("question") // <- set resource name, then it could be used in `url_for` .mount("/q/static", StaticFiles::from("static/"))
.guard(guard::Get()) .attach(Template::fairing())
.to(show_question), }
)
.service( fn main() {
web::resource("/{id}/a/") rocket().launch();
.name("answer") // <- set resource name, then it could be used in `url_for`
.guard(guard::Get())
.to(show_answer),
)
.route("/", web::to(index))
)
.route("/", web::to(index))
})
.bind("127.0.0.1:8088")
.unwrap()
.run()
.unwrap();
} }

View File

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

View File

@ -1,4 +1,4 @@
{% extends "base.html" %} {% block title %} Ответ {% endblock title %} {% extends "base" %} {% block title %} Ответ {% endblock title %}
{% block content %} {% block content %}
<!-- <h1>{{ id }}</h1> --> <!-- <h1>{{ id }}</h1> -->

View File

@ -7,7 +7,7 @@
<title>{% block title %}{% endblock title %}</title> <title>{% block title %}{% endblock title %}</title>
</head> </head>
<body> <body>
{% include "nav.html" %} {% include "nav" %}
<div id="content" class="container">{% block content %}{% endblock content %}</div> <div id="content" class="container">{% block content %}{% endblock content %}</div>
</body> </body>
</html> </html>

View File

@ -1,4 +1,4 @@
{% extends "base.html" %} {% block title %} Вопрос {% endblock title %} {% extends "base" %} {% block title %} Вопрос {% endblock title %}
{% block content %} {% block content %}
<!-- <h1>{{ id }}</h1> --> <!-- <h1>{{ id }}</h1> -->