matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge pull request #682 from matthiasbeyer/rewrite-storeid-type-cleanup-libimagentryview

Browse source 
libimagentryview cleanup
This commit is contained in:
Matthias Beyer 2016-09-02 08:24:50 +02:00 committed by GitHub
commit ae280f178c
4 changed files with 1 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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");

6
imag-view/src/ui.rs
View file

@ -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")

1
libimagentryview/src/builtin/mod.rs
View file

@ -1,4 +1,3 @@
pub mod editor;
pub mod plain;
pub mod stdout;
pub mod versions;

56
libimagentryview/src/builtin/versions.rs
View file

@ -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(())
})
})
}
}