mirror of https://github.com/raftario/filite.git
Moved route handlers to separate module
This commit is contained in:
Raphaël Thériault
parent
901bf9bdac
commit
1bbfccec9f
|
|
@ -0,0 +1,265 @@
|
|||
use filite::setup::Config;
|
||||
|
||||
use actix_web::{web, HttpResponse, Responder};
|
||||
use chrono::{DateTime, NaiveDateTime, Utc};
|
||||
use std::num;
|
||||
|
||||
/// GET multiple entries
|
||||
macro_rules! select {
|
||||
($m:ident) => {
|
||||
pub fn gets(
|
||||
query: web::Query<SelectQuery>,
|
||||
pool: web::Data<Pool>,
|
||||
) -> impl Future<Item = HttpResponse, Error = Error> {
|
||||
let filters = SelectFilters::from(query.into_inner());
|
||||
web::block(move || queries::$m::select(filters, pool)).then(|result| match result {
|
||||
Ok(x) => Ok(HttpResponse::Ok().json(x)),
|
||||
Err(_) => Err(HttpResponse::InternalServerError().finish().into()),
|
||||
})
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/// Parses a base 36 ID
|
||||
#[inline(always)]
|
||||
fn id_from_b36(s: &str) -> Result<i32, num::ParseIntError> {
|
||||
i32::from_str_radix(s, 36)
|
||||
}
|
||||
|
||||
/// Parses an ID and errors if it fails
|
||||
macro_rules! parse_id {
|
||||
($s:expr) => {
|
||||
match id_from_b36($s) {
|
||||
Ok(id) => id,
|
||||
Err(_) => return Either::B(future::err(HttpResponse::BadRequest().finish().into())),
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
/// Formats a timestamp to the "Last-Modified" header format
|
||||
fn timestamp_to_last_modified(timestamp: i32) -> String {
|
||||
let datetime =
|
||||
DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp(timestamp as i64, 0), Utc);
|
||||
datetime.format("%a, %d %b %Y %H:%M:%S GMT").to_string()
|
||||
}
|
||||
|
||||
macro_rules! put_then {
|
||||
($f:expr) => {
|
||||
$f.then(|result| match result {
|
||||
Ok(x) => Ok(HttpResponse::Created().json(x)),
|
||||
Err(_) => Err(HttpResponse::InternalServerError().finish().into()),
|
||||
})
|
||||
};
|
||||
}
|
||||
|
||||
/// GET the config info
|
||||
pub fn get_config(config: web::Data<Config>) -> impl Responder {
|
||||
HttpResponse::Ok().json(config.get_ref())
|
||||
}
|
||||
|
||||
pub mod files {
|
||||
use crate::handlers::id_from_b36;
|
||||
|
||||
use filite::queries::{self, SelectFilters, SelectQuery};
|
||||
use filite::setup::Config;
|
||||
use filite::Pool;
|
||||
|
||||
use actix_files::NamedFile;
|
||||
use actix_web::error::BlockingError;
|
||||
use actix_web::{http, web, Error, HttpResponse};
|
||||
use chrono::{Datelike, Utc};
|
||||
use futures::future::{self, Either};
|
||||
use futures::Future;
|
||||
use std::path::PathBuf;
|
||||
use std::fs;
|
||||
|
||||
select!(files);
|
||||
|
||||
/// GET a file entry and statically serve it
|
||||
pub fn get(
|
||||
path: web::Path<String>,
|
||||
pool: web::Data<Pool>,
|
||||
config: web::Data<Config>,
|
||||
) -> impl Future<Item = NamedFile, Error = Error> {
|
||||
let id = parse_id!(&path);
|
||||
let files_dir = config.files_dir.clone();
|
||||
Either::A(
|
||||
web::block(move || queries::files::find(id, pool)).then(|result| match result {
|
||||
Ok(file) => {
|
||||
let mut path = files_dir;
|
||||
path.push(file.filepath);
|
||||
match NamedFile::open(&path) {
|
||||
Ok(nf) => Ok(nf),
|
||||
Err(_) => Err(HttpResponse::NotFound().finish().into()),
|
||||
}
|
||||
}
|
||||
Err(_) => Err(HttpResponse::NotFound().finish().into()),
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
/// Request body when PUTting files
|
||||
#[derive(Deserialize)]
|
||||
pub struct PutFile {
|
||||
pub base64: String,
|
||||
pub filename: String,
|
||||
}
|
||||
|
||||
/// PUT a new file entry
|
||||
pub fn put(
|
||||
(path, body): (web::Path<String>, web::Json<PutFile>),
|
||||
config: web::Data<Config>,
|
||||
pool: web::Data<Pool>,
|
||||
) -> impl Future<Item = HttpResponse, Error = Error> {
|
||||
let id = parse_id!(&path);
|
||||
Either::A(
|
||||
web::block(move || {
|
||||
let mut path = config.files_dir.clone();
|
||||
let mut relative_path = PathBuf::new();
|
||||
|
||||
let current_time = Utc::now();
|
||||
let current_date = current_time.date().naive_utc();
|
||||
path.push(&format!("{:04}", current_date.year()));
|
||||
relative_path.push(&format!("{:04}", current_date.year()));
|
||||
path.push(&format!("{:02}", current_date.month()));
|
||||
relative_path.push(&format!("{:02}", current_date.month()));
|
||||
path.push(&format!("{:02}", current_date.day()));
|
||||
relative_path.push(&format!("{:02}", current_date.day()));
|
||||
|
||||
if fs::create_dir_all(&path).is_err() {
|
||||
return Err(http::StatusCode::from_u16(500).unwrap());
|
||||
}
|
||||
|
||||
let mut filename = body.filename.clone();
|
||||
let timestamp = format!("{:x}.", current_time.timestamp());
|
||||
filename.insert_str(0, ×tamp);
|
||||
path.push(&filename);
|
||||
relative_path.push(&filename);
|
||||
|
||||
let relative_path = match relative_path.to_str() {
|
||||
Some(rp) => rp,
|
||||
None => return Err(http::StatusCode::from_u16(500).unwrap()),
|
||||
};
|
||||
|
||||
let contents = match base64::decode(&body.base64) {
|
||||
Ok(contents) => contents,
|
||||
Err(_) => return Err(http::StatusCode::from_u16(400).unwrap()),
|
||||
};
|
||||
if fs::write(&path, contents).is_err() {
|
||||
return Err(http::StatusCode::from_u16(500).unwrap());
|
||||
}
|
||||
|
||||
match queries::files::replace(id, relative_path, pool) {
|
||||
Ok(file) => Ok(file),
|
||||
Err(_) => Err(http::StatusCode::from_u16(500).unwrap()),
|
||||
}
|
||||
})
|
||||
.then(|result| match result {
|
||||
Ok(file) => Ok(HttpResponse::Created().json(file)),
|
||||
Err(e) => match e {
|
||||
BlockingError::Error(sc) => Err(HttpResponse::new(sc).into()),
|
||||
BlockingError::Canceled => {
|
||||
Err(HttpResponse::InternalServerError().finish().into())
|
||||
}
|
||||
},
|
||||
}),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
pub mod links {
|
||||
use crate::handlers::{id_from_b36, timestamp_to_last_modified};
|
||||
|
||||
use filite::queries::{self, SelectFilters, SelectQuery};
|
||||
use filite::Pool;
|
||||
|
||||
use actix_web::{web, Error, HttpResponse};
|
||||
use futures::future::{self, Either};
|
||||
use futures::Future;
|
||||
|
||||
select!(links);
|
||||
|
||||
/// GET a link entry and redirect to it
|
||||
pub fn get(
|
||||
path: web::Path<String>,
|
||||
pool: web::Data<Pool>,
|
||||
) -> impl Future<Item = HttpResponse, Error = Error> {
|
||||
let id = parse_id!(&path);
|
||||
Either::A(
|
||||
web::block(move || queries::links::find(id, pool)).then(|result| match result {
|
||||
Ok(link) => Ok(HttpResponse::Found()
|
||||
.header("Location", link.forward)
|
||||
.header("Last-Modified", timestamp_to_last_modified(link.updated))
|
||||
.finish()),
|
||||
Err(_) => Err(HttpResponse::NotFound().finish().into()),
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
/// Request body when PUTting links
|
||||
#[derive(Deserialize)]
|
||||
pub struct PutLink {
|
||||
pub forward: String,
|
||||
}
|
||||
|
||||
/// PUT a new link entry
|
||||
pub fn put(
|
||||
(path, body): (web::Path<String>, web::Json<PutLink>),
|
||||
pool: web::Data<Pool>,
|
||||
) -> impl Future<Item = HttpResponse, Error = Error> {
|
||||
let id = parse_id!(&path);
|
||||
Either::A(put_then!(web::block(move || queries::links::replace(
|
||||
id,
|
||||
&body.forward,
|
||||
pool
|
||||
))))
|
||||
}
|
||||
}
|
||||
|
||||
pub mod texts {
|
||||
use crate::handlers::{id_from_b36, timestamp_to_last_modified};
|
||||
|
||||
use filite::queries::{self, SelectFilters, SelectQuery};
|
||||
use filite::Pool;
|
||||
|
||||
use actix_web::{web, Error, HttpResponse};
|
||||
use futures::future::{self, Either};
|
||||
use futures::Future;
|
||||
|
||||
select!(texts);
|
||||
|
||||
/// GET a text entry and display it
|
||||
pub fn get(
|
||||
path: web::Path<String>,
|
||||
pool: web::Data<Pool>,
|
||||
) -> impl Future<Item = HttpResponse, Error = Error> {
|
||||
let id = parse_id!(&path);
|
||||
Either::A(
|
||||
web::block(move || queries::texts::find(id, pool)).then(|result| match result {
|
||||
Ok(text) => Ok(HttpResponse::Ok()
|
||||
.header("Last-Modified", timestamp_to_last_modified(text.updated))
|
||||
.body(text.contents)),
|
||||
Err(_) => Err(HttpResponse::NotFound().finish().into()),
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
/// Request body when PUTting texts
|
||||
#[derive(Deserialize)]
|
||||
pub struct PutText {
|
||||
pub contents: String,
|
||||
}
|
||||
|
||||
/// PUT a new text entry
|
||||
pub fn put(
|
||||
(path, body): (web::Path<String>, web::Json<PutText>),
|
||||
pool: web::Data<Pool>,
|
||||
) -> impl Future<Item = HttpResponse, Error = Error> {
|
||||
let id = parse_id!(&path);
|
||||
Either::A(put_then!(web::block(move || queries::texts::replace(
|
||||
id,
|
||||
&body.contents,
|
||||
pool
|
||||
))))
|
||||
}
|
||||
}
|
||||
264
src/main.rs
264
src/main.rs
|
|
@ -3,18 +3,12 @@ extern crate cfg_if;
|
|||
#[macro_use]
|
||||
extern crate serde;
|
||||
|
||||
use filite::queries::{self, SelectFilters, SelectQuery};
|
||||
use filite::setup::{self, Config};
|
||||
use filite::Pool;
|
||||
|
||||
use actix_files::NamedFile;
|
||||
use actix_web::error::BlockingError;
|
||||
use actix_web::{http, web, App, Error, FromRequest, HttpResponse, HttpServer, Responder};
|
||||
use chrono::{DateTime, Datelike, NaiveDateTime, Utc};
|
||||
use futures::future::{self, Either};
|
||||
use futures::Future;
|
||||
use std::path::PathBuf;
|
||||
use std::{fs, num, process};
|
||||
use actix_web::{web, App, FromRequest, HttpServer};
|
||||
use std::{process};
|
||||
|
||||
mod handlers;
|
||||
|
||||
/// Performs the initial setup
|
||||
#[cfg(not(debug_assertions))]
|
||||
|
|
@ -41,233 +35,6 @@ fn init() -> Config {
|
|||
})
|
||||
}
|
||||
|
||||
/// GET multiple entries
|
||||
macro_rules! select {
|
||||
($n:ident, $m:ident) => {
|
||||
fn $n(
|
||||
query: web::Query<SelectQuery>,
|
||||
pool: web::Data<Pool>,
|
||||
) -> impl Future<Item = HttpResponse, Error = Error> {
|
||||
let filters = SelectFilters::from(query.into_inner());
|
||||
web::block(move || queries::$m::select(filters, pool)).then(|result| match result {
|
||||
Ok(x) => Ok(HttpResponse::Ok().json(x)),
|
||||
Err(_) => Err(HttpResponse::InternalServerError().finish().into()),
|
||||
})
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
select!(get_files, files);
|
||||
select!(get_links, links);
|
||||
select!(get_texts, texts);
|
||||
|
||||
/// Returns a generic Not Found error response
|
||||
#[inline(always)]
|
||||
fn not_found() -> Error {
|
||||
HttpResponse::NotFound().finish().into()
|
||||
}
|
||||
|
||||
/// Parses a base 36 ID
|
||||
#[inline(always)]
|
||||
fn id_from_b36(s: &str) -> Result<i32, num::ParseIntError> {
|
||||
i32::from_str_radix(s, 36)
|
||||
}
|
||||
|
||||
/// Parses an ID and errors if it fails
|
||||
macro_rules! parse_id {
|
||||
($s:expr) => {
|
||||
match id_from_b36($s) {
|
||||
Ok(id) => id,
|
||||
Err(_) => return Either::B(future::err(HttpResponse::BadRequest().finish().into())),
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
/// Formats a timestamp to the "Last-Modified" header format
|
||||
fn timestamp_to_last_modified(timestamp: i32) -> String {
|
||||
let datetime =
|
||||
DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp(timestamp as i64, 0), Utc);
|
||||
datetime.format("%a, %d %b %Y %H:%M:%S GMT").to_string()
|
||||
}
|
||||
|
||||
/// GET a file entry and statically serve it
|
||||
fn get_file(
|
||||
path: web::Path<String>,
|
||||
pool: web::Data<Pool>,
|
||||
config: web::Data<Config>,
|
||||
) -> impl Future<Item = NamedFile, Error = Error> {
|
||||
let id = parse_id!(&path);
|
||||
let files_dir = config.files_dir.clone();
|
||||
Either::A(
|
||||
web::block(move || queries::files::find(id, pool)).then(|result| match result {
|
||||
Ok(file) => {
|
||||
let mut path = files_dir;
|
||||
path.push(file.filepath);
|
||||
match NamedFile::open(&path) {
|
||||
Ok(nf) => Ok(nf),
|
||||
Err(_) => Err(HttpResponse::NotFound().finish().into()),
|
||||
}
|
||||
}
|
||||
Err(_) => Err(not_found()),
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
/// GET a link entry and redirect to it
|
||||
fn get_link(
|
||||
path: web::Path<String>,
|
||||
pool: web::Data<Pool>,
|
||||
) -> impl Future<Item = HttpResponse, Error = Error> {
|
||||
let id = parse_id!(&path);
|
||||
Either::A(
|
||||
web::block(move || queries::links::find(id, pool)).then(|result| match result {
|
||||
Ok(link) => Ok(HttpResponse::Found()
|
||||
.header("Location", link.forward)
|
||||
.header("Last-Modified", timestamp_to_last_modified(link.updated))
|
||||
.finish()),
|
||||
Err(_) => Err(not_found()),
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
/// GET a text entry and display it
|
||||
fn get_text(
|
||||
path: web::Path<String>,
|
||||
pool: web::Data<Pool>,
|
||||
) -> impl Future<Item = HttpResponse, Error = Error> {
|
||||
let id = parse_id!(&path);
|
||||
Either::A(
|
||||
web::block(move || queries::texts::find(id, pool)).then(|result| match result {
|
||||
Ok(text) => Ok(HttpResponse::Ok()
|
||||
.header("Last-Modified", timestamp_to_last_modified(text.updated))
|
||||
.body(text.contents)),
|
||||
Err(_) => Err(not_found()),
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
/// Request body when PUTting files
|
||||
#[derive(Deserialize)]
|
||||
struct PutFile {
|
||||
base64: String,
|
||||
filename: String,
|
||||
}
|
||||
|
||||
/// Request body when PUTting links
|
||||
#[derive(Deserialize)]
|
||||
struct PutLink {
|
||||
forward: String,
|
||||
}
|
||||
|
||||
/// Request body when PUTting texts
|
||||
#[derive(Deserialize)]
|
||||
struct PutText {
|
||||
contents: String,
|
||||
}
|
||||
|
||||
macro_rules! put_then {
|
||||
($f:expr) => {
|
||||
$f.then(|result| match result {
|
||||
Ok(x) => Ok(HttpResponse::Created().json(x)),
|
||||
Err(_) => Err(HttpResponse::InternalServerError().finish().into()),
|
||||
})
|
||||
};
|
||||
}
|
||||
|
||||
/// PUT a new file entry
|
||||
fn put_file(
|
||||
(path, body): (web::Path<String>, web::Json<PutFile>),
|
||||
config: web::Data<Config>,
|
||||
pool: web::Data<Pool>,
|
||||
) -> impl Future<Item = HttpResponse, Error = Error> {
|
||||
let id = parse_id!(&path);
|
||||
Either::A(
|
||||
web::block(move || {
|
||||
let mut path = config.files_dir.clone();
|
||||
let mut relative_path = PathBuf::new();
|
||||
|
||||
let current_time = Utc::now();
|
||||
let current_date = current_time.date().naive_utc();
|
||||
path.push(&format!("{:04}", current_date.year()));
|
||||
relative_path.push(&format!("{:04}", current_date.year()));
|
||||
path.push(&format!("{:02}", current_date.month()));
|
||||
relative_path.push(&format!("{:02}", current_date.month()));
|
||||
path.push(&format!("{:02}", current_date.day()));
|
||||
relative_path.push(&format!("{:02}", current_date.day()));
|
||||
|
||||
if fs::create_dir_all(&path).is_err() {
|
||||
return Err(http::StatusCode::from_u16(500).unwrap());
|
||||
}
|
||||
|
||||
let mut filename = body.filename.clone();
|
||||
let timestamp = format!("{:x}.", current_time.timestamp());
|
||||
filename.insert_str(0, ×tamp);
|
||||
path.push(&filename);
|
||||
relative_path.push(&filename);
|
||||
|
||||
let relative_path = match relative_path.to_str() {
|
||||
Some(rp) => rp,
|
||||
None => return Err(http::StatusCode::from_u16(500).unwrap()),
|
||||
};
|
||||
|
||||
let contents = match base64::decode(&body.base64) {
|
||||
Ok(contents) => contents,
|
||||
Err(_) => return Err(http::StatusCode::from_u16(400).unwrap()),
|
||||
};
|
||||
if fs::write(&path, contents).is_err() {
|
||||
return Err(http::StatusCode::from_u16(500).unwrap());
|
||||
}
|
||||
|
||||
match queries::files::replace(id, relative_path, pool) {
|
||||
Ok(file) => Ok(file),
|
||||
Err(_) => Err(http::StatusCode::from_u16(500).unwrap()),
|
||||
}
|
||||
})
|
||||
.then(|result| match result {
|
||||
Ok(file) => Ok(HttpResponse::Created().json(file)),
|
||||
Err(e) => match e {
|
||||
BlockingError::Error(sc) => Err(HttpResponse::new(sc).into()),
|
||||
BlockingError::Canceled => Err(HttpResponse::InternalServerError().finish().into()),
|
||||
},
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
/// PUT a new link entry
|
||||
fn put_link(
|
||||
(path, body): (web::Path<String>, web::Json<PutLink>),
|
||||
pool: web::Data<Pool>,
|
||||
) -> impl Future<Item = HttpResponse, Error = Error> {
|
||||
let id = parse_id!(&path);
|
||||
Either::A(put_then!(web::block(move || queries::links::replace(
|
||||
id,
|
||||
&body.forward,
|
||||
pool
|
||||
))))
|
||||
}
|
||||
|
||||
/// PUT a new text entry
|
||||
fn put_text(
|
||||
(path, body): (web::Path<String>, web::Json<PutText>),
|
||||
pool: web::Data<Pool>,
|
||||
) -> impl Future<Item = HttpResponse, Error = Error> {
|
||||
let id = parse_id!(&path);
|
||||
Either::A(put_then!(web::block(move || queries::texts::replace(
|
||||
id,
|
||||
&body.contents,
|
||||
pool
|
||||
))))
|
||||
}
|
||||
|
||||
/// GET the config info
|
||||
fn get_config(config: web::Data<Config>) -> impl Responder {
|
||||
HttpResponse::Ok().json(config.get_ref())
|
||||
}
|
||||
|
||||
fn index() -> impl Responder {
|
||||
HttpResponse::Ok().body("Hello world!")
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let config = {
|
||||
cfg_if! {
|
||||
|
|
@ -290,23 +57,22 @@ fn main() {
|
|||
.data(config.clone())
|
||||
.data(pool.clone())
|
||||
.wrap(setup::logger_middleware())
|
||||
.route("/", web::get().to(index))
|
||||
.service(web::resource("/config").route(web::get().to(get_config)))
|
||||
.service(web::resource("/f").route(web::get().to_async(get_files)))
|
||||
.service(web::resource("/l").route(web::get().to_async(get_links)))
|
||||
.service(web::resource("/t").route(web::get().to_async(get_texts)))
|
||||
.route("/f/{id}", web::get().to_async(get_file))
|
||||
.route("/l/{id}", web::get().to_async(get_link))
|
||||
.route("/t/{id}", web::get().to_async(get_text))
|
||||
.service(web::resource("/config").route(web::get().to(handlers::get_config)))
|
||||
.service(web::resource("/f").route(web::get().to_async(handlers::files::gets)))
|
||||
.service(web::resource("/l").route(web::get().to_async(handlers::links::gets)))
|
||||
.service(web::resource("/t").route(web::get().to_async(handlers::texts::gets)))
|
||||
.route("/f/{id}", web::get().to_async(handlers::files::get))
|
||||
.route("/l/{id}", web::get().to_async(handlers::links::get))
|
||||
.route("/t/{id}", web::get().to_async(handlers::texts::get))
|
||||
.service(
|
||||
web::resource("/f/{id}")
|
||||
.data(web::Json::<PutFile>::configure(|cfg| {
|
||||
.data(web::Json::<handlers::files::PutFile>::configure(|cfg| {
|
||||
cfg.limit(max_filesize)
|
||||
}))
|
||||
.route(web::put().to_async(put_file)),
|
||||
.route(web::put().to_async(handlers::files::put)),
|
||||
)
|
||||
.service(web::resource("/l/{id}").route(web::put().to_async(put_link)))
|
||||
.service(web::resource("/t/{id}").route(web::put().to_async(put_text)))
|
||||
.service(web::resource("/l/{id}").route(web::put().to_async(handlers::links::put)))
|
||||
.service(web::resource("/t/{id}").route(web::put().to_async(handlers::texts::put)))
|
||||
})
|
||||
.bind(&format!("localhost:{}", port))
|
||||
.unwrap_or_else(|e| {
|
||||
|
|
|
|||
Loading…
Reference in New Issue