matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

BM: Make parser module member

Browse source
This commit is contained in:
Matthias Beyer 2016-01-05 21:38:51 +01:00
parent fc7f2c0bb1
commit d25ee7ec8a
1 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/module/bm/mod.rs
View file

@ -7,7 +7,6 @@ use clap::ArgMatches;
use runtime::Runtime; use runtime::Runtime;
use module::Module; use module::Module;
use storage::parser::FileHeaderParser;
use storage::parser::Parser; use storage::parser::Parser;
use storage::json::parser::JsonHeaderParser; use storage::json::parser::JsonHeaderParser;
use module::helpers::cli::create_tag_filter; use module::helpers::cli::create_tag_filter;
@ -22,6 +21,7 @@ use self::header::get_tags_from_header;
pub struct BM<'a> { pub struct BM<'a> {
rt: &'a Runtime<'a>, rt: &'a Runtime<'a>,
parser: Parser<JsonHeaderParser>,
} }
impl<'a> BM<'a> { impl<'a> BM<'a> {
@ -29,6 +29,7 @@ impl<'a> BM<'a> {
pub fn new(rt: &'a Runtime<'a>) -> BM<'a> { pub fn new(rt: &'a Runtime<'a>) -> BM<'a> {
BM { BM {
rt: rt, rt: rt,
parser: Parser::new(JsonHeaderParser::new(None)),
} }
} }
@ -40,11 +41,9 @@ impl<'a> BM<'a> {
use std::process::exit; use std::process::exit;
use self::header::build_header; use self::header::build_header;
let parser = Parser::new(JsonHeaderParser::new(None));
let url = matches.value_of("url").map(String::from).unwrap(); // clap ensures this is present let url = matches.value_of("url").map(String::from).unwrap(); // clap ensures this is present
if !self.validate_url(&url, &parser) { if !self.validate_url(&url) {
error!("URL validation failed, exiting."); error!("URL validation failed, exiting.");
exit(1); exit(1);
} else { } else {
@ -66,12 +65,12 @@ impl<'a> BM<'a> {
let result = self.rt let result = self.rt
.store() .store()
.load(self, &parser, &fileid) .load(self, &self.parser, &fileid)
.map(|file| { .map(|file| {
info!("{}", Yellow.paint(format!("Created file in memory: {}", fileid))); info!("{}", Yellow.paint(format!("Created file in memory: {}", fileid)));
self.rt self.rt
.store() .store()
.persist(&parser, file) .persist(&self.parser, file)
}) })
.unwrap_or(false); .unwrap_or(false);
@ -84,8 +83,7 @@ impl<'a> BM<'a> {
result result
} }
fn validate_url<HP>(&self, url: &String, parser: &Parser<HP>) -> bool fn validate_url(&self, url: &String) -> bool
where HP: FileHeaderParser
{ {
use util::is_url; use util::is_url;
@ -96,7 +94,7 @@ impl<'a> BM<'a> {
let is_in_store = self.rt let is_in_store = self.rt
.store() .store()
.load_for_module(self, parser) .load_for_module(self, &self.parser)
.iter() .iter()
.any(|file| { .any(|file| {
let f = file.deref().borrow(); let f = file.deref().borrow();
@ -120,7 +118,6 @@ impl<'a> BM<'a> {
use ui::file::{FilePrinter, TablePrinter}; use ui::file::{FilePrinter, TablePrinter};
use std::ops::Deref; use std::ops::Deref;
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 text_filter = create_text_header_field_grep_filter(matches, "match", "URL", true); let text_filter = create_text_header_field_grep_filter(matches, "match", "URL", true);
@ -130,7 +127,7 @@ impl<'a> BM<'a> {
let files = self.rt let files = self.rt
.store() .store()
.load_for_module(self, &parser) .load_for_module(self, &self.parser)
.into_iter() .into_iter()
.filter(|file| filter.filter_file(file)); .filter(|file| filter.filter_file(file));
let printer = TablePrinter::new(self.rt.is_verbose(), self.rt.is_debugging()); let printer = TablePrinter::new(self.rt.is_verbose(), self.rt.is_debugging());
@ -158,7 +155,6 @@ impl<'a> BM<'a> {
use ansi_term::Colour::{Green, Red}; use ansi_term::Colour::{Green, Red};
use open; use open;
let parser = Parser::new(JsonHeaderParser::new(None));
let filter : Box<CliFileFilter> = { let filter : Box<CliFileFilter> = {
let hash_filter = create_hash_filter(matches, "id", true); let hash_filter = create_hash_filter(matches, "id", true);
let text_filter = create_text_header_field_grep_filter(matches, "match", "URL", true); let text_filter = create_text_header_field_grep_filter(matches, "match", "URL", true);
@ -167,7 +163,7 @@ impl<'a> BM<'a> {
}; };
let result = self.rt let result = self.rt
.store() .store()
.load_for_module(self, &parser) .load_for_module(self, &self.parser)
.iter() .iter()
.filter(|file| filter.filter_file(file)) .filter(|file| filter.filter_file(file))
.map(|file| { .map(|file| {
@ -205,8 +201,6 @@ impl<'a> BM<'a> {
fn command_remove(&self, matches: &ArgMatches) -> bool { fn command_remove(&self, matches: &ArgMatches) -> bool {
use ansi_term::Colour::{Green, Red}; use ansi_term::Colour::{Green, Red};
let parser = Parser::new(JsonHeaderParser::new(None));
let filter = { let filter = {
let hash_filter = create_hash_filter(matches, "id", false); let hash_filter = create_hash_filter(matches, "id", false);
let text_filter = create_text_header_field_grep_filter(matches, "match", "URL", false); let text_filter = create_text_header_field_grep_filter(matches, "match", "URL", false);
@ -216,7 +210,7 @@ impl<'a> BM<'a> {
let result = self.rt let result = self.rt
.store() .store()
.load_for_module(self, &parser) .load_for_module(self, &self.parser)
.iter() .iter()
.filter(|file| filter.filter_file(file)) .filter(|file| filter.filter_file(file))
.map(|file| { .map(|file| {
@ -248,8 +242,7 @@ impl<'a> BM<'a> {
use module::helpers::header::tags::data::alter_tags_in_files; use module::helpers::header::tags::data::alter_tags_in_files;
use self::header::rebuild_header_with_tags; use self::header::rebuild_header_with_tags;
let parser = Parser::new(JsonHeaderParser::new(None)); alter_tags_in_files(self, matches, &self.parser, |old_tags, cli_tags| {
alter_tags_in_files(self, matches, &parser, |old_tags, cli_tags| {
let mut new_tags = old_tags.clone(); let mut new_tags = old_tags.clone();
new_tags.append(&mut cli_tags.clone()); new_tags.append(&mut cli_tags.clone());
new_tags new_tags
@ -263,8 +256,7 @@ impl<'a> BM<'a> {
use module::helpers::header::tags::data::alter_tags_in_files; use module::helpers::header::tags::data::alter_tags_in_files;
use self::header::rebuild_header_with_tags; use self::header::rebuild_header_with_tags;
let parser = Parser::new(JsonHeaderParser::new(None)); alter_tags_in_files(self, matches, &self.parser, |old_tags, cli_tags| {
alter_tags_in_files(self, matches, &parser, |old_tags, cli_tags| {
old_tags.clone() old_tags.clone()
.into_iter() .into_iter()
.filter(|tag| !cli_tags.contains(tag)) .filter(|tag| !cli_tags.contains(tag))
@ -279,8 +271,7 @@ impl<'a> BM<'a> {
use module::helpers::header::tags::data::alter_tags_in_files; use module::helpers::header::tags::data::alter_tags_in_files;
use self::header::rebuild_header_with_tags; use self::header::rebuild_header_with_tags;
let parser = Parser::new(JsonHeaderParser::new(None)); alter_tags_in_files(self, matches, &self.parser, |_, cli_tags| {
alter_tags_in_files(self, matches, &parser, |_, cli_tags| {
cli_tags.clone() cli_tags.clone()
}, rebuild_header_with_tags) }, rebuild_header_with_tags)
} }