Move imag-tag to ID provider infrastructure

bin/core/imag-tag/src/main.rs

@@ -56,9 +56,7 @@ extern crate toml_query;
 #[cfg(test)]
 extern crate env_logger;
 
-use std::path::PathBuf;
 use std::io::Write;
-use std::io::Read;
 
 use libimagrt::runtime::Runtime;
 use libimagrt::setup::generate_runtime_setup;
@@ -84,30 +82,7 @@ fn main() {
                                     "Direct interface to the store. Use with great care!",
                                     build_ui);
 
-    let ids : Vec<PathBuf> = rt
+    let ids = rt.ids::<::ui::PathProvider>().map_err_trace_exit_unwrap(1);
-        .cli()
-        .values_of("id")
-        .map(|vals| {
-            vals.map(PathBuf::from).collect()
-        }).unwrap_or_else(|| {
-            if !rt.cli().is_present("ids-from-stdin") {
-                error!("No ids");
-                ::std::process::exit(1)
-            }
-
-            let stdin = rt.stdin().unwrap_or_else(|| {
-                error!("Cannot get handle to stdin");
-                ::std::process::exit(1)
-            });
-
-            let mut buf = String::new();
-            let _ = stdin.lock().read_to_string(&mut buf).unwrap_or_else(|_| {
-                error!("Failed to read from stdin");
-                ::std::process::exit(1)
-            });
-
-            buf.lines().map(PathBuf::from).collect()
-        });
 
     rt.cli()
         .subcommand_name()
@@ -116,14 +91,12 @@ fn main() {
                 list(id, &rt)
             },
             "remove" => for id in ids {
-                let id = PathBuf::from(id);
                 let add = None;
                 let rem = get_remove_tags(rt.cli());
                 debug!("id = {:?}, add = {:?}, rem = {:?}", id, add, rem);
                 alter(&rt, id, add, rem);
             },
             "add" => for id in ids {
-                let id = PathBuf::from(id);
                 let add = get_add_tags(rt.cli());
                 let rem = None;
                 debug!("id = {:?}, add = {:?}, rem = {:?}", id, add, rem);
@@ -139,10 +112,7 @@ fn main() {
         });
 }
 
-fn alter(rt: &Runtime, id: PathBuf, add: Option<Vec<Tag>>, rem: Option<Vec<Tag>>) {
+fn alter(rt: &Runtime, path: StoreId, add: Option<Vec<Tag>>, rem: Option<Vec<Tag>>) {
-    let path = StoreId::new(Some(rt.store().path().clone()), id).map_err_trace_exit_unwrap(1);
-    debug!("path = {:?}", path);
-
     match rt.store().get(path) {
         Ok(Some(mut e)) => {
             debug!("Entry header now = {:?}", e.get_header());
@@ -186,10 +156,7 @@ fn alter(rt: &Runtime, id: PathBuf, add: Option<Vec<Tag>>, rem: Option<Vec<Tag>>
     }
 }
 
-fn list(id: PathBuf, rt: &Runtime) {
+fn list(path: StoreId, rt: &Runtime) {
-    let path = StoreId::new(Some(rt.store().path().clone()), id).map_err_trace_exit_unwrap(1);
-    debug!("path = {:?}", path);
-
     let entry = match rt.store().get(path.clone()).map_err_trace_exit_unwrap(1) {
         Some(e) => e,
         None => warn_exit("No entry found.", 1),
@@ -330,7 +297,7 @@ mod tests {
         debug!("Add-tags: {:?}", add);
 
         debug!("Altering things");
-        alter(&rt, id.clone(), add, None);
+        alter(&rt, StoreId::new_baseless(id.clone()).unwrap(), add, None);
         debug!("Altered");
 
         let test_entry = rt.store().get(id).unwrap().unwrap();
@@ -365,7 +332,7 @@ mod tests {
         debug!("Rem-tags: {:?}", rem);
 
         debug!("Altering things");
-        alter(&rt, id.clone(), add, rem);
+        alter(&rt, StoreId::new_baseless(id.clone()).unwrap(), add, rem);
         debug!("Altered");
 
         let test_entry = rt.store().get(id).unwrap().unwrap();
@@ -393,7 +360,7 @@ mod tests {
         debug!("Rem-tags: {:?}", rem);
 
         debug!("Altering things");
-        alter(&rt, id.clone(), add, rem);
+        alter(&rt, StoreId::new_baseless(id.clone()).unwrap(), add, rem);
         debug!("Altered");
 
         let test_entry = rt.store().get(id).unwrap().unwrap();
@@ -421,7 +388,7 @@ mod tests {
         debug!("Rem-tags: {:?}", rem);
 
         debug!("Altering things");
-        alter(&rt, id.clone(), add, rem);
+        alter(&rt, StoreId::new_baseless(id.clone()).unwrap(), add, rem);
         debug!("Altered");
 
         let test_entry = rt.store().get(id).unwrap().unwrap();

bin/core/imag-tag/src/ui.rs

@@ -17,8 +17,14 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-use clap::{Arg, App, ArgGroup, SubCommand};
+use std::path::PathBuf;
 
+use clap::{Arg, ArgMatches, ArgGroup, App, SubCommand};
+
+use libimagstore::storeid::StoreId;
+use libimagstore::storeid::IntoStoreId;
+use libimagrt::runtime::IdPathProvider;
+use libimagerror::trace::MapErrTrace;
 use libimagentrytag::tag::is_tag;
 
 pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
@@ -30,14 +36,6 @@ pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
                 .value_name("ID")
                 .help("Entry to use"))
 
-        .arg(Arg::with_name("ids-from-stdin")
-                .long("ids-from-stdin")
-                .short("I")
-                .takes_value(false)
-                .required(false)
-                .multiple(false)
-                .help("Read store ids to tag from stdin"))
-
         .subcommand(SubCommand::with_name("add")
                    .about("Add tags")
                    .version("0.1")
@@ -104,3 +102,14 @@ pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
                    )
 
 }
+
+pub struct PathProvider;
+impl IdPathProvider for PathProvider {
+    fn get_ids(matches: &ArgMatches) -> Vec<StoreId> {
+        matches.values_of("id")
+            .unwrap()
+            .map(|s| PathBuf::from(s).into_storeid().map_err_trace_exit_unwrap(1))
+            .collect()
+    }
+}
+