From ee1505646eb3c12dad4f1a7fc04add744a774e23 Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Thu, 5 Apr 2018 12:08:21 -0700 Subject: [PATCH] Strip out web endpoints that are going to be replaced --- server/src/web.rs | 107 ++-------------------------------------------- 1 file changed, 3 insertions(+), 104 deletions(-) diff --git a/server/src/web.rs b/server/src/web.rs index a22d4212..a41a10cc 100644 --- a/server/src/web.rs +++ b/server/src/web.rs @@ -3,10 +3,9 @@ use std::sync::{Arc, Mutex}; use rouille; use project::Project; -use vfs::{VfsSession, VfsChange}; -use rbx::RbxInstance; +use vfs::{VfsSession}; use middleware::MiddlewareChain; -use web_util::{json, read_json}; +use web_util::json; /// The set of configuration the web server needs to start. pub struct WebConfig { @@ -25,31 +24,8 @@ struct ServerInfo<'a> { current_time: f64, } -#[derive(Debug, Serialize)] -#[serde(rename_all = "camelCase")] -struct ReadResult<'a> { - items: Vec>, - server_id: &'a str, - current_time: f64, -} - -#[derive(Debug, Serialize)] -#[serde(rename_all = "camelCase")] -struct ChangesResult<'a> { - changes: &'a [VfsChange], - server_id: &'a str, - current_time: f64, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct WriteSpecifier { - route: String, - item: RbxInstance, -} - /// Start the Rojo web server and park our current thread. -pub fn start(config: WebConfig, project: Project, middleware_chain: &'static MiddlewareChain, vfs: Arc>) { +pub fn start(config: WebConfig, project: Project, _middleware_chain: &'static MiddlewareChain, vfs: Arc>) { let address = format!("localhost:{}", config.port); let server_id = config.server_id.to_string(); @@ -74,83 +50,6 @@ pub fn start(config: WebConfig, project: Project, middleware_chain: &'static Mid }) }, - (GET) (/changes/{ last_time: f64 }) => { - // Get the list of changes since the given time. - - let vfs = vfs.lock().unwrap(); - let current_time = vfs.current_time(); - let changes = vfs.changes_since(last_time); - - json(ChangesResult { - changes, - server_id: &server_id, - current_time, - }) - }, - - (POST) (/read) => { - // Read some instances from the server according to a JSON - // format body. - - let read_request: Vec> = match read_json(&request) { - Some(v) => v, - None => return rouille::Response::empty_400(), - }; - - // Read the files off of the filesystem that the client - // requested. - let (items, current_time) = { - let vfs = vfs.lock().unwrap(); - - let current_time = vfs.current_time(); - - let mut items = Vec::new(); - - for route in &read_request { - match vfs.read(&route) { - Ok(v) => items.push(Some(v)), - Err(_) => items.push(None), - } - } - - (items, current_time) - }; - - // Transform all of our VfsItem objects into Roblox instances - // the client can use. - let rbx_items = items - .iter() - .map(|item| { - match *item { - Some(ref item) => middleware_chain.transform_file(item), - None => None, - } - }) - .collect::>(); - - if config.verbose { - println!("Got read request: {:?}", read_request); - println!("Responding with:\n\t{:?}", rbx_items); - } - - json(ReadResult { - server_id: &server_id, - items: rbx_items, - current_time, - }) - }, - - (POST) (/write) => { - // Not yet implemented. - - let _write_request: Vec = match read_json(&request) { - Some(v) => v, - None => return rouille::Response::empty_400(), - }; - - rouille::Response::empty_404() - }, - _ => rouille::Response::empty_404() ) });