aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix theme caching (#647)

Browse Source
This commit is contained in:
Ana Gelez 2019-08-21 21:41:11 +02:00 committed by GitHub
parent a6c84daa1a
commit 28fb50438e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -2084,7 +2084,6 @@ dependencies = [
"serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
"shrinkwraprs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "shrinkwraprs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"tantivy 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "tantivy 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)",

12
src/routes/mod.rs
View File

@ -13,7 +13,6 @@ use rocket::{
use std::{ use std::{
collections::hash_map::DefaultHasher, collections::hash_map::DefaultHasher,
hash::Hasher, hash::Hasher,
io::Read,
path::{Path, PathBuf}, path::{Path, PathBuf},
}; };
use template_utils::Ructe; use template_utils::Ructe;
@ -177,14 +176,11 @@ pub struct CachedFile {
pub struct ThemeFile(NamedFile); pub struct ThemeFile(NamedFile);
impl<'r> Responder<'r> for ThemeFile { impl<'r> Responder<'r> for ThemeFile {
fn respond_to(mut self, r: &Request) -> response::Result<'r> { fn respond_to(self, r: &Request) -> response::Result<'r> {
let mut contents = String::new(); let contents = std::fs::read(self.0.path()).map_err(|_| Status::InternalServerError)?;
self.0
.read_to_string(&mut contents)
.map_err(|_| Status::InternalServerError)?;
let mut hasher = DefaultHasher::new(); let mut hasher = DefaultHasher::new();
hasher.write(&contents.as_bytes()); hasher.write(&contents);
let etag = format!("{:x}", hasher.finish()); let etag = format!("{:x}", hasher.finish());
if r.headers() if r.headers()
@ -206,7 +202,7 @@ impl<'r> Responder<'r> for ThemeFile {
#[get("/static/cached/<_build_id>/css/<file..>", rank = 1)] #[get("/static/cached/<_build_id>/css/<file..>", rank = 1)]
pub fn theme_files(file: PathBuf, _build_id: &RawStr) -> Option<ThemeFile> { pub fn theme_files(file: PathBuf, _build_id: &RawStr) -> Option<ThemeFile> {
NamedFile::open(Path::new("static/").join(file)) NamedFile::open(Path::new("static/css/").join(file))
.ok() .ok()
.map(ThemeFile) .map(ThemeFile)
} }