selfhosted
/
filite
mirror of https://github.com/raftario/filite.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename handlers to routes

This commit is contained in:
Raphaël Thériault 2019-10-17 14:35:44 -04:00
parent 799a583372
commit a5e2055ff7
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main.rs
View File

@ -16,9 +16,9 @@ use std::process;
#[cfg(not(debug_assertions))]
use std::fs;
pub mod handlers;
pub mod models;
pub mod queries;
pub mod routes;
pub mod schema;
pub mod setup;
@ -82,30 +82,30 @@ fn main() {
.data(config.clone())
.data(pool.clone())
.wrap(setup::logger_middleware())
.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("/config").route(web::get().to(routes::get_config)))
.service(web::resource("/f").route(web::get().to_async(routes::files::gets)))
.service(web::resource("/l").route(web::get().to_async(routes::links::gets)))
.service(web::resource("/t").route(web::get().to_async(routes::texts::gets)))
.route("/f/{id}", web::get().to_async(routes::files::get))
.route("/l/{id}", web::get().to_async(routes::links::get))
.route("/t/{id}", web::get().to_async(routes::texts::get))
.service(
web::resource("/f/{id}")
.data(web::Json::<handlers::files::PutFile>::configure(|cfg| {
.data(web::Json::<routes::files::PutFile>::configure(|cfg| {
cfg.limit(max_filesize)
}))
.route(web::put().to_async(handlers::files::put))
.route(web::delete().to_async(handlers::files::delete)),
.route(web::put().to_async(routes::files::put))
.route(web::delete().to_async(routes::files::delete)),
)
.service(
web::resource("/l/{id}")
.route(web::put().to_async(handlers::links::put))
.route(web::delete().to_async(handlers::links::delete)),
.route(web::put().to_async(routes::links::put))
.route(web::delete().to_async(routes::links::delete)),
)
.service(
web::resource("/t/{id}")
.route(web::put().to_async(handlers::texts::put))
.route(web::delete().to_async(handlers::texts::delete)),
.route(web::put().to_async(routes::texts::put))
.route(web::delete().to_async(routes::texts::delete)),
)
})
.bind(&format!("localhost:{}", port))

8
src/handlers.rs → src/routes.rs
View File

@ -1,3 +1,5 @@
//! Actix route handlers
use crate::setup::Config;
use actix_web::error::BlockingError;
@ -89,8 +91,8 @@ pub fn get_config(config: web::Data<Config>) -> impl Responder {
}
pub mod files {
use crate::handlers::{find_error, id_from_b36};
use crate::queries::{self, SelectFilters, SelectQuery};
use crate::routes::{find_error, id_from_b36};
use crate::setup::Config;
use crate::Pool;
@ -189,8 +191,8 @@ pub mod files {
}
pub mod links {
use crate::handlers::{find_error, id_from_b36, timestamp_to_last_modified};
use crate::queries::{self, SelectFilters, SelectQuery};
use crate::routes::{find_error, id_from_b36, timestamp_to_last_modified};
use crate::Pool;
use actix_web::{web, Error, HttpResponse};
@ -239,8 +241,8 @@ pub mod links {
}
pub mod texts {
use crate::handlers::{find_error, id_from_b36, timestamp_to_last_modified};
use crate::queries::{self, SelectFilters, SelectQuery};
use crate::routes::{find_error, id_from_b36, timestamp_to_last_modified};
use crate::Pool;
use actix_web::{web, Error, HttpResponse};