andrey/album
1
0
Fork 0
Code Issues 10 Pull Requests Packages Projects Releases Wiki Activity

Very minor cleanup.

Browse Source 
res.set can set multiple headers in one call by using a tuple.
This commit is contained in:
Rasmus Kaj 2017-07-27 17:37:22 +02:00
parent 48e76da129
commit 32bf0c0aa8
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.rs
View File

@ -202,15 +202,13 @@ fn show_image<'mw>(req: &Request,
if size == SizeTag::Large { if size == SizeTag::Large {
if req.authorized_user().is_some() { if req.authorized_user().is_some() {
let path = req.photos().get_raw_path(tphoto); let path = req.photos().get_raw_path(tphoto);
res.set(MediaType::Jpeg); res.set((MediaType::Jpeg, far_expires()));
res.set(far_expires());
return res.send_file(path); return res.send_file(path);
} }
} else { } else {
let data = get_image_data(req, tphoto, size) let data = get_image_data(req, tphoto, size)
.expect("Get image data"); .expect("Get image data");
res.set(MediaType::Jpeg); res.set((MediaType::Jpeg, far_expires()));
res.set(far_expires());
return res.send(data); return res.send(data);
} }
} }
@ -309,8 +307,7 @@ fn static_file<'mw>(_req: &mut Request,
-> MiddlewareResult<'mw> { -> MiddlewareResult<'mw> {
use templates::statics::StaticFile; use templates::statics::StaticFile;
if let Some(s) = StaticFile::get(&format!("{}.{}", name, ext)) { if let Some(s) = StaticFile::get(&format!("{}.{}", name, ext)) {
res.set(ContentType(s.mime())); res.set((ContentType(s.mime()), far_expires()));
res.set(far_expires());
return res.send(s.content); return res.send(s.content);
} }
res.not_found("No such file") res.not_found("No such file")