diff --git a/imag-view/src/main.rs b/imag-view/src/main.rs index 1300a9f2..7f92e36d 100644 --- a/imag-view/src/main.rs +++ b/imag-view/src/main.rs @@ -30,7 +30,6 @@ use std::path::PathBuf; use libimagrt::setup::generate_runtime_setup; use libimagerror::trace::trace_error_exit; use libimagentryview::builtin::stdout::StdoutViewer; -use libimagentryview::builtin::versions::VersionsViewer; use libimagentryview::viewer::Viewer; mod ui; @@ -66,9 +65,7 @@ fn main() { } }; - let res = if rt.cli().is_present("versions") { - VersionsViewer::new(rt.store()).view_entry(&entry) - } else { + let res = { if scmd.is_present("view-in-stdout") { } else if scmd.is_present("view-in-ui") { warn!("Viewing in UI is currently not supported, switch to stdout"); diff --git a/imag-view/src/ui.rs b/imag-view/src/ui.rs index 3d6592ad..b1081e86 100644 --- a/imag-view/src/ui.rs +++ b/imag-view/src/ui.rs @@ -10,12 +10,6 @@ pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> { .help("View this entry at this store path") .value_name("ID")) - .arg(Arg::with_name("versions") - .long("versions") - .takes_value(false) - .required(false) - .help("Only print available versions for this file")) - .arg(Arg::with_name("view-header") .long("header") .short("h") diff --git a/libimagentryview/src/builtin/mod.rs b/libimagentryview/src/builtin/mod.rs index ec41fd0f..657f5e80 100644 --- a/libimagentryview/src/builtin/mod.rs +++ b/libimagentryview/src/builtin/mod.rs @@ -1,4 +1,3 @@ pub mod editor; pub mod plain; pub mod stdout; -pub mod versions; diff --git a/libimagentryview/src/builtin/versions.rs b/libimagentryview/src/builtin/versions.rs deleted file mode 100644 index 1b09b332..00000000 --- a/libimagentryview/src/builtin/versions.rs +++ /dev/null @@ -1,56 +0,0 @@ -use libimagstore::store::Entry; -use libimagstore::store::Store; -use libimagerror::into::IntoError; - -use viewer::Viewer; -use result::Result; -use error::ViewErrorKind as VEK; -use error::MapErrInto; - -pub struct VersionsViewer<'a> { - store: &'a Store, -} - -impl<'a> VersionsViewer<'a> { - - pub fn new(store: &'a Store) -> VersionsViewer<'a> { - VersionsViewer { - store: store, - } - } - -} - -impl<'a> Viewer for VersionsViewer<'a> { - - fn view_entry(&self, entr: &Entry) -> Result<()> { - use glob::glob; - - entr.get_location() - .clone() - .with_base(self.store.path().clone()) - .to_str() - .map_err_into(VEK::ViewError) - .and_then(|s| { - s.split("~") - .next() - .ok_or(VEK::PatternError.into_error()) - .map(|s| format!("{}~*", s)) - .and_then(|pat| glob(&pat[..]).map_err(|_| VEK::PatternError.into_error())) - .and_then(|paths| { - for entry in paths { - println!("{}", - try!(entry - .map_err(|_| VEK::GlobError.into_error())) - .file_name() - .and_then(|s| s.to_str()) - .unwrap() // TODO - ); - }; - Ok(()) - }) - }) - } - -} -