diff options
author | Guillaume Pasquet <dev@etenil.net> | 2022-03-28 02:47:08 +0000 |
---|---|---|
committer | Guillaume Pasquet <dev@etenil.net> | 2022-03-28 02:47:08 +0000 |
commit | e18c7e97b2bde449be234de25b657909acaf10c7 (patch) | |
tree | beb84a62e263ffaca2e18cb279fba822ffe5afdf /src/main.rs | |
parent | 6d60900a0bfb41a47744048c7980eefa15c572c8 (diff) | |
parent | f255e22c35da1dd374ef49b0300e6e6ca9c08a80 (diff) |
Merge branch '18-disable-filters-from-cli' into 'main'
Fix #18 - Disable filters
Closes #18
See merge request guillaume54/barb!4
Diffstat (limited to 'src/main.rs')
-rw-r--r-- | src/main.rs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/main.rs b/src/main.rs index 0cd839c..151b277 100644 --- a/src/main.rs +++ b/src/main.rs @@ -24,6 +24,8 @@ struct Args { filter: Option<String>, #[clap(short, long)] no_color: bool, + #[clap(short = 'F', long)] + no_filter: bool, files: Vec<String>, } @@ -36,6 +38,10 @@ impl Args { &self.filter } + pub fn no_filter(&self) -> bool { + self.no_filter + } + pub fn output(&self) -> BarbOutput { BarbOutput::new( !self.body, @@ -83,7 +89,8 @@ fn main() { dependencies.dedup(); for dep in dependencies { - match executor.execute(&dep, &output, args.jq_filter()) { + // Always enable filters on dependencies + match executor.execute(&dep, &output, args.jq_filter(), false) { Ok(()) => (), Err(err) => println!("{}", err), } @@ -95,7 +102,7 @@ fn main() { continue; } - match executor.execute(&bfile.unwrap(), &output, args.jq_filter()) { + match executor.execute(&bfile.unwrap(), &output, args.jq_filter(), args.no_filter()) { Ok(()) => (), Err(err) => println!("{}", err), } |