tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

handle_static_file_download: optimize small files

Browse Source 
Avoid chuncked transfer for small files.
This commit is contained in:
Dietmar Maurer 2018-11-11 17:10:42 +01:00
parent 579fbe7dc8
commit 78d0783b00
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/main.rs
View File

@ -167,26 +167,40 @@ fn handle_sync_api_request<'a>(
fn handle_static_file_download(filename: PathBuf) -> BoxFut {
let response = File::open(filename)
.and_then(|file| {
let payload = tokio_codec::FramedRead::new(file, tokio_codec::BytesCodec::new()).
map(|bytes| {
//sigh - howto avoid copy here? or the whole map() ??
hyper::Chunk::from(bytes.to_vec())
});
let body = Body::wrap_stream(payload);
// fixme: set content type and other headers
Ok(Response::builder()
.status(StatusCode::OK)
.body(body)
.unwrap())
})
.or_else(|err| {
// fixme: set content type and other headers
Ok(Response::builder()
.status(StatusCode::NOT_FOUND)
.body(format!("File access problems: {}\n", err).into())
.unwrap())
let response = tokio::fs::metadata(filename.clone())
.map_err(|err| format_err!("File access problems: {}", err))
.and_then(|metadata| {
println!("TEST METADATA {:?} {}", metadata, metadata.len());
if metadata.len() < 1024*8 {
println!("SMALL SIZED FILE");
Either::A(File::open(filename)
.map_err(|err| format_err!("File open failed: {}", err))
.and_then(|file| {
let buf: Vec<u8> = Vec::new();
tokio::io::read_to_end(file, buf)
.map_err(|err| format_err!("File read failed: {}", err))
.and_then(|data| Ok(Response::new(data.1.into())))
}))
} else {
Either::B(
File::open(filename)
.map_err(|err| format_err!("File open failed: {}", err))
.and_then(|file| {
let payload = tokio_codec::FramedRead::new(file, tokio_codec::BytesCodec::new()).
map(|bytes| {
//sigh - howto avoid copy here? or the whole map() ??
hyper::Chunk::from(bytes.to_vec())
});
let body = Body::wrap_stream(payload);
// fixme: set content type and other headers
Ok(Response::builder()
.status(StatusCode::OK)
.body(body)
.unwrap())
}))
}
});
return Box::new(response);