imag-tag: implement ImagApplication

Signed-off-by: Leon Schuermann <leon@is.currently.online>

bin/core/imag-tag/Cargo.toml

@@ -51,3 +51,10 @@ path             = "../../../lib/core/libimagrt"
 default-features = false
 features         = ["testing"]
 
+[lib]
+name = "libimagtagcmd"
+path = "src/lib.rs"
+
+[[bin]]
+name = "imag-tag"
+path = "src/bin.rs"

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

@@ -0,0 +1,39 @@
+//
+// imag - the personal information management suite for the commandline
+// Copyright (C) 2015-2019 Matthias Beyer <mail@beyermatthias.de> and contributors
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; version
+// 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#![forbid(unsafe_code)]
+
+#![deny(
+    non_camel_case_types,
+    non_snake_case,
+    path_statements,
+    trivial_numeric_casts,
+    unstable_features,
+    unused_allocation,
+    unused_import_braces,
+    unused_imports,
+    unused_must_use,
+    unused_mut,
+    unused_qualifications,
+    while_true,
+)]
+
+#[macro_use] extern crate libimagrt;
+
+simple_imag_application_binary!(libimagtagcmd, ImagTag);

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

@@ -41,7 +41,7 @@ extern crate clap;
 extern crate failure;
 
 extern crate libimagstore;
-#[macro_use] extern crate libimagrt;
+extern crate libimagrt;
 extern crate libimagentrytag;
 extern crate libimagerror;
 
@@ -61,7 +61,7 @@ extern crate env_logger;
 use std::io::Write;
 
 use libimagrt::runtime::Runtime;
-use libimagrt::setup::generate_runtime_setup;
+use libimagrt::application::ImagApplication;
 use libimagentrytag::tagable::Tagable;
 use libimagentrytag::tag::Tag;
 use libimagerror::trace::trace_error;
@@ -71,53 +71,72 @@ use libimagerror::exit::ExitUnwrap;
 use libimagstore::storeid::StoreId;
 use libimagutil::warn_exit::warn_exit;
 
-use clap::ArgMatches;
+use clap::{App, ArgMatches};
+use failure::Fallible as Result;
 
 mod ui;
 
-use crate::ui::build_ui;
 
-fn main() {
+/// Marker enum for implementing ImagApplication on
-    let version = make_imag_version!();
+///
-    let rt = generate_runtime_setup("imag-tag",
+/// This is used by binaries crates to execute business logic
-                                    &version,
+/// or to build a CLI completion.
-                                    "Direct interface to the store. Use with great care!",
+pub enum ImagTag {}
-                                    build_ui);
+impl ImagApplication for ImagTag {
+    fn run(rt: Runtime) -> Result<()> {
+        let ids = rt
+            .ids::<crate::ui::PathProvider>()
+            .map_err_trace_exit_unwrap()
+            .unwrap_or_else(|| {
+                error!("No ids supplied");
+                ::std::process::exit(1);
+            })
+            .into_iter();
         
-    let ids = rt
+        if let Some(name) = rt.cli().subcommand_name() {
-        .ids::<crate::ui::PathProvider>()
+            match name {
-        .map_err_trace_exit_unwrap()
+                "list" => for id in ids {
-        .unwrap_or_else(|| {
+                    list(id, &rt)
-            error!("No ids supplied");
+                },
-            ::std::process::exit(1);
+                "remove" => for id in ids {
-        })
+                    let add = None;
-        .into_iter();
+                    let rem = get_remove_tags(rt.cli());
-
+                    debug!("id = {:?}, add = {:?}, rem = {:?}", id, add, rem);
-    if let Some(name) = rt.cli().subcommand_name() {
+                    alter(&rt, id, add, rem);
-        match name {
+                },
-            "list" => for id in ids {
+                "add" => for id in ids {
-                list(id, &rt)
+                    let add = get_add_tags(rt.cli());
-            },
+                    let rem = None;
-            "remove" => for id in ids {
+                    debug!("id = {:?}, add = {:?}, rem = {:?}", id, add, rem);
-                let add = None;
+                    alter(&rt, id, add, rem);
-                let rem = get_remove_tags(rt.cli());
+                },
-                debug!("id = {:?}, add = {:?}, rem = {:?}", id, add, rem);
+                other => {
-                alter(&rt, id, add, rem);
+                    debug!("Unknown command");
-            },
+                    let _ = rt.handle_unknown_subcommand("imag-tag", other, rt.cli())
-            "add" => for id in ids {
+                        .map_err_trace_exit_unwrap()
-                let add = get_add_tags(rt.cli());
+                        .code()
-                let rem = None;
+                        .map(::std::process::exit);
-                debug!("id = {:?}, add = {:?}, rem = {:?}", id, add, rem);
+                },
-                alter(&rt, id, add, rem);
+            }
-            },
-            other => {
-                debug!("Unknown command");
-                let _ = rt.handle_unknown_subcommand("imag-tag", other, rt.cli())
-                    .map_err_trace_exit_unwrap()
-                    .code()
-                    .map(::std::process::exit);
-            },
         }
+
+        Ok(())
+    }
+
+    fn build_cli<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
+        ui::build_ui(app)
+    }
+
+    fn name() -> &'static str {
+        env!("CARGO_PKG_NAME")
+    }
+
+    fn description() -> &'static str {
+        "Manage tags of entries"
+    }
+
+    fn version() -> &'static str {
+        env!("CARGO_PKG_VERSION")
     }
 }