Merge pull request #1419 from matthiasbeyer/imag-diary/list-diaries

Add functionality to list diaries
This commit is contained in:
Matthias Beyer 2018-04-20 09:24:07 +02:00 committed by GitHub
commit e0decb7294
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 0 deletions

View file

@ -26,6 +26,7 @@ chrono = "0.4"
log = "0.4.0" log = "0.4.0"
toml = "0.4" toml = "0.4"
toml-query = "0.6" toml-query = "0.6"
itertools = "0.7"
libimagerror = { version = "0.8.0", path = "../../../lib/core/libimagerror" } libimagerror = { version = "0.8.0", path = "../../../lib/core/libimagerror" }
libimagstore = { version = "0.8.0", path = "../../../lib/core/libimagstore" } libimagstore = { version = "0.8.0", path = "../../../lib/core/libimagstore" }

View file

@ -37,6 +37,7 @@ extern crate clap;
extern crate chrono; extern crate chrono;
extern crate toml; extern crate toml;
extern crate toml_query; extern crate toml_query;
extern crate itertools;
extern crate libimagdiary; extern crate libimagdiary;
extern crate libimagentryedit; extern crate libimagentryedit;
@ -47,9 +48,14 @@ extern crate libimagstore;
extern crate libimagtimeui; extern crate libimagtimeui;
extern crate libimagutil; extern crate libimagutil;
use std::io::Write;
use libimagrt::setup::generate_runtime_setup; use libimagrt::setup::generate_runtime_setup;
use libimagrt::runtime::Runtime;
use libimagerror::trace::MapErrTrace; use libimagerror::trace::MapErrTrace;
use itertools::Itertools;
mod create; mod create;
mod delete; mod delete;
mod edit; mod edit;
@ -76,6 +82,7 @@ fn main() {
.map(|name| { .map(|name| {
debug!("Call {}", name); debug!("Call {}", name);
match name { match name {
"diaries" => diaries(&rt),
"create" => create(&rt), "create" => create(&rt),
"delete" => delete(&rt), "delete" => delete(&rt),
"edit" => edit(&rt), "edit" => edit(&rt),
@ -92,3 +99,20 @@ fn main() {
}); });
} }
fn diaries(rt: &Runtime) {
use libimagdiary::diary::Diary;
use libimagerror::io::ToExitCode;
use libimagerror::exit::ExitUnwrap;
use libimagerror::iter::TraceIterator;
let out = rt.stdout();
let mut outlock = out.lock();
rt.store()
.diary_names()
.map_err_trace_exit_unwrap(1)
.trace_unwrap_exit(1)
.unique()
.for_each(|n| writeln!(outlock, "{}", n).to_exit_code().unwrap_or_exit())
}

View file

@ -28,6 +28,10 @@ pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
.required(false) .required(false)
.help("Use other than default diary")) .help("Use other than default diary"))
.subcommand(SubCommand::with_name("diaries")
.about("List all available diaries")
.version("0.1"))
.subcommand(SubCommand::with_name("create") .subcommand(SubCommand::with_name("create")
.about("Create a diary entry") .about("Create a diary entry")
.version("0.1") .version("0.1")