matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Include tags in rendered output

Browse source
This commit is contained in:
Matthias Beyer 2016-01-05 15:35:20 +01:00
parent 3b31fbfa3e
commit 34a2b75b89
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/module/notes/mod.rs
View file

@ -131,6 +131,7 @@ impl<'a> Notes<'a> {
use open; use open;
use self::header::get_name_from_header; use self::header::get_name_from_header;
use self::header::get_tags_from_header;
use ui::external::get_tempfile; use ui::external::get_tempfile;
use module::helpers::content::markdown::MarkdownParser; use module::helpers::content::markdown::MarkdownParser;
@ -159,10 +160,19 @@ impl<'a> Notes<'a> {
let tmpcontent = files.fold(String::new(), |acc, file| { let tmpcontent = files.fold(String::new(), |acc, file| {
let heading = { let heading = {
let name = get_name_from_header(file.deref().borrow().header()); let name = get_name_from_header(file.deref().borrow().header());
if name.len() == 0 { let tagsstr = {
format!("# {}", file.deref().borrow().id) let tags = get_tags_from_header(file.deref().borrow().header());
if tags.len() != 0 {
format!(" <small>(<i>{}</i>)</small>", tags.join(", "))
} else { } else {
format!("# {} <small>({})</small>", name, file.deref().borrow().id()) format!(" <small>(No Tags)</small>")
}
};
if name.len() == 0 {
format!("<h1>{}</h1>{}", file.deref().borrow().id, tagsstr)
} else {
format!("<h1>{}</h1> <small>({})</small>{}",
name, file.deref().borrow().id(), tagsstr)
} }
}; };
@ -191,8 +201,18 @@ impl<'a> Notes<'a> {
} }
}; };
let content = format!("# {}\n\n{}", let tagsstr = {
let tags = get_tags_from_header(file.deref().borrow().header());
if tags.len() != 0 {
format!(" <small>(<i>{}</i>)</small>", tags.join(", "))
} else {
format!(" <small>(No Tags)</small>")
}
};
let content = format!("<h1>{}</h1>{}\n\n{}",
get_name_from_header(file.deref().borrow().header()), get_name_from_header(file.deref().borrow().header()),
tagsstr,
file.deref().borrow().data()); file.deref().borrow().data());
let html = MarkdownParser::new(&content).to_html_page(); let html = MarkdownParser::new(&content).to_html_page();