emelie/zola
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Clippy run

Browse source
This commit is contained in:
Vincent Prouillet 2017-04-22 12:35:11 +09:00
parent fb7b5646ca
commit 1c9e078154
3 changed files with 28 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/markdown.rs
View file

@ -37,7 +37,7 @@ lazy_static!{
}; };
} }
/// A ShortCode that has a body /// A shortcode that has a body
/// Called by having some content like {% ... %} body {% end %} /// Called by having some content like {% ... %} body {% end %}
/// We need the struct to hold the data while we're processing the markdown /// We need the struct to hold the data while we're processing the markdown
#[derive(Debug)] #[derive(Debug)]
@ -62,7 +62,7 @@ impl ShortCode {
pub fn render(&self, tera: &Tera) -> Result<String> { pub fn render(&self, tera: &Tera) -> Result<String> {
let mut context = Context::new(); let mut context = Context::new();
for (key, value) in self.args.iter() { for (key, value) in &self.args {
context.add(key, value); context.add(key, value);
} }
context.add("body", &self.body); context.add("body", &self.body);
@ -132,7 +132,7 @@ pub fn markdown_to_html(content: &str, permalinks: &HashMap<String, String>, ter
// for example an article could have several titles named Example // for example an article could have several titles named Example
// We add a counter after the slug if the slug is already present, which // We add a counter after the slug if the slug is already present, which
// means we will have example, example-1, example-2 etc // means we will have example, example-1, example-2 etc
fn find_anchor(anchors: &Vec<String>, name: String, level: u8) -> String { fn find_anchor(anchors: &[String], name: String, level: u8) -> String {
if level == 0 && !anchors.contains(&name) { if level == 0 && !anchors.contains(&name) {
return name.to_string(); return name.to_string();
} }
@ -164,16 +164,14 @@ pub fn markdown_to_html(content: &str, permalinks: &HashMap<String, String>, ter
} }
// Shortcode without body // Shortcode without body
if shortcode_block.is_none() && text.starts_with("{{") && text.ends_with("}}") { if shortcode_block.is_none() && text.starts_with("{{") && text.ends_with("}}") && SHORTCODE_RE.is_match(&text) {
if SHORTCODE_RE.is_match(&text) { let (name, args) = parse_shortcode(&text);
let (name, args) = parse_shortcode(&text); added_shortcode = true;
added_shortcode = true; match render_simple_shortcode(tera, &name, &args) {
match render_simple_shortcode(tera, &name, &args) { Ok(s) => return Event::Html(Owned(format!("</p>{}", s))),
Ok(s) => return Event::Html(Owned(format!("</p>{}", s))), Err(e) => {
Err(e) => { error = Some(e);
error = Some(e); return Event::Html(Owned("".to_string()));
return Event::Html(Owned("".to_string()));
}
} }
} }
// non-matching will be returned normally below // non-matching will be returned normally below
@ -277,7 +275,7 @@ pub fn markdown_to_html(content: &str, permalinks: &HashMap<String, String>, ter
}; };
} }
return Event::Start(Tag::Link(link.clone(), title.clone())); Event::Start(Tag::Link(link.clone(), title.clone()))
}, },
// need to know when we are in a code block to disable shortcodes in them // need to know when we are in a code block to disable shortcodes in them
Event::Start(Tag::Code) => { Event::Start(Tag::Code) => {
@ -291,7 +289,7 @@ pub fn markdown_to_html(content: &str, permalinks: &HashMap<String, String>, ter
Event::Start(Tag::Header(num)) => { Event::Start(Tag::Header(num)) => {
in_header = true; in_header = true;
// ugly eh // ugly eh
return Event::Html(Owned(format!("<h{} ", num))); Event::Html(Owned(format!("<h{} ", num)))
}, },
Event::End(Tag::Header(_)) => { Event::End(Tag::Header(_)) => {
in_header = false; in_header = false;

25
src/page.rs
View file

@ -152,22 +152,21 @@ impl Page {
// Pages with custom urls exists outside of sections // Pages with custom urls exists outside of sections
if let Some(ref u) = page.meta.url { if let Some(ref u) = page.meta.url {
page.path = u.trim().to_string(); page.path = u.trim().to_string();
} else { } else if !page.components.is_empty() {
if !page.components.is_empty() { // If we have a folder with an asset, don't consider it as a component
// If we have a folder with an asset, don't consider it as a component if page.file_name == "index" {
if page.file_name == "index" { page.components.pop();
page.components.pop(); // also set parent_path to grandparent instead
// also set parent_path to grandparent instead page.parent_path = page.parent_path.parent().unwrap().to_path_buf();
page.parent_path = page.parent_path.parent().unwrap().to_path_buf();
}
// Don't add a trailing slash to sections
page.path = format!("{}/{}", page.components.join("/"), page.slug);
} else {
page.path = page.slug.clone();
} }
// Don't add a trailing slash to sections
page.path = format!("{}/{}", page.components.join("/"), page.slug);
} else {
page.path = page.slug.clone();
} }
page.permalink = config.make_permalink(&page.path); page.permalink = config.make_permalink(&page.path);
Ok(page) Ok(page)

6
tests/front_matter.rs
View file

@ -53,10 +53,10 @@ authors = ["Bob", "Alice"]"#;
assert_eq!(res.title, "Hello".to_string()); assert_eq!(res.title, "Hello".to_string());
assert_eq!(res.slug.unwrap(), "hello-world".to_string()); assert_eq!(res.slug.unwrap(), "hello-world".to_string());
let extra = res.extra.unwrap(); let extra = res.extra.unwrap();
assert_eq!(extra.get("language").unwrap(), &to_value("en").unwrap()); assert_eq!(extra["language"], to_value("en").unwrap());
assert_eq!( assert_eq!(
extra.get("authors").unwrap(), extra["authors"],
&to_value(["Bob".to_string(), "Alice".to_string()]).unwrap() to_value(["Bob".to_string(), "Alice".to_string()]).unwrap()
); );
} }