From 2c07ad9a3ac8fb8597c1e0ecb17b5d5b2f278809 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 14 Apr 2018 16:01:40 +0200 Subject: [PATCH] Implement grep command --- bin/domain/imag-wiki/Cargo.toml | 2 ++ bin/domain/imag-wiki/src/main.rs | 49 +++++++++++++++++++++++++++++++- bin/domain/imag-wiki/src/ui.rs | 2 +- 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/bin/domain/imag-wiki/Cargo.toml b/bin/domain/imag-wiki/Cargo.toml index dfa43da3..1312af55 100644 --- a/bin/domain/imag-wiki/Cargo.toml +++ b/bin/domain/imag-wiki/Cargo.toml @@ -22,6 +22,8 @@ toml = "0.4" toml-query = "0.6" is-match = "0.1" version = "2.0.1" +regex = "0.2" +filters = "0.2" libimagentryedit = { version = "0.7.0", path = "../../../lib/entry/libimagentryedit" } libimagentrylink = { version = "0.7.0", path = "../../../lib/entry/libimagentrylink" } diff --git a/bin/domain/imag-wiki/src/main.rs b/bin/domain/imag-wiki/src/main.rs index ec9df093..e986d053 100644 --- a/bin/domain/imag-wiki/src/main.rs +++ b/bin/domain/imag-wiki/src/main.rs @@ -18,6 +18,8 @@ // extern crate clap; +extern crate regex; +extern crate filters; #[macro_use] extern crate log; #[macro_use] extern crate libimagrt; @@ -29,12 +31,15 @@ extern crate libimagentrylink; use std::io::Write; +use regex::Regex; + use libimagrt::runtime::Runtime; use libimagrt::setup::generate_runtime_setup; use libimagerror::trace::{MapErrTrace, trace_error}; use libimagerror::exit::ExitUnwrap; use libimagerror::io::ToExitCode; use libimagstore::storeid::IntoStoreId; +use libimagstore::store::FileLockEntry; use libimagwiki::store::WikiStore; use libimagentryedit::edit::{Edit, EditHeader}; @@ -202,6 +207,48 @@ fn delete(rt: &Runtime, wiki_name: &str) { } fn grep(rt: &Runtime, wiki_name: &str) { - unimplemented!() + use libimagstore::iter::get::StoreIdGetIteratorExtension; + use filters::filter::Filter; + + let scmd = rt.cli().subcommand_matches("grep").unwrap(); // safed by clap + let grep = scmd + .value_of("grep-pattern") + .map(Regex::new) + .unwrap() // safed by clap + .unwrap_or_else(|e| { + error!("Regex building error: {:?}", e); + ::std::process::exit(1) + }); + + let filter = |e: &FileLockEntry| -> bool { + grep.is_match(e.get_content()) + }; + + let wiki = rt + .store() + .get_wiki(&wiki_name) + .map_err_trace_exit_unwrap(1) + .unwrap_or_else(|| { + error!("No wiki '{}' found", wiki_name); + ::std::process::exit(1) + }); + + let out = rt.stdout(); + let mut outlock = out.lock(); + + wiki.all_ids() + .map_err_trace_exit_unwrap(1) + .into_get_iter(rt.store()) + .filter_map(Result::ok) + .map(|e| e.unwrap_or_else(|| { + error!("Failed to fetch entry"); + ::std::process::exit(1) + })) + .filter(|e| filter.filter(e)) + .for_each(|entry| { + let _ = writeln!(outlock, "{}", entry.get_location()) + .to_exit_code() + .unwrap_or_exit(); + }); } diff --git a/bin/domain/imag-wiki/src/ui.rs b/bin/domain/imag-wiki/src/ui.rs index 2a94f992..3b659c28 100644 --- a/bin/domain/imag-wiki/src/ui.rs +++ b/bin/domain/imag-wiki/src/ui.rs @@ -126,7 +126,7 @@ pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> { ) .subcommand(SubCommand::with_name("grep") - .about("List wiki entries.") + .about("Grep though wiki entries.") .version("0.1") .arg(Arg::with_name("grep-pattern") .index(1)