thm
/
gardenserver
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

fix clippy

master
Tomáš Mládek 2021-10-04 20:32:35 +02:00
parent fe8046cf58
commit 976610d06f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.rs
View File

@ -196,7 +196,7 @@ async fn render(
// If the path is not a markdown file (e.g. photos), just return it as it is. // If the path is not a markdown file (e.g. photos), just return it as it is.
if full_path.exists() && !path.ends_with(".md") { if full_path.exists() && !path.ends_with(".md") {
return Ok(NamedFile::open(full_path)?.into_response(&request)?); return NamedFile::open(full_path)?.into_response(&request);
} }
// Otherwise, retrieve it and check backlinks // Otherwise, retrieve it and check backlinks
@ -230,7 +230,7 @@ async fn render(
}; };
let page = if path.as_str() != "!graph" { let page = if path.as_str() != "!graph" {
cache.pages.get(path.as_ref()).clone() cache.pages.get(path.as_ref())
} else { } else {
let mut context = Context::new(); let mut context = Context::new();
@ -239,7 +239,7 @@ async fn render(
let page_ids: Vec<String> = cache.pages.keys().map(|n| normalize_name(n)).collect(); let page_ids: Vec<String> = cache.pages.keys().map(|n| normalize_name(n)).collect();
&cache.pages.iter().for_each(|(path, page)| { cache.pages.iter().for_each(|(path, page)| {
let normalized_path = normalize_name(path); let normalized_path = normalize_name(path);
nodes.push( nodes.push(
[("id".to_string(), normalized_path.clone())] [("id".to_string(), normalized_path.clone())]
@ -280,9 +280,9 @@ async fn render(
.pages .pages
.clone() .clone()
.into_iter() .into_iter()
.filter_map(|(path, page)| match page.timestamp { .filter_map(|(path, page)| {
Some(ts) => Some((path, SystemTime::now().duration_since(ts).unwrap())), page.timestamp
None => None, .map(|ts| (path, SystemTime::now().duration_since(ts).unwrap()))
}) })
.collect::<Vec<(String, Duration)>>(); .collect::<Vec<(String, Duration)>>();
recently_changed.sort_by_key(|i| i.1); recently_changed.sort_by_key(|i| i.1);
@ -430,7 +430,7 @@ fn update_garden<P: AsRef<Path>>(
); );
} }
let result = GardenCache { files, pages }; let result = GardenCache { pages, files };
trace!("{:#?}", result); trace!("{:#?}", result);
Ok(result) Ok(result)
} }
@ -576,5 +576,5 @@ fn postprocess_html<T: AsRef<str>>(document: T) -> anyhow::Result<String> {
fn normalize_name(filename: &str) -> String { fn normalize_name(filename: &str) -> String {
let decoded = percent_decode_str(filename).decode_utf8_lossy(); let decoded = percent_decode_str(filename).decode_utf8_lossy();
let result = decoded.strip_suffix(".md"); let result = decoded.strip_suffix(".md");
String::from(result.unwrap_or(decoded.as_ref())) String::from(result.unwrap_or_else(|| decoded.as_ref()))
} }