From 04dfea4d8848d3f992c1073ba7af4effeb176b05 Mon Sep 17 00:00:00 2001
From: AramKoorn <aram.koorn@icloud.com>
Date: Sun, 3 Oct 2021 14:12:01 +0200
Subject: [PATCH] print out weighted yield

---
 tenbagger/cli.py     | 17 ++++++++++++++---
 tenbagger/version.py |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/tenbagger/cli.py b/tenbagger/cli.py
index 860fa4e..b4e448d 100644
--- a/tenbagger/cli.py
+++ b/tenbagger/cli.py
@@ -121,9 +121,11 @@ def main():
         print(port.df.drop(columns=['circulatingSupply', 'type']))
 
         # Print passive income
-        print(f'\n Total passive income: {port.df.passive_income.sum()} {env["CURRENCY"]} \n')
-        print(f'\n Total value stonks: {port.df[port.df.sector != "Crypto"].value.sum()} {env["CURRENCY"]} \n')
-        print(f'\n Total value crypto: {port.df[port.df.sector == "Crypto"].value.sum()} {env["CURRENCY"]} \n')
+        print(f'Total passive income: {port.df.passive_income.sum()} {env["CURRENCY"]} \n')
+        print(f'Total value stonks: {port.df[port.df.sector != "Crypto"].value.sum()} {env["CURRENCY"]} \n')
+        print(f'Total value crypto: {port.df[port.df.sector == "Crypto"].value.sum()} {env["CURRENCY"]} \n')
+        print(f'Total dividend income:  {port.df.dividends.sum()} {env["CURRENCY"]} \n')
+        print(f'Total staking rewards:  {port.df.staking_rewards.sum()} {env["CURRENCY"]} \n')
 
         # Print portfolio
         by_sector = make_percentage(port.df.groupby('sector').value.sum().reset_index(), 'value', 'sector')
@@ -132,6 +134,15 @@ def main():
         # Print total value
         print(f'Total value of portfolio: {round(port.df.value.sum(), 2) } {env["CURRENCY"]}')
 
+        # Print out Dividend yield
+        fmt = lambda x: "{:.3f}".format(x)
+        df = port.df.copy()
+        print(
+            f'Weighted dividend yield: {fmt(df[df.sector != "Crypto"].dividends.sum() / df[df.sector != "Crypto"].value.sum() * 100)}%')
+        print(
+            f'Weighted staking rewards: {fmt(df[df.sector == "Crypto"].staking_rewards.sum() / df[df.sector == "Crypto"].value.sum() * 100)}%')
+        print(f'Weighted yield portfolio: {fmt(df.passive_income.sum() / df.value.sum() * 100)}%')
+
     if args.tracker:
         from tenbagger.src.dashboard.trackerdash import main
         main()
diff --git a/tenbagger/version.py b/tenbagger/version.py
index 3d26edf..df12433 100644
--- a/tenbagger/version.py
+++ b/tenbagger/version.py
@@ -1 +1 @@
-__version__ = "0.4.1"
+__version__ = "0.4.2"