matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

View in stdout if not specified otherwise

Browse source
This commit is contained in:
Matthias Beyer 2016-09-21 17:07:23 +02:00
parent 90bb61674f
commit 2b2116fb95
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
imag-view/src/main.rs
View file

@ -48,14 +48,6 @@ fn main() {
let view_header = rt.cli().is_present("view-header"); let view_header = rt.cli().is_present("view-header");
let view_content = rt.cli().is_present("view-content"); let view_content = rt.cli().is_present("view-content");
let scmd = match rt.cli().subcommand_matches("view-in") {
None => {
debug!("No commandline call");
exit(1); // we can afford not-executing destructors here
}
Some(s) => s,
};
let entry = match rt.store().get(PathBuf::from(entry_id)) { let entry = match rt.store().get(PathBuf::from(entry_id)) {
Ok(Some(fle)) => fle, Ok(Some(fle)) => fle,
Ok(None) => { Ok(None) => {
@ -68,19 +60,27 @@ fn main() {
}; };
let res = { let res = {
if scmd.is_present("view-in-stdout") { match rt.cli().subcommand_matches("view-in") {
} else if scmd.is_present("view-in-ui") { None => {
debug!("No commandline call");
debug!("Assuming to view in cli (stdout)");
},
Some(s) => {
if s.is_present("view-in-stdout") {
} else if s.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");
} else if scmd.is_present("view-in-browser") { } else if s.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");
} else if scmd.is_present("view-in-texteditor") { } else if s.is_present("view-in-texteditor") {
if let Err(e) = Editor::new(&rt, &entry).show() { if let Err(e) = Editor::new(&rt, &entry).show() {
error!("Cannot view in editor: {}", e); error!("Cannot view in editor: {}", e);
trace_error_exit(&e, 1); trace_error_exit(&e, 1);
} }
} else if scmd.is_present("view-in-custom") { } else if s.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");
} }
},
};
StdoutViewer::new(view_header, view_content).view_entry(&entry) StdoutViewer::new(view_header, view_content).view_entry(&entry)
}; };