diff --git a/explorer.sh b/explorer.sh
index a2a0ae4..89e68df 100755
--- a/explorer.sh
+++ b/explorer.sh
@@ -57,7 +57,7 @@ day() {
mass() {
lineNbr=$(($lineNbr+7))
jsonDated="$(head -n$lineNbr $jsonFile)}]"
- jq -f $GPATH/lib/sumNbrMembers.jq <<<"$jsonDated" | jq '.UD*.nbrMembers' | awk '{ SUM += $1} END { printf "%.2f", SUM }'; echo
+ jq -f $GPATH/lib/cumulate.jq <<<"$jsonDated" | jq '.[] | .UD*.nbrMembers' | awk '{ SUM += $1} END { printf "%.2f", SUM }'; echo
}
[[ -z $cmd ]] && cmd=cumulate
diff --git a/lib/cumulate.jq b/lib/cumulate.jq
new file mode 100644
index 0000000..017fddf
--- /dev/null
+++ b/lib/cumulate.jq
@@ -0,0 +1,12 @@
+def roundit: .*100.0|round/100.0;
+[foreach .[] as $row ({nbrMembers: 0, nbrWallets: 0, sMembers: 0, rMembers: 0, sWallets: 0, rWallets: 0};
+ {
+ nbrMembers: ($row.nbrMembers + .nbrMembers),
+ nbrWallets: ($row.nbrWallets + .nbrWallets),
+ sMembers: ($row.sMembers + .sMembers|roundit),
+ rMembers: ($row.rMembers + .rMembers|roundit),
+ sWallets: ($row.sWallets + .sWallets|roundit),
+ rWallets: ($row.rWallets + .rWallets|roundit)
+ };
+ $row * .
+)]
diff --git a/lib/functions.sh b/lib/functions.sh
index 6869e04..f0f3fa9 100755
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -61,7 +61,7 @@ web() {
echo "$wallets" | grep . > $WEBPATH/data/wallets-g1.txt
echo -e "$membresPubkeys" | sed 's/ /\n/g' > $WEBPATH/data/wallets-g1-membres.txt
echo -e "$simpleWallets" > $WEBPATH/data/wallets-g1-simple.txt
- cp $GPATH/db/daily.json $WEBPATH/data/
+ cp $GPATH/db/{daily.json,cum-daily.json} $WEBPATH/data/
if [[ "$startTime" == "00:00" ]]; then
cp $indexhtml $WEBPATH/history/index_$day.html
diff --git a/lib/scanTxWallets.sh b/lib/scanTxWallets.sh
index 65ffe56..6732704 100755
--- a/lib/scanTxWallets.sh
+++ b/lib/scanTxWallets.sh
@@ -240,6 +240,9 @@ scanTxWallets() {
sed -i '$ s/,//g' $jsonFile
echo "]" >> $jsonFile
+ # On génère le JSON équivalent avec données cumulatives
+ jq -f $GPATH/lib/cumulate.jq $jsonFile > $GPATH/db/cum-daily.json
+
# On supprime les doublons et les lignes vides
wallets=$(echo -e "$wallets" | sort -u | awk 'NF')
# On écrit les pubkeys avec transaction dans un fichier de cache pour la prochaine itération
diff --git a/lib/sumNbrMembers.jq b/lib/sumNbrMembers.jq
deleted file mode 100644
index bb0b490..0000000
--- a/lib/sumNbrMembers.jq
+++ /dev/null
@@ -1,6 +0,0 @@
-def accumulates(f):
- foreach .[] as $row
- (0;
- . + ($row | f) ;
- . as $x | $row | (f = $x));
-accumulates(.nbrMembers)
diff --git a/tpl/index.html b/tpl/index.html
index c36ae24..3990656 100644
--- a/tpl/index.html
+++ b/tpl/index.html
@@ -1,16 +1,23 @@
-
-
- Ḡ1 Stats
+
+
+
+
+
+
+ Ḡ1 Stats
@@ -38,10 +45,20 @@ Masse monétaire: _monetaryMass Ḡ1
+
+
Ḡ1 reçus sur les wallets
+
+
+
+
+
+
Nombre de wallets
+
+
+
+
+
-| Liste de tous les wallets
-| Liste des wallets membres
-| Liste des simples portefeuilles |
Ces données sont mises à jours toutes les 3 heures.