Updating for v0.5.6 release.

Author: mikechambers

README.md

@@ -204,6 +204,10 @@ $ cargo build --release
 
 which will place the compiled tools in *src/target/release*
 
+## Known Issues
+
+* Tied matches are not displayed correctly, and are treated as a Victory.
+
 ## License
 
 Project released under a [MIT License](LICENSE.md).

RELEASE.md

@@ -1,5 +1,8 @@
 # dcli Release Notes
 
+## v0.5.6 February 7, 2021
+* Display mercy data in dcliah
+
 ## v0.5.5 January 24, 2021
 * Added player rating to dcliad (this is based on Destiny combat rating, similar to elo)
 * Fixed bug where wrong platform was being stored for players. Requires database update and data to be re-synced

src/Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "dcli"
 #version
-version = "0.5.5"
+version = "0.5.6"
 authors = ["Mike Chambers <mikechambers@gmail.com>"]
 edition = "2018"
 description = "Library for the dcli collection of command line tools for Destiny 2."

src/dcli/Cargo.toml

@@ -34,7 +34,8 @@ use std::{cmp::max, collections::hash_map::DefaultHasher, hash::Hasher};
 use std::{collections::HashMap, hash::Hash};
 
 use crate::utils::{
-    calculate_efficiency, calculate_kills_deaths_assists, calculate_kills_deaths_ratio,
+    calculate_efficiency, calculate_kills_deaths_assists,
+    calculate_kills_deaths_ratio,
 };
 
 const PLAYER_START_BUFFER: u32 = 30;
@@ -55,7 +56,10 @@ pub struct CrucibleActivity {
 }
 
 impl CrucibleActivity {
-    pub fn get_member_performance(&self, member_id: &str) -> Option<&CruciblePlayerPerformance> {
+    pub fn get_member_performance(
+        &self,
+        member_id: &str,
+    ) -> Option<&CruciblePlayerPerformance> {
         for t in self.teams.values() {
             for p in &t.player_performances {
                 if p.player.member_id == member_id {
@@ -225,7 +229,8 @@ impl AggregateCruciblePerformances {
         performances: &[&CruciblePlayerPerformance],
     ) -> AggregateCruciblePerformances {
         let mut out = AggregateCruciblePerformances::default();
-        let mut extended = ExtendedCruciblePlayerActivityPerformances::default();
+        let mut extended =
+            ExtendedCruciblePlayerActivityPerformances::default();
 
         out.total_activities = performances.len() as u32;
 
@@ -258,7 +263,8 @@ impl AggregateCruciblePerformances {
             out.highest_deaths = max(p.stats.deaths, out.highest_deaths);
             out.highest_opponents_defeated =
                 max(p.stats.opponents_defeated, out.highest_opponents_defeated);
-            out.highest_efficiency = out.highest_efficiency.max(p.stats.efficiency);
+            out.highest_efficiency =
+                out.highest_efficiency.max(p.stats.efficiency);
             out.highest_kills_deaths_ratio = out
                 .highest_kills_deaths_ratio
                 .max(p.stats.kills_deaths_ratio);
@@ -289,9 +295,11 @@ impl AggregateCruciblePerformances {
 
             #[allow(clippy::comparison_chain)]
             if streak > 0 {
-                longest_win_streak = std::cmp::max(longest_win_streak, streak as u32);
+                longest_win_streak =
+                    std::cmp::max(longest_win_streak, streak as u32);
             } else if streak < 0 {
-                longest_loss_streak = std::cmp::max(longest_loss_streak, streak.abs() as u32);
+                longest_loss_streak =
+                    std::cmp::max(longest_loss_streak, streak.abs() as u32);
             }
 
             last_standing = p.stats.standing;
@@ -317,12 +325,18 @@ impl AggregateCruciblePerformances {
                     e.weapon_kills_grenade,
                 );
 
-                extended.highest_weapon_kills_melee =
-                    max(extended.highest_weapon_kills_melee, e.weapon_kills_melee);
-                extended.highest_weapon_kills_super =
-                    max(extended.highest_weapon_kills_super, e.weapon_kills_super);
-                extended.highest_all_medals_earned =
-                    max(extended.highest_all_medals_earned, e.all_medals_earned);
+                extended.highest_weapon_kills_melee = max(
+                    extended.highest_weapon_kills_melee,
+                    e.weapon_kills_melee,
+                );
+                extended.highest_weapon_kills_super = max(
+                    extended.highest_weapon_kills_super,
+                    e.weapon_kills_super,
+                );
+                extended.highest_all_medals_earned = max(
+                    extended.highest_all_medals_earned,
+                    e.all_medals_earned,
+                );
 
                 for m in &e.medals {
                     let key = &m.medal.id;
@@ -362,7 +376,8 @@ impl AggregateCruciblePerformances {
                         if ws.kills == 0 {
                             0.0
                         } else {
-                            (ws.precision_kills as f32 / ws.kills as f32) * 100.0
+                            (ws.precision_kills as f32 / ws.kills as f32)
+                                * 100.0
                         }
                     };
                 }
@@ -373,11 +388,13 @@ impl AggregateCruciblePerformances {
         out.longest_loss_streak = longest_loss_streak;
 
         if has_extended {
-            let mut medals: Vec<MedalStat> = medal_hash.into_iter().map(|(_id, m)| m).collect();
+            let mut medals: Vec<MedalStat> =
+                medal_hash.into_iter().map(|(_id, m)| m).collect();
 
             medals.sort_by(|a, b| b.count.cmp(&a.count));
 
-            let mut weapons: Vec<WeaponStat> = weapon_hash.into_iter().map(|(_id, w)| w).collect();
+            let mut weapons: Vec<WeaponStat> =
+                weapon_hash.into_iter().map(|(_id, w)| w).collect();
             weapons.sort_by(|a, b| b.kills.cmp(&a.kills));
 
             extended.medals = medals;
@@ -389,11 +406,14 @@ impl AggregateCruciblePerformances {
         }
 
         if out.total_activities > 0 {
-            out.win_rate = (out.wins as f32 / out.total_activities as f32) * 100.0;
+            out.win_rate =
+                (out.wins as f32 / out.total_activities as f32) * 100.0;
         }
 
-        out.efficiency = calculate_efficiency(out.kills, out.deaths, out.assists);
-        out.kills_deaths_ratio = calculate_kills_deaths_ratio(out.kills, out.deaths);
+        out.efficiency =
+            calculate_efficiency(out.kills, out.deaths, out.assists);
+        out.kills_deaths_ratio =
+            calculate_kills_deaths_ratio(out.kills, out.deaths);
         out.kills_deaths_assists =
             calculate_kills_deaths_assists(out.kills, out.deaths, out.assists);
 

src/dcli/src/crucible.rs

@@ -1,7 +1,7 @@
 [package]
 name = "dclia"
 #version
-version = "0.5.5"
+version = "0.5.6"
 authors = ["Mike Chambers <mikechambers@gmail.com>"]
 description = "Command line tool for retrieving information on current activity for specified player character."
 homepage = "https://www.mikechambers.com"

src/dclia/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dcliad"
 #version
-version = "0.5.5"
+version = "0.5.6"
 authors = ["Mike Chambers <mikechambers@gmail.com>"]
 edition = "2018"
 description = "Command line tool for viewing Destiny 2 activity details."

src/dcliad/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dcliah"
 #version
-version = "0.5.5"
+version = "0.5.6"
 authors = ["Mike Chambers <mikechambers@gmail.com>"]
 edition = "2018"
 description = "Command line tool for viewing Destiny 2 activity history."

src/dcliah/Cargo.toml

@@ -32,7 +32,8 @@ use dcli::enums::{
 use dcli::manifestinterface::ManifestInterface;
 use dcli::{
     crucible::{
-        AggregateCruciblePerformances, CruciblePlayerActivityPerformance, CruciblePlayerPerformance,
+        AggregateCruciblePerformances, CruciblePlayerActivityPerformance,
+        CruciblePlayerPerformance,
     },
     enums::mode::Mode,
     utils::{calculate_ratio, human_duration},
@@ -45,7 +46,8 @@ use dcli::enums::weaponsort::WeaponSort;
 use dcli::activitystoreinterface::ActivityStoreInterface;
 
 use dcli::utils::{
-    determine_data_dir, format_f32, human_date_format, repeat_str, uppercase_first_char,
+    determine_data_dir, format_f32, human_date_format, repeat_str,
+    uppercase_first_char,
 };
 //use dcli::utils::EXIT_FAILURE;
 use dcli::utils::EXIT_FAILURE;
@@ -243,7 +245,9 @@ fn print_default(
         let grenades = extended.weapon_kills_grenade;
         let melees = extended.weapon_kills_melee;
 
-        let mercy_str = if activity.performance.stats.completion_reason == CompletionReason::Mercy {
+        let mercy_str = if activity.performance.stats.completion_reason
+            == CompletionReason::Mercy
+        {
             "X"
         } else {
             ""
@@ -401,13 +405,17 @@ fn print_default(
         }
         WeaponSort::KillsPerGameTotal => {
             weapons.sort_by(|a, b| {
-                let a_kpg = calculate_ratio(a.kills, aggregate.total_activities);
-                let b_kpg = calculate_ratio(b.kills, aggregate.total_activities);
+                let a_kpg =
+                    calculate_ratio(a.kills, aggregate.total_activities);
+                let b_kpg =
+                    calculate_ratio(b.kills, aggregate.total_activities);
                 b_kpg.partial_cmp(&a_kpg).unwrap()
             });
         }
         WeaponSort::PrecisionTotal => {
-            weapons.sort_by(|a, b| b.precision_kills.partial_cmp(&a.precision_kills).unwrap());
+            weapons.sort_by(|a, b| {
+                b.precision_kills.partial_cmp(&a.precision_kills).unwrap()
+            });
         }
         WeaponSort::PrecisionPercent => {
             weapons.sort_by(|a, b| {
@@ -418,8 +426,10 @@ fn print_default(
         }
         WeaponSort::Type => {
             weapons.sort_by(|a, b| {
-                let a_type = format!("{}", a.weapon.item_sub_type).to_lowercase();
-                let b_type = format!("{}", b.weapon.item_sub_type).to_lowercase();
+                let a_type =
+                    format!("{}", a.weapon.item_sub_type).to_lowercase();
+                let b_type =
+                    format!("{}", b.weapon.item_sub_type).to_lowercase();
 
                 a_type.cmp(&b_type)
             });
@@ -653,33 +663,40 @@ async fn main() {
         _ => opt.end_moment.get_date_time(),
     };
 
-    let time_period = match DateTimePeriod::with_start_end_time(start_time, end_time) {
-        Ok(e) => e,
-        Err(_e) => {
-            eprintln!("--end-moment must be greater than --moment");
-            std::process::exit(EXIT_FAILURE);
-        }
-    };
+    let time_period =
+        match DateTimePeriod::with_start_end_time(start_time, end_time) {
+            Ok(e) => e,
+            Err(_e) => {
+                eprintln!("--end-moment must be greater than --moment");
+                std::process::exit(EXIT_FAILURE);
+            }
+        };
+
+    let mut store =
+        match ActivityStoreInterface::init_with_path(&data_dir, opt.verbose)
+            .await
+        {
+            Ok(e) => e,
+            Err(e) => {
+                print_error(
+                    "Could not initialize activity store. Have you run dclias?",
+                    e,
+                );
+                std::process::exit(EXIT_FAILURE);
+            }
+        };
 
-    let mut store = match ActivityStoreInterface::init_with_path(&data_dir, opt.verbose).await {
+    let mut manifest = match ManifestInterface::new(&data_dir, false).await {
         Ok(e) => e,
         Err(e) => {
             print_error(
-                "Could not initialize activity store. Have you run dclias?",
+                "Could not initialize manifest. Have you run dclim?",
                 e,
             );
             std::process::exit(EXIT_FAILURE);
         }
     };
 
-    let mut manifest = match ManifestInterface::new(&data_dir, false).await {
-        Ok(e) => e,
-        Err(e) => {
-            print_error("Could not initialize manifest. Have you run dclim?", e);
-            std::process::exit(EXIT_FAILURE);
-        }
-    };
-
     if !opt.no_sync {
         match store.sync(&opt.member_id, &opt.platform).await {
             Ok(_e) => (),