summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeon Schuermann <leon@is.currently.online>2019-09-14 18:53:33 +0200
committerMatthias Beyer <mail@beyermatthias.de>2019-10-26 14:41:31 +0200
commit4c918c78c0579575b3bfdbccedf8446a1d8f7246 (patch)
tree8bf2c51fc48a8554d8fec7cd311cc8322672a4bb
parent621c5f96f85770223aab1d1184c3d9d6543a3aac (diff)
downloadimag-4c918c78c0579575b3bfdbccedf8446a1d8f7246.zip
imag-4c918c78c0579575b3bfdbccedf8446a1d8f7246.tar.gz
imag-log: implement ImagApplication
Signed-off-by: Leon Schuermann <leon@is.currently.online>
-rw-r--r--bin/domain/imag-log/Cargo.toml7
-rw-r--r--bin/domain/imag-log/src/bin.rs39
-rw-r--r--bin/domain/imag-log/src/lib.rs (renamed from bin/domain/imag-log/src/main.rs)103
3 files changed, 108 insertions, 41 deletions
diff --git a/bin/domain/imag-log/Cargo.toml b/bin/domain/imag-log/Cargo.toml
index 80b96eb..5466caa 100644
--- a/bin/domain/imag-log/Cargo.toml
+++ b/bin/domain/imag-log/Cargo.toml
@@ -39,3 +39,10 @@ version = "2.33.0"
default-features = false
features = ["color", "suggestions", "wrap_help"]
+[lib]
+name = "libimaglogfrontend"
+path = "src/lib.rs"
+
+[[bin]]
+name = "imag-log"
+path = "src/bin.rs"
diff --git a/bin/domain/imag-log/src/bin.rs b/bin/domain/imag-log/src/bin.rs
new file mode 100644
index 0000000..b7e96de
--- /dev/null
+++ b/bin/domain/imag-log/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!(libimaglogfrontend, ImagLog);
diff --git a/bin/domain/imag-log/src/main.rs b/bin/domain/imag-log/src/lib.rs
index 85164ab..338a482 100644
--- a/bin/domain/imag-log/src/main.rs
+++ b/bin/domain/imag-log/src/lib.rs
@@ -44,7 +44,7 @@ extern crate failure;
extern crate textwrap;
extern crate libimaglog;
-#[macro_use] extern crate libimagrt;
+extern crate libimagrt;
extern crate libimagstore;
extern crate libimagerror;
extern crate libimagdiary;
@@ -56,9 +56,10 @@ use std::str::FromStr;
use failure::Error;
use failure::err_msg;
+use failure::Fallible as Result;
+use libimagrt::application::ImagApplication;
use libimagrt::runtime::Runtime;
-use libimagrt::setup::generate_runtime_setup;
use libimagerror::trace::MapErrTrace;
use libimagerror::io::ToExitCode;
use libimagerror::exit::ExitUnwrap;
@@ -70,50 +71,70 @@ use libimaglog::log::Log;
use libimagstore::iter::get::StoreIdGetIteratorExtension;
use libimagstore::store::FileLockEntry;
+use clap::App;
+
mod ui;
-use crate::ui::build_ui;
use toml::Value;
use itertools::Itertools;
-fn main() {
- let version = make_imag_version!();
- let rt = generate_runtime_setup("imag-log",
- &version,
- "Overlay to imag-diary to 'log' single lines of text",
- build_ui);
-
-
- if let Some(scmd) = rt.cli() .subcommand_name() {
- match scmd {
- "show" => show(&rt),
- other => {
- debug!("Unknown command");
- let _ = rt.handle_unknown_subcommand("imag-log", other, rt.cli())
- .map_err_trace_exit_unwrap()
- .code()
- .map(::std::process::exit);
- },
+/// Marker enum for implementing ImagApplication on
+///
+/// This is used by binaries crates to execute business logic
+/// or to build a CLI completion.
+pub enum ImagLog {}
+impl ImagApplication for ImagLog {
+ fn run(rt: Runtime) -> Result<()> {
+ if let Some(scmd) = rt.cli().subcommand_name() {
+ match scmd {
+ "show" => show(&rt),
+ other => {
+ debug!("Unknown command");
+ let _ = rt.handle_unknown_subcommand("imag-log", other, rt.cli())
+ .map_err_trace_exit_unwrap()
+ .code()
+ .map(::std::process::exit);
+ },
+ }
+ } else {
+ let text = get_log_text(&rt);
+ let diary_name = rt.cli()
+ .value_of("diaryname")
+ .map(String::from)
+ .unwrap_or_else(|| get_diary_name(&rt));
+
+ debug!("Writing to '{}': {}", diary_name, text);
+
+ rt
+ .store()
+ .new_entry_now(&diary_name)
+ .map(|mut fle| {
+ fle.make_log_entry().map_err_trace_exit_unwrap();
+ *fle.get_content_mut() = text;
+ fle
+ })
+ .map(|fle| rt.report_touched(fle.get_location()).unwrap_or_exit())
+ .map_err_trace_exit_unwrap();
+
}
- } else {
- let text = get_log_text(&rt);
- let diary_name = rt.cli()
- .value_of("diaryname")
- .map(String::from)
- .unwrap_or_else(|| get_diary_name(&rt));
-
- debug!("Writing to '{}': {}", diary_name, text);
-
- rt
- .store()
- .new_entry_now(&diary_name)
- .map(|mut fle| {
- fle.make_log_entry().map_err_trace_exit_unwrap();
- *fle.get_content_mut() = text;
- fle
- })
- .map(|fle| rt.report_touched(fle.get_location()).unwrap_or_exit())
- .map_err_trace_exit_unwrap();
+
+ 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 {
+ "Overlay to imag-diary to 'log' single lines of text"
+ }
+
+ fn version() -> &'static str {
+ env!("CARGO_PKG_VERSION")
}
}
@@ -203,7 +224,7 @@ fn show(rt: &Runtime) {
.unwrap_or_exit();
Ok(())
})
- .collect::<Result<Vec<()>, ExitCode>>()
+ .collect::<RResult<Vec<()>, ExitCode>>()
.unwrap_or_exit();
}