matthiasbeyer
/
imag
1
0
Fork 0
Code Releases Activity

Move to use libimagentryview for viewing entries

This commit is contained in:
Matthias Beyer 2016-07-16 22:53:12 +02:00
parent 228f55bfd6
commit fb81300594
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
imag-view/src/main.rs
View File

@ -32,16 +32,14 @@ use libimagrt::runtime::Runtime;
use libimagrt::setup::generate_runtime_setup; use libimagrt::setup::generate_runtime_setup;
use libimagstore::store::FileLockEntry; use libimagstore::store::FileLockEntry;
use libimagerror::trace::{trace_error, trace_error_exit}; use libimagerror::trace::{trace_error, trace_error_exit};
use libimagentryview::builtin::stdout::StdoutViewer;
use libimagentryview::viewer::Viewer;
mod error; mod error;
mod ui; mod ui;
mod viewer;
use error::{ViewError, ViewErrorKind}; use error::{ViewError, ViewErrorKind};
use ui::build_ui; use ui::build_ui;
use viewer::Viewer;
use viewer::ViewInformation;
use viewer::stdout::StdoutViewer;
type Result<T> = RResult<T, ViewError>; type Result<T> = RResult<T, ViewError>;
@ -76,22 +74,17 @@ fn main() {
let viewer = { let viewer = {
if scmd.is_present("view-in-stdout") { if scmd.is_present("view-in-stdout") {
Box::new(StdoutViewer::new())
} else if scmd.is_present("view-in-ui") { } else if scmd.is_present("view-in-ui") {
warn!("Viewing in UI is currently not supported, switch to stdout"); warn!("Viewing in UI is currently not supported, switch to stdout");
Box::new(StdoutViewer::new())
} else if scmd.is_present("view-in-browser") { } else if scmd.is_present("view-in-browser") {
warn!("Viewing in browser is currently not supported, switch to stdout"); warn!("Viewing in browser is currently not supported, switch to stdout");
Box::new(StdoutViewer::new())
} else if scmd.is_present("view-in-texteditor") { } else if scmd.is_present("view-in-texteditor") {
warn!("Viewing in texteditor is currently not supported, switch to stdout"); warn!("Viewing in texteditor is currently not supported, switch to stdout");
Box::new(StdoutViewer::new())
} else if scmd.is_present("view-in-custom") { } else if scmd.is_present("view-in-custom") {
warn!("Viewing in custom is currently not supported, switch to stdout"); warn!("Viewing in custom is currently not supported, switch to stdout");
Box::new(StdoutViewer::new())
} else {
Box::new(StdoutViewer::new())
} }
StdoutViewer::new(view_header, view_content)
}; };
let entry = load_entry(entry_id, entry_version, &rt); let entry = load_entry(entry_id, entry_version, &rt);
@ -100,15 +93,10 @@ fn main() {
} }
let entry = entry.unwrap(); let entry = entry.unwrap();
let view_info = ViewInformation { if let Err(e) = viewer.view_entry(&entry) {
entry: entry, trace_error(&e);
view_header: view_header, exit(1);
view_content: view_content, }
view_copy: view_copy,
keep_copy: keep_copy,
};
viewer.view(view_info);
} }
} }