matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix broken pipe panic

Browse source
This commit is contained in:
Matthias Beyer 2018-02-14 23:34:37 +01:00
parent 872b300b9c
commit fc0610b77f
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
bin/core/imag-annotate/src/main.rs
View file

@ -43,6 +43,7 @@ extern crate libimagerror;
extern crate libimagstore; extern crate libimagstore;
extern crate libimagutil; extern crate libimagutil;
use std::io::Write;
use std::path::PathBuf; use std::path::PathBuf;
use libimagentryannotation::annotateable::*; use libimagentryannotation::annotateable::*;
@ -50,6 +51,8 @@ use libimagentryannotation::annotation_fetcher::*;
use libimagentryannotation::error::AnnotationError as AE; use libimagentryannotation::error::AnnotationError as AE;
use libimagentryedit::edit::*; use libimagentryedit::edit::*;
use libimagerror::trace::MapErrTrace; use libimagerror::trace::MapErrTrace;
use libimagerror::exit::ExitUnwrap;
use libimagerror::io::ToExitCode;
use libimagrt::runtime::Runtime; use libimagrt::runtime::Runtime;
use libimagrt::setup::generate_runtime_setup; use libimagrt::setup::generate_runtime_setup;
use libimagstore::store::FileLockEntry; use libimagstore::store::FileLockEntry;
@ -132,6 +135,7 @@ fn remove(rt: &Runtime) {
} }
fn list(rt: &Runtime) { fn list(rt: &Runtime) {
let mut out = ::std::io::stdout();
let scmd = rt.cli().subcommand_matches("list").unwrap(); // safed by clap let scmd = rt.cli().subcommand_matches("list").unwrap(); // safed by clap
let with_text = scmd.is_present("list-with-text"); let with_text = scmd.is_present("list-with-text");
match scmd.value_of("entry").map(PathBuf::from) { match scmd.value_of("entry").map(PathBuf::from) {
@ -145,7 +149,9 @@ fn list(rt: &Runtime) {
.annotations(rt.store()) .annotations(rt.store())
.map_err_trace_exit_unwrap(1) .map_err_trace_exit_unwrap(1)
.enumerate() .enumerate()
.map(|(i, a)| list_annotation(i, a.map_err_trace_exit_unwrap(1), with_text)) .map(|(i, a)| {
list_annotation(&mut out, i, a.map_err_trace_exit_unwrap(1), with_text)
})
.collect::<Vec<_>>(); .collect::<Vec<_>>();
} }
@ -156,20 +162,25 @@ fn list(rt: &Runtime) {
.all_annotations() .all_annotations()
.map_err_trace_exit_unwrap(1) .map_err_trace_exit_unwrap(1)
.enumerate() .enumerate()
.map(|(i, a)| list_annotation(i, a.map_err_trace_exit_unwrap(1), with_text)) .map(|(i, a)| {
list_annotation(&mut out, i, a.map_err_trace_exit_unwrap(1), with_text)
})
.collect::<Vec<_>>(); .collect::<Vec<_>>();
} }
} }
} }
fn list_annotation<'a>(i: usize, a: FileLockEntry<'a>, with_text: bool) { fn list_annotation<'a>(out: &mut Write, i: usize, a: FileLockEntry<'a>, with_text: bool) {
if with_text { let _ = if with_text {
println!("--- {i: >5} | {id}\n{text}\n\n", writeln!(out,
"--- {i: >5} | {id}\n{text}\n\n",
i = i, i = i,
id = a.get_location(), id = a.get_location(),
text = a.get_content()); text = a.get_content())
} else { } else {
println!("{: >5} | {}", i, a.get_location()); writeln!(out, "{: >5} | {}", i, a.get_location())
} }
.to_exit_code()
.unwrap_or_exit();
} }