From 97308f601ec54b3c3ce5811e9a18c625a728cb71 Mon Sep 17 00:00:00 2001 From: poka Date: Tue, 22 Sep 2020 22:04:30 +0200 Subject: [PATCH] Add debug scripts checkMissingDate.sh, compareMass.sh; Improve mass function in explorer --- explorer.sh | 4 +++- scripts/checkMissingDate.sh | 10 ++++++++++ scripts/compareMass.sh | 22 ++++++++++++++++++++++ scripts/export_sommes.sh | 4 +--- 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100755 scripts/checkMissingDate.sh create mode 100755 scripts/compareMass.sh mode change 100755 => 100644 scripts/export_sommes.sh diff --git a/explorer.sh b/explorer.sh index c3033a7..f988742 100755 --- a/explorer.sh +++ b/explorer.sh @@ -44,7 +44,9 @@ day() { } mass() { - jq -f lib/sumNbrMembers.jq $jsonFile | jq '.UD*.nbrMembers' | awk '{ SUM += $1} END { printf "%.2f", SUM }'; echo + lineNbr=$(($lineNbr+7)) + jsonDated="$(head -n$lineNbr $jsonFile)}]" + jq -f lib/sumNbrMembers.jq <<<"$jsonDated" | jq '.UD*.nbrMembers' | awk '{ SUM += $1} END { printf "%.2f", SUM }'; echo } $1 diff --git a/scripts/checkMissingDate.sh b/scripts/checkMissingDate.sh new file mode 100755 index 0000000..f14907b --- /dev/null +++ b/scripts/checkMissingDate.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +j=0 +for i in $(jq -r .[].date db/daily.json); do + ((j++)) + date=$(awk -F '-' '{ print $3"-"$2"-"$1 }' <<<"$i") + if ! [[ $(grep $(date -d "$date+1day" '+%d-%m-%y') <<<$(jq -r .[].date db/daily.json)) ]]; then + echo "$(date -d "$date+1day" '+%d-%m-%y'): $j" + fi +done diff --git a/scripts/compareMass.sh b/scripts/compareMass.sh new file mode 100755 index 0000000..d6149ab --- /dev/null +++ b/scripts/compareMass.sh @@ -0,0 +1,22 @@ +#!/bin/bash +source .env + +day=$1 +[[ -z $day ]] && day=1 +bloc=$(grep -n . db/udblocs | grep -E "^$day:" | cut -d: -f2) +chainData=$(curl -s ${DUNITER}/blockchain/block/$bloc | jq '.membersCount,.monetaryMass') +chainMass=$(tail -n1 <<<"$chainData" | xargs -i echo "scale=2; {}/100" | bc) +chainMbr=$(head -n1 <<<"$chainData") + +((day--)) +Date=$(date -d "17-03-08+${day}day" '+%d-%m-%y') +jsonMass=$(./explorer.sh mass $Date) + +jsonMbr=$(./explorer.sh cumulate $Date | jq .nbrMembers) + +#if [[ $jsonMbr != $chainMbr ]]; then +echo "$Date - $bloc - $day +json : $jsonMbr - $jsonMass +chain: $chainMbr - $chainMass +" +#fi diff --git a/scripts/export_sommes.sh b/scripts/export_sommes.sh old mode 100755 new mode 100644 index ceda966..60d7fee --- a/scripts/export_sommes.sh +++ b/scripts/export_sommes.sh @@ -1,5 +1,3 @@ #!/bin/bash -SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" - -jq -r '.[] | "---", .date, .rWallets + .rMembers' $SCRIPTPATH/../db/daily.json > $SCRIPTPATH/../db/somme.txt +jq -r '.[] | "---", .date, .rWallets + .rMembres' db/recus.json > db/somme.txt