Print current holding in summary mode

Author: dmakarov

src/main.rs

@@ -2154,6 +2154,95 @@ async fn process_account_cost_basis(
     Ok(())
 }
 
+fn print_current_holdings(
+    held_tokens: &BTreeMap::<MaybeToken, (/*price*/ Option<Decimal>, /*amount*/ u64, RealizedGain)>,
+    tax_rate: Option<&TaxRate>,
+) {
+    println!("Current Holdings");
+    let mut held_tokens = held_tokens
+        .into_iter()
+        .map(
+            |(held_token, (current_token_price, total_held_amount, unrealized_gain))| {
+                let total_value = current_token_price.map(|current_token_price| {
+                    f64::try_from(
+                        Decimal::from_f64(held_token.ui_amount(*total_held_amount)).unwrap()
+                            * current_token_price,
+                    )
+                    .unwrap()
+                });
+
+                (
+                    held_token,
+                    total_value,
+                    current_token_price,
+                    total_held_amount,
+                    unrealized_gain,
+                )
+            },
+        )
+        .collect::<Vec<_>>();
+
+    // Order current holdings by `total_value`
+    held_tokens
+        .sort_unstable_by(|a, b| b.1.partial_cmp(&a.1).unwrap_or(std::cmp::Ordering::Equal));
+
+    for (held_token, total_value, current_token_price, total_held_amount, unrealized_gain) in
+        held_tokens
+    {
+        if *total_held_amount == 0 {
+            continue;
+        }
+
+        let estimated_tax = tax_rate
+            .and_then(|tax_rate| {
+                let tax = unrealized_gain.short_term_cap_gain * tax_rate.short_term_gain
+                    + unrealized_gain.long_term_cap_gain * tax_rate.long_term_gain;
+
+                if tax > 0. {
+                    Some(format!(
+                        "; ${} estimated tax",
+                        tax.separated_string_with_fixed_place(2)
+                    ))
+                } else {
+                    None
+                }
+            })
+            .unwrap_or_default();
+
+        if held_token.fiat_fungible() {
+            println!(
+                "  {:<7}       {:<22}",
+                held_token.to_string(),
+                held_token.format_amount(*total_held_amount)
+            );
+        } else {
+            println!(
+                "  {:<7}       {:<22} [{}; ${:>4} per {:>4}{}]",
+                held_token.to_string(),
+                held_token.format_amount(*total_held_amount),
+                total_value
+                    .map(|tv| {
+                        format!(
+                            "${:14} ({:>8}%)",
+                            tv.separated_string_with_fixed_place(2),
+                            ((tv - unrealized_gain.basis) / unrealized_gain.basis * 100.)
+                                .separated_string_with_fixed_place(2)
+                        )
+                    })
+                    .unwrap_or_else(|| "?".into()),
+                current_token_price
+                    .map(|current_token_price| f64::try_from(current_token_price)
+                        .unwrap()
+                        .separated_string_with_fixed_place(3))
+                    .unwrap_or_else(|| "?".into()),
+                held_token,
+                estimated_tax,
+            );
+        }
+    }
+    println!();
+}
+
 async fn process_account_list(
     db: &Db,
     rpc_client: &RpcClient,
@@ -2266,6 +2355,13 @@ async fn process_account_list(
             account.assert_lot_balance();
 
             if summary_only {
+                if !account.lots.is_empty() {
+                    let mut account_basis = 0.;
+                    for lot in account.lots.iter() {
+                        account_basis += lot.basis(account.token);
+                    }
+                    held_token.2.basis += account_basis;
+                }
                 continue;
             }
 
@@ -2433,6 +2529,9 @@ async fn process_account_list(
             println!();
         }
 
+        if summary_only {
+            print_current_holdings(&held_tokens, db.get_tax_rate());
+        }
         if account_filter.is_some() || summary_only {
             return Ok(());
         }
@@ -2600,89 +2699,7 @@ async fn process_account_list(
         }
         println!();
 
-        println!("Current Holdings");
-        let mut held_tokens = held_tokens
-            .into_iter()
-            .map(
-                |(held_token, (current_token_price, total_held_amount, unrealized_gain))| {
-                    let total_value = current_token_price.map(|current_token_price| {
-                        f64::try_from(
-                            Decimal::from_f64(held_token.ui_amount(total_held_amount)).unwrap()
-                                * current_token_price,
-                        )
-                        .unwrap()
-                    });
-
-                    (
-                        held_token,
-                        total_value,
-                        current_token_price,
-                        total_held_amount,
-                        unrealized_gain,
-                    )
-                },
-            )
-            .collect::<Vec<_>>();
-
-        // Order current holdings by `total_value`
-        held_tokens
-            .sort_unstable_by(|a, b| b.1.partial_cmp(&a.1).unwrap_or(std::cmp::Ordering::Equal));
-
-        for (held_token, total_value, current_token_price, total_held_amount, unrealized_gain) in
-            held_tokens
-        {
-            if total_held_amount == 0 {
-                continue;
-            }
-
-            let estimated_tax = tax_rate
-                .and_then(|tax_rate| {
-                    let tax = unrealized_gain.short_term_cap_gain * tax_rate.short_term_gain
-                        + unrealized_gain.long_term_cap_gain * tax_rate.long_term_gain;
-
-                    if tax > 0. {
-                        Some(format!(
-                            "; ${} estimated tax",
-                            tax.separated_string_with_fixed_place(2)
-                        ))
-                    } else {
-                        None
-                    }
-                })
-                .unwrap_or_default();
-
-            if held_token.fiat_fungible() {
-                println!(
-                    "  {:<7}       {:<22}",
-                    held_token.to_string(),
-                    held_token.format_amount(total_held_amount)
-                );
-            } else {
-                println!(
-                    "  {:<7}       {:<22} [{}; ${:>4} per {:>4}{}]",
-                    held_token.to_string(),
-                    held_token.format_amount(total_held_amount),
-                    total_value
-                        .map(|tv| {
-                            format!(
-                                "${:14} ({:>8}%)",
-                                tv.separated_string_with_fixed_place(2),
-                                ((tv - unrealized_gain.basis) / unrealized_gain.basis * 100.)
-                                    .separated_string_with_fixed_place(2)
-                            )
-                        })
-                        .unwrap_or_else(|| "?".into()),
-                    current_token_price
-                        .map(|current_token_price| f64::try_from(current_token_price)
-                            .unwrap()
-                            .separated_string_with_fixed_place(3))
-                        .unwrap_or_else(|| "?".into()),
-                    held_token,
-                    estimated_tax,
-                );
-            }
-        }
-        println!();
+        print_current_holdings(&held_tokens, tax_rate);
 
         println!("Summary");
         println!(