matthiasbeyer
/
imag
1
0
Fork 0
Code Releases Activity

Auto merge of #65 - matthiasbeyer:fix-module-parser, r=matthiasbeyer 

Remove parser variable from Notes::command_show()

Was still there because of the merge order.
This commit is contained in:
Homu 2016-01-07 01:04:23 +09:00
parent e345abf007 9425741061
commit aaf3660f31
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/module/notes/mod.rs
View File

@ -125,8 +125,6 @@ impl<'a> Notes<'a> {
use self::header::get_name_from_header; use self::header::get_name_from_header;
use self::header::get_tags_from_header; use self::header::get_tags_from_header;
let parser = Parser::new(JsonHeaderParser::new(None));
let filter = { let filter = {
let hash_filter = create_hash_filter(matches, "id", true); let hash_filter = create_hash_filter(matches, "id", true);
let head_filter = create_text_header_field_grep_filter(matches, "match", "NAME", true); let head_filter = create_text_header_field_grep_filter(matches, "match", "NAME", true);
@ -137,7 +135,7 @@ impl<'a> Notes<'a> {
self.rt self.rt
.store() .store()
.load_for_module(self, &parser) .load_for_module(self, &self.parser)
.into_iter() .into_iter()
.filter(|file| { .filter(|file| {
let res = filter.filter_file(file); let res = filter.filter_file(file);
@ -148,7 +146,7 @@ impl<'a> Notes<'a> {
let content = file.deref().borrow().data().clone(); let content = file.deref().borrow().data().clone();
let text = if matches.is_present("plain") { let text = if matches.is_present("plain") {
parser.write((file.deref().borrow().header(), &content)) self.parser.write((file.deref().borrow().header(), &content))
.unwrap_or(format!("Parser error for file: {}", file.deref().borrow().id())) .unwrap_or(format!("Parser error for file: {}", file.deref().borrow().id()))
} else { } else {
let tags = get_tags_from_header(file.deref().borrow().header()); let tags = get_tags_from_header(file.deref().borrow().header());