From 6590a4b8cb67ee9e7db6526f104987a7bd4f7641 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Sat, 14 Sep 2019 18:54:34 +0200 Subject: [PATCH] imag-notes: implement ImagApplication Signed-off-by: Leon Schuermann --- bin/domain/imag-notes/Cargo.toml | 8 +++ bin/domain/imag-notes/src/bin.rs | 39 +++++++++++ bin/domain/imag-notes/src/{main.rs => lib.rs} | 70 ++++++++++++------- 3 files changed, 93 insertions(+), 24 deletions(-) create mode 100644 bin/domain/imag-notes/src/bin.rs rename bin/domain/imag-notes/src/{main.rs => lib.rs} (74%) diff --git a/bin/domain/imag-notes/Cargo.toml b/bin/domain/imag-notes/Cargo.toml index 20193d86..90d15f90 100644 --- a/bin/domain/imag-notes/Cargo.toml +++ b/bin/domain/imag-notes/Cargo.toml @@ -22,6 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.6" itertools = "0.8.0" +failure = "0.1.5" libimagrt = { version = "0.10.0", path = "../../../lib/core/libimagrt" } libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" } @@ -35,3 +36,10 @@ version = "2.33.0" default-features = false features = ["color", "suggestions", "wrap_help"] +[lib] +name = "libimagnotesfrontend" +path = "src/lib.rs" + +[[bin]] +name = "imag-notes" +path = "src/bin.rs" diff --git a/bin/domain/imag-notes/src/bin.rs b/bin/domain/imag-notes/src/bin.rs new file mode 100644 index 00000000..2de11de7 --- /dev/null +++ b/bin/domain/imag-notes/src/bin.rs @@ -0,0 +1,39 @@ +// +// imag - the personal information management suite for the commandline +// Copyright (C) 2015-2019 Matthias Beyer 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!(libimagnotesfrontend, ImagNotes); diff --git a/bin/domain/imag-notes/src/main.rs b/bin/domain/imag-notes/src/lib.rs similarity index 74% rename from bin/domain/imag-notes/src/main.rs rename to bin/domain/imag-notes/src/lib.rs index 86ebd65a..a62d299b 100644 --- a/bin/domain/imag-notes/src/main.rs +++ b/bin/domain/imag-notes/src/lib.rs @@ -37,9 +37,10 @@ extern crate clap; #[macro_use] extern crate log; extern crate itertools; +extern crate failure; extern crate libimagnotes; -#[macro_use] extern crate libimagrt; +extern crate libimagrt; extern crate libimagentryedit; extern crate libimagerror; extern crate libimagutil; @@ -49,10 +50,12 @@ use std::io::Write; use std::process::exit; use itertools::Itertools; +use clap::App; +use failure::Fallible as Result; use libimagentryedit::edit::Edit; use libimagrt::runtime::Runtime; -use libimagrt::setup::generate_runtime_setup; +use libimagrt::application::ImagApplication; use libimagstore::iter::get::StoreIdGetIteratorExtension; use libimagnotes::note::Note; use libimagnotes::notestore::*; @@ -65,30 +68,49 @@ use libimagutil::warn_result::WarnResult; mod ui; -use crate::ui::build_ui; -fn main() { - let version = make_imag_version!(); - let rt = generate_runtime_setup("imag-notes", - &version, - "Note taking helper", - build_ui); +/// Marker enum for implementing ImagApplication on +/// +/// This is used by binaries crates to execute business logic +/// or to build a CLI completion. +pub enum ImagNotes {} +impl ImagApplication for ImagNotes { + fn run(rt: Runtime) -> Result<()> { + if let Some(name) = rt.cli().subcommand_name() { - if let Some(name) = rt.cli().subcommand_name() { - debug!("Call: {}", name); - match name { - "create" => create(&rt), - "delete" => delete(&rt), - "edit" => edit(&rt), - "list" => list(&rt), - other => { - debug!("Unknown command"); - let _ = rt.handle_unknown_subcommand("imag-notes", other, rt.cli()) - .map_err_trace_exit_unwrap() - .code() - .map(::std::process::exit); - }, - }; + debug!("Call: {}", name); + match name { + "create" => create(&rt), + "delete" => delete(&rt), + "edit" => edit(&rt), + "list" => list(&rt), + other => { + debug!("Unknown command"); + let _ = rt.handle_unknown_subcommand("imag-notes", 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 { + "Note taking helper" + } + + fn version() -> &'static str { + env!("CARGO_PKG_VERSION") } }