matthiasbeyer
/
imag
1
0
Fork 0
Code Releases Activity

Use output stream from Runtime::stdout()

This commit is contained in:
Matthias Beyer 2018-02-26 22:57:17 +01:00
parent c18c0bbbe4
commit 50461b839a
24 changed files with 55 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/core/imag-annotate/src/main.rs
View File

@ -135,7 +135,6 @@ fn remove(rt: &Runtime) {
}
fn list(rt: &Runtime) {
let mut out = ::std::io::stdout();
let scmd = rt.cli().subcommand_matches("list").unwrap(); // safed by clap
let with_text = scmd.is_present("list-with-text");
match scmd.value_of("entry").map(PathBuf::from) {
@ -150,7 +149,7 @@ fn list(rt: &Runtime) {
.map_err_trace_exit_unwrap(1)
.enumerate()
.map(|(i, a)| {
list_annotation(&mut out, i, a.map_err_trace_exit_unwrap(1), with_text)
list_annotation(&rt, i, a.map_err_trace_exit_unwrap(1), with_text)
})
.collect::<Vec<_>>();
}
@ -163,22 +162,22 @@ fn list(rt: &Runtime) {
.map_err_trace_exit_unwrap(1)
.enumerate()
.map(|(i, a)| {
list_annotation(&mut out, i, a.map_err_trace_exit_unwrap(1), with_text)
list_annotation(&rt, i, a.map_err_trace_exit_unwrap(1), with_text)
})
.collect::<Vec<_>>();
}
}
}
fn list_annotation<'a>(out: &mut Write, i: usize, a: FileLockEntry<'a>, with_text: bool) {
fn list_annotation<'a>(rt: &Runtime, i: usize, a: FileLockEntry<'a>, with_text: bool) {
let _ = if with_text {
writeln!(out,
writeln!(rt.stdout(),
"--- {i: >5} | {id}\n{text}\n\n",
i = i,
id = a.get_location(),
text = a.get_content())
} else {
writeln!(out, "{: >5} | {}", i, a.get_location())
writeln!(rt.stdout(), "{: >5} | {}", i, a.get_location())
}
.to_exit_code()
.unwrap_or_exit();

2
bin/core/imag-diagnostics/src/main.rs
View File

@ -155,7 +155,7 @@ fn main() {
let n = diags.len();
let mut out = ::std::io::stdout();
let mut out = rt.stdout();
let _ = writeln!(out, "imag version {}", env!("CARGO_PKG_VERSION"))
.to_exit_code()

7
bin/core/imag-gps/src/main.rs
View File

@ -144,10 +144,8 @@ fn remove(rt: &Runtime) {
})
.map_err_trace_exit_unwrap(1); // The parsing of the deleted values failed
let mut out = ::std::io::stdout();
if scmd.is_present("print-removed") {
let _ = writeln!(out, "{}", removed_value).to_exit_code().unwrap_or_exit();
let _ = writeln!(rt.stdout(), "{}", removed_value).to_exit_code().unwrap_or_exit();
}
}
@ -174,7 +172,6 @@ fn get(rt: &Runtime) {
exit(1)
});
let mut out = ::std::io::stdout();
let _ = writeln!(out, "{}", value).to_exit_code().unwrap_or_exit();
let _ = writeln!(rt.stdout(), "{}", value).to_exit_code().unwrap_or_exit();
}

21
bin/core/imag-grep/src/main.rs
View File

@ -44,6 +44,7 @@ use std::io::Write;
use regex::Regex;
use libimagrt::runtime::Runtime;
use libimagrt::setup::generate_runtime_setup;
use libimagstore::store::Entry;
use libimagerror::trace::MapErrTrace;
@ -88,15 +89,13 @@ fn main() {
.into_get_iter()
.filter_map(|res| res.map_err_trace_exit_unwrap(1))
.filter(|entry| pattern.is_match(entry.get_content()))
.map(|entry| show(&entry, &pattern, &opts, &mut count))
.map(|entry| show(&rt, &entry, &pattern, &opts, &mut count))
.count();
let mut out = ::std::io::stdout();
if opts.count {
let _ = writeln!(out, "{}", count).to_exit_code().unwrap_or_exit();
let _ = writeln!(rt.stdout(), "{}", count).to_exit_code().unwrap_or_exit();
} else if !opts.files_with_matches {
let _ = writeln!(out, "Processed {} files, {} matches, {} nonmatches",
let _ = writeln!(rt.stdout(), "Processed {} files, {} matches, {} nonmatches",
overall_count,
count,
overall_count - count)
@ -105,24 +104,22 @@ fn main() {
}
}
fn show(e: &Entry, re: &Regex, opts: &Options, count: &mut usize) {
let mut out = ::std::io::stdout();
fn show(rt: &Runtime, e: &Entry, re: &Regex, opts: &Options, count: &mut usize) {
if opts.files_with_matches {
let _ = writeln!(out, "{}", e.get_location()).to_exit_code().unwrap_or_exit();
let _ = writeln!(rt.stdout(), "{}", e.get_location()).to_exit_code().unwrap_or_exit();
} else if opts.count {
*count += 1;
} else {
let _ = writeln!(out, "{}:", e.get_location()).to_exit_code().unwrap_or_exit();
let _ = writeln!(rt.stdout(), "{}:", e.get_location()).to_exit_code().unwrap_or_exit();
for capture in re.captures_iter(e.get_content()) {
for mtch in capture.iter() {
if let Some(m) = mtch {
let _ = writeln!(out, " '{}'", m.as_str()).to_exit_code().unwrap_or_exit();
let _ = writeln!(rt.stdout(), " '{}'", m.as_str()).to_exit_code().unwrap_or_exit();
}
}
}
let _ = writeln!(out, "").to_exit_code().unwrap_or_exit();
let _ = writeln!(rt.stdout(), "").to_exit_code().unwrap_or_exit();
}
}

4
bin/core/imag-ids/src/main.rs
View File

@ -60,13 +60,11 @@ fn main() {
"print all ids",
build_ui);
let mut out = ::std::io::stdout();
rt.store()
.entries()
.map_err_trace_exit_unwrap(1)
.for_each(|id| {
let _ = writeln!(out, "{}", id.to_str().map_err_trace_exit_unwrap(1))
let _ = writeln!(rt.stdout(), "{}", id.to_str().map_err_trace_exit_unwrap(1))
.to_exit_code()
.unwrap_or_exit();
})

5
bin/core/imag-link/src/main.rs
View File

@ -254,7 +254,6 @@ fn list_linkings(rt: &Runtime) {
.unwrap(); // safed by clap
let list_externals = cmd.is_present("list-externals-too");
let mut out = ::std::io::stdout();
for entry in cmd.values_of("entries").unwrap() { // safed by clap
match rt.store().get(PathBuf::from(entry)) {
@ -268,7 +267,7 @@ fn list_linkings(rt: &Runtime) {
.ok();
if let Some(link) = link {
let _ = writeln!(out, "{: <3}: {}", i, link)
let _ = writeln!(rt.stdout(), "{: <3}: {}", i, link)
.to_exit_code()
.unwrap_or_exit();
i += 1;
@ -284,7 +283,7 @@ fn list_linkings(rt: &Runtime) {
.map_err_trace_exit_unwrap(1)
.into_string();
let _ = writeln!(out, "{: <3}: {}", i, link)
let _ = writeln!(rt.stdout(), "{: <3}: {}", i, link)
.to_exit_code()
.unwrap_or_exit();

8
bin/core/imag-store/src/retrieve.rs
View File

@ -51,11 +51,9 @@ pub fn retrieve(rt: &Runtime) {
}
pub fn print_entry(rt: &Runtime, scmd: &ArgMatches, e: FileLockEntry) {
let mut out = ::std::io::stdout();
if do_print_raw(scmd) {
debug!("Printing raw content...");
let _ = writeln!(out, "{}", e.to_str())
let _ = writeln!(rt.stdout(), "{}", e.to_str())
.to_exit_code()
.unwrap_or_exit();
} else if do_filter(scmd) {
@ -74,7 +72,7 @@ pub fn print_entry(rt: &Runtime, scmd: &ArgMatches, e: FileLockEntry) {
unimplemented!()
} else {
debug!("Printing header as TOML...");
let _ = writeln!(out, "{}", e.get_header())
let _ = writeln!(rt.stdout(), "{}", e.get_header())
.to_exit_code()
.unwrap_or_exit();
}
@ -82,7 +80,7 @@ pub fn print_entry(rt: &Runtime, scmd: &ArgMatches, e: FileLockEntry) {
if do_print_content(scmd) {
debug!("Printing content...");
let _ = writeln!(out, "{}", e.get_content())
let _ = writeln!(rt.stdout(), "{}", e.get_content())
.to_exit_code()
.unwrap_or_exit();
}

8
bin/core/imag-tag/src/main.rs
View File

@ -164,11 +164,9 @@ fn list(id: PathBuf, rt: &Runtime) {
unimplemented!()
}
let mut out = ::std::io::stdout();
if line_out {
for tag in &tags {
let _ = writeln!(out, "{}", tag)
let _ = writeln!(rt.stdout(), "{}", tag)
.to_exit_code()
.unwrap_or_exit();
}
@ -176,13 +174,13 @@ fn list(id: PathBuf, rt: &Runtime) {
if sepp_out {
let sepp = scmd.value_of("sep").unwrap(); // we checked before
let _ = writeln!(out, "{}", tags.join(sepp))
let _ = writeln!(rt.stdout(), "{}", tags.join(sepp))
.to_exit_code()
.unwrap_or_exit();
}
if comm_out {
let _ = writeln!(out, "{}", tags.join(", "))
let _ = writeln!(rt.stdout(), "{}", tags.join(", "))
.to_exit_code()
.unwrap_or_exit();
}

3
bin/domain/imag-bookmark/src/main.rs
View File

@ -135,11 +135,10 @@ fn list(rt: &Runtime) {
.map_err_trace_exit_unwrap(1);
let links = collection.links(rt.store()).map_err_trace_exit_unwrap(1);
let mut out = ::std::io::stdout();
debug!("Listing...");
for (i, link) in links.enumerate() {
match link {
Ok(link) => writeln!(out, "{: >3}: {}", i, link).to_exit_code().unwrap_or_exit(),
Ok(link) => writeln!(rt.stdout(), "{: >3}: {}", i, link).to_exit_code().unwrap_or_exit(),
Err(e) => trace_error(&e)
}
};

3
bin/domain/imag-contact/src/create.rs
View File

@ -20,7 +20,6 @@
use std::collections::BTreeMap;
use std::process::exit;
use std::io::Write;
use std::io::stdout;
use std::path::PathBuf;
use std::fs::OpenOptions;
@ -96,7 +95,7 @@ pub fn create(rt: &Runtime) {
(Box::new(file), Some(fl))
} else {
(Box::new(stdout()), None)
(Box::new(rt.stdout()), None)
}
};

3
bin/domain/imag-contact/src/main.rs
View File

@ -109,7 +109,6 @@ fn main() {
fn list(rt: &Runtime) {
let scmd = rt.cli().subcommand_matches("list").unwrap();
let list_format = get_contact_print_format("contact.list_format", rt, &scmd);
let mut out = ::std::io::stdout();
let _ = rt
.store()
@ -144,7 +143,7 @@ fn list(rt: &Runtime) {
.map_err(CE::from)
.map_err_trace_exit_unwrap(1);
writeln!(out, "{}", s).to_exit_code().unwrap_or_exit()
writeln!(rt.stdout(), "{}", s).to_exit_code().unwrap_or_exit()
})
.collect::<Vec<_>>();
}

4
bin/domain/imag-diary/src/list.rs
View File

@ -33,13 +33,11 @@ pub fn list(rt: &Runtime) {
let diaryname = get_diary_name(rt)
.unwrap_or_else(|| warn_exit("No diary selected. Use either the configuration file or the commandline option", 1));
let mut out = ::std::io::stdout();
Diary::entries(rt.store(), &diaryname)
.map_dbg_str("Ok")
.map_err_trace_exit_unwrap(1)
.for_each(|id| {
writeln!(out, "{}", id
writeln!(rt.stdout(), "{}", id
.without_base()
.to_str()
.map_err_trace()

5
bin/domain/imag-diary/src/main.rs
View File

@ -79,9 +79,8 @@ fn main() {
if rt.is_ok() {
rt.unwrap()
} else {
let mut out = ::std::io::stdout();
let _ = writeln!(out, "Could not set up Runtime").to_exit_code().unwrap_or_exit();
let _ = writeln!(out, "{:?}", rt.err().unwrap()).to_exit_code().unwrap_or_exit();
let _ = writeln!(rt.stdout(), "Could not set up Runtime").to_exit_code().unwrap_or_exit();
let _ = writeln!(rt.stdout(), "{:?}", rt.err().unwrap()).to_exit_code().unwrap_or_exit();
exit(1);
}
};

12
bin/domain/imag-habit/src/main.rs
View File

@ -332,8 +332,7 @@ fn today(rt: &Runtime, future: bool) {
}
if !empty {
let mut out = ::std::io::stdout();
let _ = table.print(&mut out).to_exit_code().unwrap_or_exit();
let _ = table.print(&mut rt.stdout()).to_exit_code().unwrap_or_exit();
}
}
}
@ -388,8 +387,7 @@ fn list(rt: &Runtime) {
});
if !empty {
let mut out = ::std::io::stdout();
let _ = table.print(&mut out).to_exit_code().unwrap_or_exit();
let _ = table.print(&mut rt.stdout()).to_exit_code().unwrap_or_exit();
}
}
@ -411,7 +409,6 @@ fn show(rt: &Runtime) {
vec![date, comm]
}
let mut out = ::std::io::stdout();
let header = ["#", "Date", "Comment"]
.iter()
.map(|s| Cell::new(s))
@ -433,7 +430,7 @@ fn show(rt: &Runtime) {
let recur = habit.habit_recur_spec().map_err_trace_exit_unwrap(1);
let comm = habit.habit_comment().map_err_trace_exit_unwrap(1);
let _ = writeln!(out,
let _ = writeln!(rt.stdout(),
"{i} - {name}\nBase : {b},\nRecurrence: {r}\nComment : {c}\n",
i = i,
name = name,
@ -461,8 +458,7 @@ fn show(rt: &Runtime) {
});
if !empty {
let mut out = ::std::io::stdout();
let _ = table.print(&mut out).to_exit_code().unwrap_or_exit();
let _ = table.print(&mut rt.stdout()).to_exit_code().unwrap_or_exit();
}
})
.collect::<Vec<_>>();

2
bin/domain/imag-log/src/main.rs
View File

@ -137,7 +137,7 @@ fn show(rt: &Runtime) {
}
let id = e.diary_id().map_err_trace_exit_unwrap(1);
writeln!(::std::io::stdout(),
writeln!(rt.stdout(),
"{dname: >10} - {y: >4}-{m:0>2}-{d:0>2}T{H:0>2}:{M:0>2} - {text}",
dname = id.diary_name(),
y = id.year(),

6
bin/domain/imag-mail/src/main.rs
View File

@ -73,7 +73,7 @@ fn list(rt: &Runtime) {
use libimagmail::error::ResultExt;
// TODO: Implement lister type in libimagmail for this
fn list_mail(m: Mail) {
fn list_mail(rt: &Runtime, m: Mail) {
let id = match m.get_message_id() {
Ok(Some(f)) => f,
Ok(None) => "<no id>".to_owned(),
@ -110,7 +110,7 @@ fn list(rt: &Runtime) {
},
};
writeln!(::std::io::stdout(),
writeln!(rt.stdout(),
"Mail: {id}\n\tFrom: {from}\n\tTo: {to}\n\t{subj}\n",
from = from,
id = id,
@ -130,7 +130,7 @@ fn list(rt: &Runtime) {
.map(|fle| Mail::from_fle(fle).map_err_trace().ok())
})
.filter_map(|e| e)
.for_each(list_mail);
.for_each(|m| list_mail(&rt, m));
}
fn mail_store(rt: &Runtime) {

4
bin/domain/imag-notes/src/main.rs
View File

@ -119,8 +119,6 @@ fn edit(rt: &Runtime) {
fn list(rt: &Runtime) {
use std::cmp::Ordering;
let mut out = ::std::io::stdout();
let _ = rt
.store()
.all_notes()
@ -139,7 +137,7 @@ fn list(rt: &Runtime) {
.iter()
.for_each(|note| {
let name = note.get_name().map_err_trace_exit_unwrap(1);
writeln!(out, "{}", name)
writeln!(rt.stdout(), "{}", name)
.to_exit_code()
.unwrap_or_exit()
});

7
bin/domain/imag-timetrack/src/day.rs
View File

@ -86,7 +86,6 @@ pub fn day(rt: &Runtime) -> i32 {
tags_filter.and(start_time_filter).and(end_time_filter)
};
let mut out = ::std::io::stdout();
rt.store()
.get_timetrackings()
.map_err_trace_exit_unwrap(1)
@ -111,9 +110,9 @@ pub fn day(rt: &Runtime) -> i32 {
.trace_unwrap_exit(1)
.map(|(tag, start, end)| {
match (start, end) {
(None, _) => writeln!(out, "{} has no start time.", tag),
(Some(s), None) => writeln!(out, "{} | {} - ...", tag, s),
(Some(s), Some(e)) => writeln!(out, "{} | {} - {}", tag, s, e),
(None, _) => writeln!(rt.stdout(), "{} has no start time.", tag),
(Some(s), None) => writeln!(rt.stdout(), "{} | {} - ...", tag, s),
(Some(s), Some(e)) => writeln!(rt.stdout(), "{} | {} - {}", tag, s, e),
}
.to_exit_code()
})

4
bin/domain/imag-timetrack/src/list.rs
View File

@ -117,8 +117,6 @@ pub fn list_impl(rt: &Runtime,
let mut table = Table::new();
table.set_titles(Row::new(["Tag", "Start", "End"].into_iter().map(|s| Cell::new(s)).collect()));
let mut stdout = ::std::io::stdout();
rt.store()
.get_timetrackings()
.map_err_trace_exit_unwrap(1)
@ -167,7 +165,7 @@ pub fn list_impl(rt: &Runtime,
})
})
.map_err_trace_exit_unwrap(1)
.print(&mut stdout)
.print(&mut rt.stdout())
.map_err(|_| TimeTrackError::from(String::from("Failed printing table")))
.map(|_| 0)
.map_err_trace()

8
bin/domain/imag-timetrack/src/month.rs
View File

@ -101,8 +101,6 @@ pub fn month(rt: &Runtime) -> i32 {
tags_filter.and(start_time_filter).and(end_time_filter)
};
let mut out = ::std::io::stdout();
rt.store()
.get_timetrackings()
.map_err_trace_exit_unwrap(1)
@ -127,9 +125,9 @@ pub fn month(rt: &Runtime) -> i32 {
.trace_unwrap_exit(1)
.map(|(tag, start, end)| {
match (start, end) {
(None, _) => writeln!(out, "{} has no start time.", tag),
(Some(s), None) => writeln!(out, "{} | {} - ...", tag, s),
(Some(s), Some(e)) => writeln!(out, "{} | {} - {}", tag, s, e),
(None, _) => writeln!(rt.stdout(), "{} has no start time.", tag),
(Some(s), None) => writeln!(rt.stdout(), "{} | {} - ...", tag, s),
(Some(s), Some(e)) => writeln!(rt.stdout(), "{} | {} - {}", tag, s, e),
}
.to_exit_code()
})

7
bin/domain/imag-timetrack/src/week.rs
View File

@ -99,7 +99,6 @@ pub fn week(rt: &Runtime) -> i32 {
tags_filter.and(start_time_filter).and(end_time_filter)
};
let mut out = ::std::io::stdout();
rt.store()
.get_timetrackings()
.map_err_trace_exit_unwrap(1)
@ -124,9 +123,9 @@ pub fn week(rt: &Runtime) -> i32 {
.trace_unwrap_exit(1)
.map(|(tag, start, end)| {
match (start, end) {
(None, _) => writeln!(out, "{} has no start time.", tag),
(Some(s), None) => writeln!(out, "{} | {} - ...", tag, s),
(Some(s), Some(e)) => writeln!(out, "{} | {} - {}", tag, s, e),
(None, _) => writeln!(rt.stdout(), "{} has no start time.", tag),
(Some(s), None) => writeln!(rt.stdout(), "{} | {} - ...", tag, s),
(Some(s), Some(e)) => writeln!(rt.stdout(), "{} | {} - {}", tag, s, e),
}
.to_exit_code()
})

2
bin/domain/imag-timetrack/src/year.rs
View File

@ -98,7 +98,7 @@ pub fn year(rt: &Runtime) -> i32 {
tags_filter.and(start_time_filter).and(end_time_filter)
};
let mut out = ::std::io::stdout();
let mut out = rt.stdout();
rt.store()
.get_timetrackings()
.map_err_trace_exit_unwrap(1)

4
bin/domain/imag-todo/src/main.rs
View File

@ -71,7 +71,7 @@ fn tw_hook(rt: &Runtime) {
.import_task_from_reader(stdin)
.map_err_trace_exit_unwrap(1);
let _ = writeln!(::std::io::stdout(), "{}\nTask {} stored in imag", line, uuid)
let _ = writeln!(rt.stdout(), "{}\nTask {} stored in imag", line, uuid)
.to_exit_code()
.unwrap_or_exit();
@ -148,7 +148,7 @@ fn list(rt: &Runtime) {
};
// and then print that
let _ = writeln!(::std::io::stdout(), "{}", outstring).to_exit_code().unwrap_or_exit();
let _ = writeln!(rt.stdout(), "{}", outstring).to_exit_code().unwrap_or_exit();
});
res.map_err_trace().ok();