vikarti.anatra/polaris-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved rocket API to a separate file

Browse source
This commit is contained in:
Antoine Gersant 2018-10-27 15:24:52 -07:00
parent 33ae1c07b2
commit 06c694ab4a
3 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/api.rs
View file

@ -7,7 +7,6 @@ use iron::prelude::*;
use iron::{status, AroundMiddleware, Handler}; use iron::{status, AroundMiddleware, Handler};
use mount::Mount; use mount::Mount;
use params; use params;
use rocket_contrib::json::Json;
use router::Router; use router::Router;
use secure_session::middleware::{SessionConfig, SessionMiddleware}; use secure_session::middleware::{SessionConfig, SessionMiddleware};
use secure_session::session::ChaCha20Poly1305SessionManager; use secure_session::session::ChaCha20Poly1305SessionManager;
@ -34,9 +33,6 @@ use user;
use utils::*; use utils::*;
use vfs::VFSSource; use vfs::VFSSource;
const CURRENT_MAJOR_VERSION: i32 = 2;
const CURRENT_MINOR_VERSION: i32 = 2;
#[derive(Deserialize, Serialize)] #[derive(Deserialize, Serialize)]
struct Session { struct Session {
username: String, username: String,
@ -67,10 +63,6 @@ where
Ok(secret) Ok(secret)
} }
pub fn get_routes() -> Vec<rocket::Route> {
routes![version]
}
pub fn get_handler(db: &Arc<DB>, index: &Arc<Mutex<Sender<index::Command>>>) -> Result<Chain> { pub fn get_handler(db: &Arc<DB>, index: &Arc<Mutex<Sender<index::Command>>>) -> Result<Chain> {
let api_handler = get_endpoints(&db.clone(), &index); let api_handler = get_endpoints(&db.clone(), &index);
let mut api_chain = Chain::new(api_handler); let mut api_chain = Chain::new(api_handler);
@ -377,21 +369,6 @@ impl Handler for AdminHandler {
} }
} }
#[derive(Serialize)]
struct Version {
major: i32,
minor: i32,
}
#[get("/version")]
fn version() -> Json<Version> {
let current_version = Version {
major: CURRENT_MAJOR_VERSION,
minor: CURRENT_MINOR_VERSION,
};
Json(current_version)
}
fn initial_setup(_: &mut Request, db: &DB) -> IronResult<Response> { fn initial_setup(_: &mut Request, db: &DB) -> IronResult<Response> {
#[derive(Serialize)] #[derive(Serialize)]
struct InitialSetup { struct InitialSetup {

3
src/main.rs
View file

@ -75,6 +75,7 @@ use std::sync::mpsc::channel;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
mod api; mod api;
mod rocket_api;
mod config; mod config;
mod db; mod db;
mod ddns; mod ddns;
@ -269,7 +270,7 @@ fn run() -> Result<()> {
rocket::ignite() rocket::ignite()
.mount(&static_url, StaticFiles::from(web_dir_path)) .mount(&static_url, StaticFiles::from(web_dir_path))
.mount(&api_url, api::get_routes()) .mount(&api_url, rocket_api::get_routes())
.launch(); .launch();
// Start DDNS updates // Start DDNS updates

23
src/rocket_api.rs Normal file
View file

@ -0,0 +1,23 @@
use rocket_contrib::json::Json;
const CURRENT_MAJOR_VERSION: i32 = 2;
const CURRENT_MINOR_VERSION: i32 = 2;
pub fn get_routes() -> Vec<rocket::Route> {
routes![version]
}
#[derive(Serialize)]
struct Version {
major: i32,
minor: i32,
}
#[get("/version")]
fn version() -> Json<Version> {
let current_version = Version {
major: CURRENT_MAJOR_VERSION,
minor: CURRENT_MINOR_VERSION,
};
Json(current_version)
}