actix/examples
1
0
Fork 0
mirror of https://github.com/actix/examples synced 2024-11-27 16:02:57 +01:00
Code Issues Releases Wiki Activity

Merge pull request #107 from xaxoxa/patch-2

Browse Source 
Revert to alpha3 multipart example to avoid panic
This commit is contained in:
Nikolay Kim 2019-04-08 08:40:10 -07:00 committed by GitHub
commit 4bec1ede67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
multipart/src/main.rs
View File

@ -1,11 +1,10 @@
use std::cell::Cell; use std::cell::Cell;
use std::fs::{self, File}; use std::fs::{self};
use std::io::Write; use std::io::Write;
use std::path::Path;
use actix_multipart::{Field, Item, Multipart, MultipartError}; use actix_multipart::{Field, Item, Multipart, MultipartError};
use actix_web::{error, middleware, web, App, Error, HttpResponse, HttpServer}; use actix_web::{error, middleware, web, App, Error, HttpResponse, HttpServer};
use futures::future::{err, ok, Either}; use futures::future::{err, Either};
use futures::{Future, Stream}; use futures::{Future, Stream};
pub struct AppState { pub struct AppState {
@ -16,12 +15,11 @@ pub fn save_file(field: Field) -> impl Future<Item = i64, Error = Error> {
let file_path_string = "upload.png"; let file_path_string = "upload.png";
let mut file = match fs::File::create(file_path_string) { let mut file = match fs::File::create(file_path_string) {
Ok(file) => file, Ok(file) => file,
Err(e) => return Either::A(err(error::ErrorInternalServerError(e))), Err(e) => return Either::A(err(error::ErrorInternalServerError(e)))
}; };
Either::B( Either::B(
field field
.fold(0i64, move |acc, bytes| { .fold(0i64, move |acc, bytes| {
println!("CHUNK: {:?}", bytes.len());
file.write_all(bytes.as_ref()) file.write_all(bytes.as_ref())
.map(|_| acc + bytes.len() as i64) .map(|_| acc + bytes.len() as i64)
.map_err(|e| { .map_err(|e| {
@ -51,43 +49,18 @@ pub fn upload(
multipart: Multipart, multipart: Multipart,
counter: web::Data<Cell<usize>>, counter: web::Data<Cell<usize>>,
) -> impl Future<Item = HttpResponse, Error = Error> { ) -> impl Future<Item = HttpResponse, Error = Error> {
counter.set(counter.get() + 1);
println!("{:?}", counter.get());
multipart multipart
.from_err::<Error>() .map_err(error::ErrorInternalServerError)
.take(1) .map(handle_multipart_item)
.flatten()
.collect() .collect()
.map(|v| v.into_iter().next().expect("wat")) .map(|sizes| HttpResponse::Ok().json(sizes))
.and_then(|item| match item { .map_err(|e| {
Item::Field(field) => { println!("failed: {}", e);
if let Some(disp) = field.content_disposition() { e
if let Some(disp_fn) = disp.get_filename() {
if let Some(ext) = Path::new(&disp_fn).extension() {
let fname = format!("{}.{}", 10, ext.to_string_lossy());
let pth = Path::new("./").join(&fname);
if let Ok(mut ff) = File::create(&pth) {
return Either::A(
field
.from_err::<Error>()
.map(move |c| ff.write_all(&c))
.fold((), |_, _| Ok::<_, Error>(()))
//.finish()
.and_then(move |_| {
ok(HttpResponse::Created().body(format!(
"{{\"path\": \"{}\"}}",
fname
)))
})
.or_else(|_| {
ok(HttpResponse::InternalServerError()
.finish())
}),
);
}
}
}
}
Either::B(ok(HttpResponse::BadRequest().finish()))
}
Item::Nested(_) => Either::B(ok(HttpResponse::BadRequest().finish())),
}) })
} }