diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | bin/domain/imag-log/src/main.rs | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 5fc02d81..8a05e2a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,14 +16,14 @@ matrix: - bash ./scripts/branch-contains-no-tmp-commits - bash ./scripts/version-updated - language: rust - rust: 1.23.0 + rust: 1.24.0 cache: cargo: true script: - cargo build --all --all-features -j 1 || exit 1 - cargo test --all --all-features -j 1 || exit 1 - language: rust - rust: 1.24.0 + rust: 1.25.0 cache: cargo: true script: diff --git a/bin/domain/imag-log/src/main.rs b/bin/domain/imag-log/src/main.rs index befed156..053f06e5 100644 --- a/bin/domain/imag-log/src/main.rs +++ b/bin/domain/imag-log/src/main.rs @@ -104,6 +104,8 @@ fn main() { } fn show(rt: &Runtime) { + use std::borrow::Cow; + use libimagdiary::iter::DiaryEntryIterator; use libimagdiary::entry::DiaryEntry; @@ -114,13 +116,19 @@ fn show(rt: &Runtime) { .collect(), None => if scmd.is_present("show-all") { + debug!("Showing for all diaries"); rt.store() .diary_names() .map_err_trace_exit_unwrap(1) .map(|diary_name| { let diary_name = diary_name.map_err_trace_exit_unwrap(1); - Diary::entries(rt.store(), &diary_name).map_err_trace_exit_unwrap(1) + debug!("Getting entries for Diary: {}", diary_name); + let entries = Diary::entries(rt.store(), &diary_name).map_err_trace_exit_unwrap(1); + let diary_name = Cow::from(diary_name); + (entries, diary_name) }) + .unique_by(|tpl| tpl.1.clone()) + .map(|tpl| tpl.0) .collect() } else { // showing default logs @@ -144,6 +152,7 @@ fn show(rt: &Runtime) { .sorted_by_key(|&(ref id, _)| id.clone()) .into_iter() .map(|(id, entry)| { + debug!("Found entry: {:?}", entry); writeln!(rt.stdout(), "{dname: >10} - {y: >4}-{m:0>2}-{d:0>2}T{H:0>2}:{M:0>2} - {text}", dname = id.diary_name(), |