MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-04-23 12:05:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

gzip json responses, handle HEAD properly

Browse Source
This commit is contained in:
Scott Lamb 2018-01-23 11:22:23 -08:00
parent 8caa2e5d0e
commit 2c62d977b0
1 changed files with 25 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/web.rs
View File

@ -183,9 +183,9 @@ impl ServiceInner {
.with_body(body)) .with_body(body))
} }
fn top_level(&self, query: Option<&str>) -> Result<Response<slices::Body>, Error> { fn top_level(&self, req: &Request) -> Result<Response<slices::Body>, Error> {
let mut days = false; let mut days = false;
if let Some(q) = query { if let Some(q) = req.uri().query() {
for (key, value) in form_urlencoded::parse(q.as_bytes()) { for (key, value) in form_urlencoded::parse(q.as_bytes()) {
let (key, value) : (_, &str) = (key.borrow(), value.borrow()); let (key, value) : (_, &str) = (key.borrow(), value.borrow());
match key { match key {
@ -195,42 +195,34 @@ impl ServiceInner {
} }
} }
let buf = { let mut resp = Response::new().with_header(header::ContentType(mime::APPLICATION_JSON));
if let Some(mut w) = http_serve::streaming_body(&req, &mut resp).build() {
let db = self.db.lock(); let db = self.db.lock();
serde_json::to_vec(&json::TopLevel { serde_json::to_writer(&mut w, &json::TopLevel {
time_zone_name: &self.time_zone_name, time_zone_name: &self.time_zone_name,
cameras: (db.cameras_by_id(), days), cameras: (db.cameras_by_id(), days),
})? })?;
}; }
let len = buf.len(); Ok(resp)
let body: slices::Body = Box::new(stream::once(Ok(ARefs::new(buf))));
Ok(Response::new()
.with_header(header::ContentType(mime::APPLICATION_JSON))
.with_header(header::ContentLength(len as u64))
.with_body(body))
} }
fn camera(&self, uuid: Uuid) -> Result<Response<slices::Body>, Error> { fn camera(&self, req: &Request, uuid: Uuid) -> Result<Response<slices::Body>, Error> {
let buf = { let mut resp = Response::new().with_header(header::ContentType(mime::APPLICATION_JSON));
if let Some(mut w) = http_serve::streaming_body(&req, &mut resp).build() {
let db = self.db.lock(); let db = self.db.lock();
let camera = db.get_camera(uuid) let camera = db.get_camera(uuid)
.ok_or_else(|| Error::new("no such camera".to_owned()))?; .ok_or_else(|| Error::new("no such camera".to_owned()))?;
serde_json::to_vec(&json::Camera::new(camera, true))? serde_json::to_writer(&mut w, &json::Camera::new(camera, true))?
}; };
let len = buf.len(); Ok(resp)
let body: slices::Body = Box::new(stream::once(Ok(ARefs::new(buf))));
Ok(Response::new()
.with_header(header::ContentType(mime::APPLICATION_JSON))
.with_header(header::ContentLength(len as u64))
.with_body(body))
} }
fn camera_recordings(&self, uuid: Uuid, query: Option<&str>) fn camera_recordings(&self, req: &Request, uuid: Uuid)
-> Result<Response<slices::Body>, Error> { -> Result<Response<slices::Body>, Error> {
let (r, split) = { let (r, split) = {
let mut time = recording::Time(i64::min_value()) .. recording::Time(i64::max_value()); let mut time = recording::Time(i64::min_value()) .. recording::Time(i64::max_value());
let mut split = recording::Duration(i64::max_value()); let mut split = recording::Duration(i64::max_value());
if let Some(q) = query { if let Some(q) = req.uri().query() {
for (key, value) in form_urlencoded::parse(q.as_bytes()) { for (key, value) in form_urlencoded::parse(q.as_bytes()) {
let (key, value) = (key.borrow(), value.borrow()); let (key, value) = (key.borrow(), value.borrow());
match key { match key {
@ -264,13 +256,11 @@ impl ServiceInner {
Ok(()) Ok(())
})?; })?;
} }
let buf = serde_json::to_vec(&out)?; let mut resp = Response::new().with_header(header::ContentType(mime::APPLICATION_JSON));
let len = buf.len(); if let Some(mut w) = http_serve::streaming_body(&req, &mut resp).build() {
let body: slices::Body = Box::new(stream::once(Ok(ARefs::new(buf)))); serde_json::to_writer(&mut w, &out)?
Ok(Response::new() };
.with_header(header::ContentType(mime::APPLICATION_JSON)) Ok(resp)
.with_header(header::ContentLength(len as u64))
.with_body(body))
} }
fn init_segment(&self, sha1: [u8; 20], req: &Request) -> Result<Response<slices::Body>, Error> { fn init_segment(&self, sha1: [u8; 20], req: &Request) -> Result<Response<slices::Body>, Error> {
@ -459,9 +449,9 @@ impl server::Service for Service {
debug!("request on: {}", req.uri()); debug!("request on: {}", req.uri());
let res = match decode_path(req.uri().path()) { let res = match decode_path(req.uri().path()) {
Path::InitSegment(sha1) => self.0.init_segment(sha1, &req), Path::InitSegment(sha1) => self.0.init_segment(sha1, &req),
Path::TopLevel => self.0.top_level(req.uri().query()), Path::TopLevel => self.0.top_level(&req),
Path::Camera(uuid) => self.0.camera(uuid), Path::Camera(uuid) => self.0.camera(&req, uuid),
Path::CameraRecordings(uuid) => self.0.camera_recordings(uuid, req.uri().query()), Path::CameraRecordings(uuid) => self.0.camera_recordings(&req, uuid),
Path::CameraViewMp4(uuid) => { Path::CameraViewMp4(uuid) => {
self.0.camera_view_mp4(uuid, mp4::Type::Normal, req.uri().query(), &req) self.0.camera_view_mp4(uuid, mp4::Type::Normal, req.uri().query(), &req)
}, },