matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge pull request #1489 from matthiasbeyer/imag-log/fix-duplicated-printing

Browse source 
Fix: Duplicated printing of entries with "show --all"
This commit is contained in:
Matthias Beyer 2018-05-11 21:04:02 +02:00 committed by GitHub
commit f912d3e7f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bin/domain/imag-log/src/main.rs
View file

@ -104,6 +104,8 @@ fn main() {
} }
fn show(rt: &Runtime) { fn show(rt: &Runtime) {
use std::borrow::Cow;
use libimagdiary::iter::DiaryEntryIterator; use libimagdiary::iter::DiaryEntryIterator;
use libimagdiary::entry::DiaryEntry; use libimagdiary::entry::DiaryEntry;
@ -114,13 +116,19 @@ fn show(rt: &Runtime) {
.collect(), .collect(),
None => if scmd.is_present("show-all") { None => if scmd.is_present("show-all") {
debug!("Showing for all diaries");
rt.store() rt.store()
.diary_names() .diary_names()
.map_err_trace_exit_unwrap(1) .map_err_trace_exit_unwrap(1)
.map(|diary_name| { .map(|diary_name| {
let diary_name = diary_name.map_err_trace_exit_unwrap(1); 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() .collect()
} else { } else {
// showing default logs // showing default logs
@ -144,6 +152,7 @@ fn show(rt: &Runtime) {
.sorted_by_key(|&(ref id, _)| id.clone()) .sorted_by_key(|&(ref id, _)| id.clone())
.into_iter() .into_iter()
.map(|(id, entry)| { .map(|(id, entry)| {
debug!("Found entry: {:?}", entry);
writeln!(rt.stdout(), writeln!(rt.stdout(),
"{dname: >10} - {y: >4}-{m:0>2}-{d:0>2}T{H:0>2}:{M:0>2} - {text}", "{dname: >10} - {y: >4}-{m:0>2}-{d:0>2}T{H:0>2}:{M:0>2} - {text}",
dname = id.diary_name(), dname = id.diary_name(),