matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Add ID reporting in imag-view

Browse source
This commit is contained in:
Matthias Beyer 2018-10-04 18:39:47 +02:00
parent d3400167df
commit 1e6d58bf4c
1 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
bin/core/imag-view/src/main.rs
View file

@ -58,7 +58,6 @@ use failure::Error;
use failure::err_msg; use failure::err_msg;
use libimagrt::setup::generate_runtime_setup; use libimagrt::setup::generate_runtime_setup;
use libimagrt::runtime::Runtime;
use libimagerror::trace::MapErrTrace; use libimagerror::trace::MapErrTrace;
use libimagerror::iter::TraceIterator; use libimagerror::iter::TraceIterator;
use libimagerror::io::ToExitCode; use libimagerror::io::ToExitCode;
@ -66,8 +65,6 @@ use libimagerror::exit::ExitUnwrap;
use libimagentryview::builtin::stdout::StdoutViewer; use libimagentryview::builtin::stdout::StdoutViewer;
use libimagentryview::builtin::md::MarkdownViewer; use libimagentryview::builtin::md::MarkdownViewer;
use libimagentryview::viewer::Viewer; use libimagentryview::viewer::Viewer;
use libimagstore::storeid::IntoStoreId;
use libimagstore::storeid::StoreIdIterator;
use libimagstore::iter::get::StoreIdGetIteratorExtension; use libimagstore::iter::get::StoreIdGetIteratorExtension;
use libimagstore::store::FileLockEntry; use libimagstore::store::FileLockEntry;
@ -83,27 +80,26 @@ fn main() {
let view_header = rt.cli().is_present("view-header"); let view_header = rt.cli().is_present("view-header");
let hide_content = rt.cli().is_present("not-view-content"); let hide_content = rt.cli().is_present("not-view-content");
let entry_ids = rt.ids::<::ui::PathProvider>() let entries = rt.ids::<::ui::PathProvider>()
.map_err_trace_exit_unwrap(1) .map_err_trace_exit_unwrap(1)
.into_iter() .into_iter()
.map(|x| Ok(x) as Result<_, StoreError>) .map(Ok)
.into_get_iter(rt.store()) .into_get_iter(rt.store())
.trace_unwrap_exit(1) .trace_unwrap_exit(1)
.map(|e| { .map(|e| {
e.ok_or_else(|| String::from("Entry not found")) e.ok_or_else(|| err_msg("Entry not found"))
.map_err(StoreError::from) .map_err(Error::from)
.map_err_trace_exit_unwrap(1) .map_err_trace_exit_unwrap(1)
}); });
if rt.cli().is_present("in") { if rt.cli().is_present("in") {
let files = entry_ids let files = entries
.into_get_iter(rt.store()) .map(|entry| {
.trace_unwrap_exit(1) let tmpfile = create_tempfile_for(&entry, view_header, hide_content);
.map(|e| { rt.report_touched(entry.get_location())
e.ok_or_else(|| err_msg("Entry not found")) .map_err_trace_exit_unwrap(1);
.map_err_trace_exit_unwrap(1) tmpfile
}) })
.map(|entry| create_tempfile_for(&entry, view_header, hide_content))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let mut command = { let mut command = {
@ -178,14 +174,6 @@ fn main() {
drop(files); drop(files);
} else { } else {
let iter = entry_ids
.into_get_iter(rt.store())
.map(|e| {
e.map_err_trace_exit_unwrap(1)
.ok_or_else(|| err_msg("Entry not found"))
.map_err_trace_exit_unwrap(1)
});
let out = rt.stdout(); let out = rt.stdout();
let mut outlock = out.lock(); let mut outlock = out.lock();
@ -206,7 +194,7 @@ fn main() {
let viewer = MarkdownViewer::new(&rt); let viewer = MarkdownViewer::new(&rt);
let seperator = basesep.map(|s| build_seperator(s, sep_width)); let seperator = basesep.map(|s| build_seperator(s, sep_width));
entry_ids entries
.enumerate() .enumerate()
.for_each(|(n, entry)| { .for_each(|(n, entry)| {
if n != 0 { if n != 0 {
@ -218,6 +206,9 @@ fn main() {
viewer viewer
.view_entry(&entry, &mut outlock) .view_entry(&entry, &mut outlock)
.map_err_trace_exit_unwrap(1); .map_err_trace_exit_unwrap(1);
rt.report_touched(entry.get_location())
.map_err_trace_exit_unwrap(1);
}); });
} else { } else {
let mut viewer = StdoutViewer::new(view_header, !hide_content); let mut viewer = StdoutViewer::new(view_header, !hide_content);
@ -238,7 +229,7 @@ fn main() {
} }
let seperator = basesep.map(|s| build_seperator(s, sep_width)); let seperator = basesep.map(|s| build_seperator(s, sep_width));
entry_ids entries
.enumerate() .enumerate()
.for_each(|(n, entry)| { .for_each(|(n, entry)| {
if n != 0 { if n != 0 {
@ -250,6 +241,9 @@ fn main() {
viewer viewer
.view_entry(&entry, &mut outlock) .view_entry(&entry, &mut outlock)
.map_err_trace_exit_unwrap(1); .map_err_trace_exit_unwrap(1);
rt.report_touched(entry.get_location())
.map_err_trace_exit_unwrap(1);
}); });
} }
} }