From b74036c39d30f90fc957326b686b84a13a6b3cce Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Tue, 22 Sep 2020 04:36:33 +0200
Subject: [PATCH] Improve explorer; Add jq file for cumulate nbrMembres

---
 explorer.sh          | 11 ++++++++---
 lib/functions.sh     |  5 +++--
 lib/sumNbrMembers.jq |  6 ++++++
 3 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 lib/sumNbrMembers.jq

diff --git a/explorer.sh b/explorer.sh
index 657800e..c3033a7 100755
--- a/explorer.sh
+++ b/explorer.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
 
-dateRange=$2
 jsonFile="db/daily.json"
+dateRange=$2
+[[ -z $dateRange ]] && dateRange=$(jq -r '.[].date' $jsonFile | tail -n1)
 lineNbr=$(grep -n "$dateRange" $jsonFile | cut -d : -f 1)
-[[ -z $lineNbr ]] && echo "La date $dateRange n'existe pas en blockchain" && exit 1
+[[ -z $lineNbr ]] && echo "La date $dateRange n'existe pas en cache G1Stats" && exit 1
 
 cumulate() {
     lineNbr=$(($lineNbr+7))
@@ -42,4 +43,8 @@ day() {
     jq . <<<"$jsonDated"
 }
 
-$1
\ No newline at end of file
+mass() {
+	jq -f lib/sumNbrMembers.jq $jsonFile | jq '.UD*.nbrMembers' | awk '{ SUM += $1} END { printf "%.2f",  SUM }'; echo
+}
+
+$1
diff --git a/lib/functions.sh b/lib/functions.sh
index fc6653d..4b212e0 100755
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -21,6 +21,8 @@ addMembers() {
 	done
 	[[ -d $tmpSplit ]] && rm -r $tmpSplit || exit 1
 	popd >/dev/null
+
+        echo "$wallets" > tata
 }
 
 web() {
@@ -99,8 +101,7 @@ sumSoldes() {
 	soldeM=$(echo $soldeMBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
 
 	### Calcul de la masse monétaire et du pourcentage de Ḡ1 sur les simples portefeuilles ###
-	monetaryMass=$(curl -s ${DUNITER}/blockchain/current | jq .monetaryMass)
-	monetaryMassBrut=$(echo "scale=2; ($monetaryMass/100)/1" | bc)
+	monetaryMassBrut=$(curl -s ${DUNITER}/blockchain/current | jq .monetaryMass | xargs -i echo "scale=2; ({}/100)/1" | bc)
 	monetaryMass=$(echo "$monetaryMassBrut" | tr . , | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
 
 	pourcentSimpleWallet=$(echo "$soldeWBrut*100/$monetaryMassBrut/1" | bc -l | xargs printf %.1f)
diff --git a/lib/sumNbrMembers.jq b/lib/sumNbrMembers.jq
new file mode 100644
index 0000000..bb0b490
--- /dev/null
+++ b/lib/sumNbrMembers.jq
@@ -0,0 +1,6 @@
+def accumulates(f):
+  foreach .[] as $row
+    (0;
+     . + ($row | f) ;
+     . as $x | $row | (f = $x));
+accumulates(.nbrMembers)