berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Add content-range and accept-ranges header

This commit is contained in:
Your Name 2018-02-18 23:07:10 +01:00
parent e21f01c41d
commit 9e9ae13f25
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/fs.rs
View File

@ -85,7 +85,7 @@ impl Responder for NamedFile {
type Error = io::Error;
fn respond_to(mut self, req: HttpRequest) -> Result<HttpResponse, io::Error> {
if let Some(rangeheader) = req.headers().get("range") {
if let Some(rangeheader) = req.headers().get(header::RANGE) {
let file_metadata = metadata(self.0)?;
if let Ok(ranges) = HttpRange::parse(rangeheader.to_str().unwrap(), file_metadata.len()) {
let mut resp = HTTPPartialContent.build();
@ -93,14 +93,19 @@ impl Responder for NamedFile {
let mut data: Vec<u8> = vec![0u8; length];
let _ = &self.1.seek(SeekFrom::Start(ranges[0].start))?;
let _ = self.1.read_exact(&mut data);
Ok(resp.body(data).unwrap())
Ok(resp
.header(header::CONTENT_RANGE, format!("bytes {}-{}/{}", ranges[0].start, ranges[0].length, file_metadata.len()).as_str())
.body(data).unwrap())
} else {
Ok(HTTPRangeNotSatisfiable.build()
.header(header::CONTENT_RANGE, format!("0-{}", file_metadata.len()).as_str())
.header(header::CONTENT_RANGE, format!("bytes */{}", file_metadata.len()).as_str())
.header(header::ACCEPT_RANGES, "bytes")
.body("").unwrap())
}
} else {
//let file_metadata = metadata(self.0)?;
let mut resp = HTTPOk.build();
resp.header(header::ACCEPT_RANGES, "bytes");
resp.content_encoding(ContentEncoding::Identity);
if let Some(ext) = self.path().extension() {
let mime = get_mime_type(&ext.to_string_lossy());