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

#60 ranges support

This commit is contained in:
Your Name 2018-02-23 01:55:46 +01:00
parent 962d8acd2f
commit 1a9c51cb19
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/error.rs
View File

@ -627,6 +627,12 @@ pub fn ErrorPreconditionFailed<T>(err: T) -> InternalError<T> {
InternalError::new(err, StatusCode::PRECONDITION_FAILED) InternalError::new(err, StatusCode::PRECONDITION_FAILED)
} }
/// Helper function that creates wrapper of any error and generate *RANGE NOT SATISFIABLE* response.
#[allow(non_snake_case)]
pub fn ErrorRangeNotSatisfiable<T>(err: T) -> InternalError<T> {
InternalError::new(err, StatusCode::RANGE_NOT_SATISFIABLE)
}
/// Helper function that creates wrapper of any error and generate *EXPECTATION FAILED* response. /// Helper function that creates wrapper of any error and generate *EXPECTATION FAILED* response.
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn ErrorExpectationFailed<T>(err: T) -> InternalError<T> { pub fn ErrorExpectationFailed<T>(err: T) -> InternalError<T> {

21
src/fs.rs
View File

@ -85,13 +85,20 @@ impl Responder for NamedFile {
type Error = io::Error; type Error = io::Error;
fn respond_to(mut self, req: HttpRequest) -> Result<HttpResponse, io::Error> { fn respond_to(mut self, req: HttpRequest) -> Result<HttpResponse, io::Error> {
<<<<<<< HEAD
if let Some(rangeheader) = req.headers().get(header::RANGE) { if let Some(rangeheader) = req.headers().get(header::RANGE) {
let file_metadata = metadata(self.0)?; let file_metadata = metadata(self.0)?;
if let Ok(ranges) = HttpRange::parse(try!(rangeheader.to_str()), file_metadata.len()) { if let Ok(ranges) = HttpRange::parse(try!(rangeheader.to_str()), file_metadata.len()) {
=======
if let Ok(rangeheader) = req.headers().get("range").unwrap().to_str() {
let file_metadata = metadata(self.0)?;
if let Ok(ranges) = HttpRange::parse(rangeheader, file_metadata.len()) {
>>>>>>> de7c05c... #60: Basic Ranges header support
let mut resp = HTTPPartialContent.build(); let mut resp = HTTPPartialContent.build();
let length: usize = ranges[0].length as usize; let length: usize = ranges[0].length as usize;
let mut data: Vec<u8> = vec![0u8; length]; let mut data: Vec<u8> = vec![0u8; length];
let _ = &self.1.seek(SeekFrom::Start(ranges[0].start))?; let _ = &self.1.seek(SeekFrom::Start(ranges[0].start))?;
<<<<<<< HEAD
let _ = self.1.read_exact(&mut data)?; let _ = self.1.read_exact(&mut data)?;
Ok(resp Ok(resp
.header(header::CONTENT_RANGE, format!("bytes {}-{}/{}", ranges[0].start, ranges[0].start + ranges[0].length, file_metadata.len()).as_str()) .header(header::CONTENT_RANGE, format!("bytes {}-{}/{}", ranges[0].start, ranges[0].start + ranges[0].length, file_metadata.len()).as_str())
@ -108,6 +115,20 @@ impl Responder for NamedFile {
resp.content_encoding(ContentEncoding::Identity); resp.content_encoding(ContentEncoding::Identity);
if let Some(ext) = self.path().extension() { if let Some(ext) = self.path().extension() {
let mime = get_mime_type(&ext.to_string_lossy()); let mime = get_mime_type(&ext.to_string_lossy());
=======
let _ = self.1.read_exact(&mut data);
Ok(resp.body(data).unwrap())
} else {
Ok(HTTPRangeNotSatisfiable.build()
.header(header::CONTENT_RANGE, format!("0-{}", file_metadata.len()).as_str())
.body("").unwrap())
}
} else {
let mut resp = HTTPOk.build();
resp.content_encoding(ContentEncoding::Identity);
if let Some(ext) = self.path().extension() {
let mime = get_mime_type(&ext.to_string_lossy());
>>>>>>> de7c05c... #60: Basic Ranges header support
resp.content_type(format!("{}", mime).as_str()); resp.content_type(format!("{}", mime).as_str());
} }
let mut data = Vec::new(); let mut data = Vec::new();