matthiasbeyer
/
imag
1
0
Fork 0
Code Releases Activity

imag-log: implement ImagApplication 

Signed-off-by: Leon Schuermann <leon@is.currently.online>
This commit is contained in:
Leon Schuermann 2019-09-14 18:53:33 +02:00 committed by Matthias Beyer
parent 621c5f96f8
commit 4c918c78c0
3 changed files with 104 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/domain/imag-log/Cargo.toml
View File

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

39
bin/domain/imag-log/src/bin.rs Normal file
View File

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

95
bin/domain/imag-log/src/main.rs → bin/domain/imag-log/src/lib.rs
View File

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