Basic Ranges header support

This commit is contained in:
Your Name 2018-02-23 02:53:16 +01:00
parent aff43cc8b8
commit 3ccfc10f0f
2 changed files with 44 additions and 13 deletions

View File

@ -2,9 +2,9 @@
// //! TODO: needs to re-implement actual files handling, current impl blocks
use std::io;
use std::io::Read;
use std::io::{Read, Seek, SeekFrom};
use std::fmt::Write;
use std::fs::{File, DirEntry};
use std::fs::{File, DirEntry, metadata};
use std::path::{Path, PathBuf};
use std::ops::{Deref, DerefMut};
@ -12,10 +12,11 @@ use mime_guess::get_mime_type;
use param::FromParam;
use handler::{Handler, Responder};
use headers::ContentEncoding;
use headers::{ContentEncoding, HttpRange};
use http::header;
use httprequest::HttpRequest;
use httpresponse::HttpResponse;
use httpcodes::{HTTPOk, HTTPFound};
use httpcodes::{HTTPOk, HTTPFound, HTTPPartialContent, HTTPRangeNotSatisfiable};
/// A file with an associated name; responds with the Content-Type based on the
/// file extension.
@ -83,8 +84,36 @@ impl Responder for NamedFile {
type Item = HttpResponse;
type Error = io::Error;
fn respond_to(mut self, _: HttpRequest) -> Result<HttpResponse, io::Error> {
fn respond_to(mut self, req: HttpRequest) -> Result<HttpResponse, io::Error> {
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_or(""), file_metadata.len()) {
let mut resp = HTTPPartialContent.build();
let length: usize = ranges[0].length as usize;
let mut data: Vec<u8> = vec![0u8; length];
if let Some(ext) = self.path().extension() {
let mime = get_mime_type(&ext.to_string_lossy());
resp.content_type(format!("{}", mime).as_str());
}
let _ = &self.1.seek(SeekFrom::Start(ranges[0].start))?;
let _ = self.1.read_exact(&mut data)?;
Ok(resp
.header(header::CONTENT_RANGE,
format!("bytes {}-{}/{}",
ranges[0].start,
ranges[0].start + ranges[0].length,
file_metadata.len()).as_str())
.body(data).unwrap())
} else {
Ok(HTTPRangeNotSatisfiable.build()
.header(header::CONTENT_RANGE,
format!("bytes */{}", file_metadata.len()).as_str())
.header(header::ACCEPT_RANGES, "bytes")
.finish().unwrap())
}
} else {
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());
@ -95,6 +124,7 @@ impl Responder for NamedFile {
Ok(resp.body(data).unwrap())
}
}
}
/// A directory; responds with the generated directory listing.
#[derive(Debug)]

View File

@ -162,6 +162,7 @@ impl HttpResponse {
STATIC_RESP!(PreconditionFailed, StatusCode::PRECONDITION_FAILED);
STATIC_RESP!(PayloadTooLarge, StatusCode::PAYLOAD_TOO_LARGE);
STATIC_RESP!(UriTooLong, StatusCode::URI_TOO_LONG);
STATIC_RESP!(RangeNotSatisfiable, StatusCode::RANGE_NOT_SATISFIABLE);
STATIC_RESP!(ExpectationFailed, StatusCode::EXPECTATION_FAILED);
STATIC_RESP!(InternalServerError, StatusCode::INTERNAL_SERVER_ERROR);