From 9c7df815d2b19929fe5ca5295c8a5526bcfcee73 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Fri, 12 Jun 2020 01:12:03 +0200
Subject: fix tests for sorting

---
 src/output/sorting.rs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/output')

diff --git a/src/output/sorting.rs b/src/output/sorting.rs
index f46a95c..78f3538 100644
--- a/src/output/sorting.rs
+++ b/src/output/sorting.rs
@@ -130,6 +130,7 @@ mod tests {
     use super::*;
 
     use chrono::prelude::*;
+    use chrono::Duration;
     use evtclib::Boss as B;
 
     #[test]
@@ -163,10 +164,12 @@ mod tests {
     fn test_sorting_cmp() {
         use Component::*;
 
+        let duration = Duration::zero();
         let logs: &[&LogResult] = &[
             &LogResult {
                 log_file: "".into(),
                 time: Utc.ymd(2020, 4, 3).and_hms(12, 0, 0),
+                duration,
                 boss: Some(B::Dhuum),
                 players: vec![],
                 outcome: FightOutcome::Success,
@@ -175,6 +178,7 @@ mod tests {
             &LogResult {
                 log_file: "".into(),
                 time: Utc.ymd(2020, 4, 3).and_hms(13, 0, 0),
+                duration,
                 boss: Some(B::Dhuum),
                 players: vec![],
                 outcome: FightOutcome::Success,
@@ -183,6 +187,7 @@ mod tests {
             &LogResult {
                 log_file: "".into(),
                 time: Utc.ymd(2020, 4, 3).and_hms(11, 0, 0),
+                duration,
                 boss: Some(B::Dhuum),
                 players: vec![],
                 outcome: FightOutcome::Success,
@@ -191,6 +196,7 @@ mod tests {
             &LogResult {
                 log_file: "".into(),
                 time: Utc.ymd(2020, 4, 3).and_hms(11, 0, 0),
+                duration,
                 boss: Some(B::Qadim),
                 players: vec![],
                 outcome: FightOutcome::Success,
@@ -199,6 +205,7 @@ mod tests {
             &LogResult {
                 log_file: "".into(),
                 time: Utc.ymd(2020, 4, 3).and_hms(11, 0, 0),
+                duration,
                 boss: Some(B::Dhuum),
                 players: vec![],
                 outcome: FightOutcome::Success,
-- 
cgit v1.2.3


From 47348c960072d62031490e923d7fe5a9122ff1cc Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Fri, 12 Jun 2020 12:49:44 +0200
Subject: include fight duration in output

Since we have this information now anyway, might as well include it.
We're using humantime here, as that produces the expected "xxm yys zzms"
output. The conversion shouldn't fail (the unwrap), as we should never
encounter negative fight durations.
---
 src/output/formats.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/output')

diff --git a/src/output/formats.rs b/src/output/formats.rs
index 51de033..560963b 100644
--- a/src/output/formats.rs
+++ b/src/output/formats.rs
@@ -36,7 +36,7 @@ impl Format for HumanReadable {
         };
         writeln!(
             result,
-            "{}: {} - {}: {}{} {}",
+            "{}: {} - {}: {}{} {} after {}",
             "Date".green(),
             item.time
                 .with_timezone(&Local)
@@ -47,6 +47,7 @@ impl Format for HumanReadable {
                 .unwrap_or_else(|| "unknown".into()),
             if item.is_cm { " CM" } else { "" },
             outcome,
+            humantime::Duration::from(item.duration.to_std().unwrap()),
         )
         .unwrap();
         for player in &item.players {
-- 
cgit v1.2.3