moparisthebest/rust-bucket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgrade to rocket 0.4.0, disable multipart upload

Browse Source
This commit is contained in:
Travis Burtrum 2019-02-16 23:47:09 -05:00
parent ff1c687008
commit c347e5333f
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Cargo.toml
View File

@ -4,12 +4,11 @@ version = "0.0.0"
publish = false publish = false
[dependencies] [dependencies]
rocket = "0.3.14" rocket = "0.4.0"
rocket_codegen = "0.3.14" rand = "0.6.5"
rand = "0.4" #multipart = "0.16.1"
multipart = "0.15.2" toml = "0.4.10"
toml = "0.4.6" serde = "1.0.88"
serde_derive = "1.0.71" serde_derive = "1.0.88"
serde = "1.0.71"
adjective_adjective_animal = "0.1.0" adjective_adjective_animal = "0.1.0"
#syntect = "2.1.0" #syntect = "2.1.0"

22
src/main.rs
View File

@ -1,15 +1,15 @@
#![feature(plugin, decl_macro, custom_derive)] #![feature(proc_macro_hygiene, decl_macro)]
#![plugin(rocket_codegen)]
#[macro_use]
extern crate rocket; extern crate rocket;
extern crate adjective_adjective_animal; extern crate adjective_adjective_animal;
extern crate multipart; //extern crate multipart;
extern crate toml; extern crate toml;
#[macro_use] #[macro_use]
extern crate serde_derive; extern crate serde_derive;
mod paste_id; mod paste_id;
mod mpu; //mod mpu;
#[cfg(test)] mod tests; #[cfg(test)] mod tests;
use std::io; use std::io;
@ -28,7 +28,7 @@ use rocket::request::{self, Request, FromRequest, State, LenientForm};
use rocket::outcome::Outcome::*; use rocket::outcome::Outcome::*;
use paste_id::PasteID; use paste_id::PasteID;
use mpu::MultipartUpload; //use mpu::MultipartUpload;
const HOST: &'static str = "http://localhost:8000"; const HOST: &'static str = "http://localhost:8000";
@ -139,7 +139,7 @@ trait Backend: Sync + Send {
fn upload(&self, paste: Data, _key: Option<PasteID>) -> Result<String>; fn upload(&self, paste: Data, _key: Option<PasteID>) -> Result<String>;
fn upload_multipart(&self, paste: MultipartUpload) -> Result<String>; // fn upload_multipart(&self, paste: MultipartUpload) -> Result<String>;
fn upload_string(&self, paste: &PasteForm) -> Result<String>; fn upload_string(&self, paste: &PasteForm) -> Result<String>;
@ -180,14 +180,14 @@ impl Backend for DefaultBackend {
paste.stream_to_file(Path::new(&filename))?; paste.stream_to_file(Path::new(&filename))?;
Ok(url) Ok(url)
} }
/*
fn upload_multipart(&self, paste: MultipartUpload) -> Result<String> { fn upload_multipart(&self, paste: MultipartUpload) -> Result<String> {
let (filename, info_filename, url) = self.new_paste(); let (filename, info_filename, url) = self.new_paste();
PasteInfo::default().write(info_filename)?; PasteInfo::default().write(info_filename)?;
paste.stream_to_file(Path::new(&filename))?; paste.stream_to_file(Path::new(&filename))?;
Ok(url) Ok(url)
} }
*/
fn upload_string(&self, paste: &PasteForm) -> Result<String> { fn upload_string(&self, paste: &PasteForm) -> Result<String> {
let (filename, info_filename, url) = self.new_paste(); let (filename, info_filename, url) = self.new_paste();
PasteInfo::from(paste).write(info_filename)?; PasteInfo::from(paste).write(info_filename)?;
@ -265,14 +265,16 @@ impl<'a> From<&'a PasteForm> for PasteInfo<'a> {
// todo: change /w to /, shouldn't conflict because of format, but it does currently // todo: change /w to /, shouldn't conflict because of format, but it does currently
#[post("/w", format = "application/x-www-form-urlencoded", data = "<paste>")] #[post("/w", format = "application/x-www-form-urlencoded", data = "<paste>")]
fn web_post(backend: &Backend, paste: LenientForm<PasteForm>) -> Result<String> { fn web_post(backend: &Backend, paste: LenientForm<PasteForm>) -> Result<String> {
backend.upload_string(paste.get()) backend.upload_string(&paste.into_inner())
} }
/*
// todo: change /w to /, shouldn't conflict because of format, but it does currently // todo: change /w to /, shouldn't conflict because of format, but it does currently
#[post("/m", format = "multipart/form-data", data = "<paste>")] #[post("/m", format = "multipart/form-data", data = "<paste>")]
fn mpu_post(backend: &Backend, paste: MultipartUpload) -> Result<String> { fn mpu_post(backend: &Backend, paste: MultipartUpload) -> Result<String> {
backend.upload_multipart(paste) backend.upload_multipart(paste)
} }
*/
#[put("/", data = "<paste>")] #[put("/", data = "<paste>")]
fn upload_put(backend: &Backend, paste: Data) -> Result<String> { fn upload_put(backend: &Backend, paste: Data) -> Result<String> {
@ -330,7 +332,7 @@ fn rocket() -> rocket::Rocket {
rocket::ignite().mount("/", routes![ rocket::ignite().mount("/", routes![
index, files, index, files,
web_post, web_post,
mpu_post, // mpu_post,
upload_post, upload_put, upload_patch, upload_post, upload_put, upload_patch,
upload_post_key, upload_put_key, upload_patch_key, upload_post_key, upload_put_key, upload_patch_key,
get, delete get, delete