extern/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-08-10 08:08:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Write error messages to pager, if attached

Browse Source 
closes #946
This commit is contained in:
sharkdp
2020-04-25 12:25:25 +02:00
committed by David Peter
parent 3bcc4d0d55
commit 48a7ce3bf2
4 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/controller.rs
View File

@ -31,7 +31,7 @@ impl<'b> Controller<'b> {
pub fn run_with_error_handler(
&self,
inputs: Vec<Input>,
handle_error: impl Fn(&Error),
handle_error: impl Fn(&Error, &mut dyn Write),
) -> Result<bool> {
let mut output_type;
@ -62,13 +62,23 @@ impl<'b> Controller<'b> {
output_type = OutputType::stdout();
}
let attached_to_pager = output_type.is_pager();
let writer = output_type.handle()?;
let mut no_errors: bool = true;
let stderr = io::stderr();
let print_error = |error: &Error, write: &mut dyn Write| {
if attached_to_pager {
handle_error(error, write);
} else {
handle_error(error, &mut stderr.lock());
}
};
for input in inputs.into_iter() {
match input.open(io::stdin().lock()) {
Err(error) => {
handle_error(&error);
print_error(&error, writer);
no_errors = false;
}
Ok(mut opened_input) => {
@ -123,7 +133,7 @@ impl<'b> Controller<'b> {
);
if let Err(error) = result {
handle_error(&error);
print_error(&error, writer);
no_errors = false;
}
}
@ -138,8 +148,7 @@ impl<'b> Controller<'b> {
printer: &mut dyn Printer,
writer: &mut dyn Write,
input: &mut OpenedInput,
#[cfg(feature = "git")]
line_changes: &Option<LineChanges>,
#[cfg(feature = "git")] line_changes: &Option<LineChanges>,
) -> Result<()> {
if !input.reader.first_line.is_empty() || self.config.style_components.header() {
printer.print_header(writer, input)?;