From 284cfa8fcb1301ca3ad087387e6edba2f9717b41 Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Thu, 25 Jun 2020 18:18:36 +0200
Subject: [PATCH] fix

---
 g1-stats.sh    |  4 ++--
 soldeByDays.sh | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++
 sum.sh         |  8 +++++++
 3 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100755 soldeByDays.sh
 create mode 100755 sum.sh

diff --git a/g1-stats.sh b/g1-stats.sh
index 955911d..30eb69b 100755
--- a/g1-stats.sh
+++ b/g1-stats.sh
@@ -46,7 +46,7 @@ loopWalletUp() {
 
 		# Récupération de la date du block
 		blockDate=$(echo "$WALLETS" | head -n1)
-		blockDate=$(date -d"@$blockDate" +%y-%m-%d)
+		blockDate=$(date -d"@$blockDate" +%y-%m-%d -u)
 
 		WALLETS=$(echo "$WALLETS" | tail -n +2 | tr -d '"' | awk -F '(' '{ print $2 }' | tr -d ')')
 
@@ -71,7 +71,7 @@ loopWalletUp() {
 
 	done
 }
-#loopWalletUp
+loopWalletUp
 
 ### Isolation des membres et wallets dans les fichiers de journalisation
 lsDays=$(ls $SCRIPTPATH/tmp)
diff --git a/soldeByDays.sh b/soldeByDays.sh
new file mode 100755
index 0000000..8b14a0f
--- /dev/null
+++ b/soldeByDays.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+startTime=$(date +'%H:%M')
+day=$(date +'%y-%m-%d')
+echo -e "\n############# $day à $startTime #############\n"
+
+SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
+if [[ -e $SCRIPTPATH/.env ]]; then source $SCRIPTPATH/.env; else echo "Veuillez créer votre fichier .env inspiré de .env.example" && exit 1; fi
+
+
+lsDaysW=$(ls $SCRIPTPATH/tmp/*_wallets) # | awk -F/ '{ print $NF }') # | awk -F_ '{ print $1 }')
+nbrW=$(cat $lsDaysW | wc -l)
+lsDaysW=$(echo "$lsDaysW" | awk -F/ '{ print $NF }')
+
+lsDaysM=$(ls $SCRIPTPATH/tmp/*_mbr)
+nbrM=$(cat $lsDaysM | wc -l)
+lsDaysM=$(echo "$lsDaysM" | awk -F/ '{ print $NF }')
+
+rm $SCRIPTPATH/tmp/*_solde 2>/dev/null
+
+daysLoop() {
+k=0
+for i in $lsDays; do
+#	[[ $k -le 50 ]] && ((k++)) && continue
+    walletDay=$(cat $SCRIPTPATH/tmp/$i)
+	[[ -z $walletDay ]] && continue
+    dateLDay=$(echo $i | awk -F_ '{ print $1 }')
+    dateLDay=$(date -d "$dateLDay" +%s -u)
+	dateLDay=$(($dateLDay-3600*2))
+    dateHDay=$(($dateLDay+60*60*24))
+	dateHDay=$(($dateHDay+3600*2))
+
+    for j in $walletDay; do
+		echo "$(echo $i | awk -F_ '{ print $1 }'): $j"
+		curl -s ${DUNITER}/tx/history/$j/times/$dateLDay/$dateHDay | jq '.history.received[].outputs[]' | grep $j | awk -F: '{ print $1 }' | tr -d '" ' >> $SCRIPTPATH/tmp/${i}_solde
+		((k++))
+		clear
+		echo -e "\n############# $day à $startTime #############\n"
+		progress=$(echo "scale=1; $k*100/$nbr/1" | bc)
+		echo "Scan: $progress% - $k/$nbr"
+    done
+
+	# Somme de la journée
+	soldes=$(cat $SCRIPTPATH/tmp/${i}_solde | awk '{total+=$1}END{print total}')
+	echo $soldes > $SCRIPTPATH/tmp/${i}_solde
+done
+}
+
+lsDays=$lsDaysW
+nbr=$nbrW
+daysLoop
+
+lsDays=$lsDaysM
+nbr=$nbrM
+daysLoop
+
+day=$(date +'%d-%m-%y')
+echo "$day - Heure de fin: $(date +'%H:%M')"
+
diff --git a/sum.sh b/sum.sh
new file mode 100755
index 0000000..f9861e9
--- /dev/null
+++ b/sum.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo "Total: $(echo $(($(cat tmp/*_solde | awk '{total+=$1}END{print total}')/100)) | sed ':a;s/\B[0-9]\{3\}\>/.&/;ta')"
+echo "Wallets: $(echo $(($(cat tmp/*wallets_solde | awk '{total+=$1}END{print total}')/100)) | sed ':a;s/\B[0-9]\{3\}\>/.&/;ta')"
+echo "Membres: $(echo $(($(cat tmp/*mbr_solde | awk '{total+=$1}END{print total}')/100)) | sed ':a;s/\B[0-9]\{3\}\>/.&/;ta')"
+
+echo "Fichiers vides:"
+for i in $(ls tmp/*_solde); do ! [[ $(cat $i) ]] && echo $i ; done