continue ...
This commit is contained in:
parent
907c538e5a
commit
dee743556f
|
@ -1,3 +1,4 @@
|
||||||
.env
|
.env
|
||||||
renameHistory.sh
|
renameHistory.sh
|
||||||
tmp*
|
tmp*
|
||||||
|
db/*
|
||||||
|
|
|
@ -37,7 +37,7 @@ loopWalletUp() {
|
||||||
[[ -z ${TXBLOCKS[$i]} ]] && break
|
[[ -z ${TXBLOCKS[$i]} ]] && break
|
||||||
sleep 0.1
|
sleep 0.1
|
||||||
WALLETS0=$(curl -s ${DUNITER}/blockchain/block/${TXBLOCKS[$i]})
|
WALLETS0=$(curl -s ${DUNITER}/blockchain/block/${TXBLOCKS[$i]})
|
||||||
until WALLETS=$(echo $WALLETS0 | jq '.time,(.transactions[] | select(.issuers[0] as $issuers | .outputs[0]|contains($issuers)|not) | .outputs[0]')) 2>/dev/null; do
|
until WALLETS=$(echo $WALLETS0 | jq '.time,(.transactions[] | select(.issuers[0] as $issuers | .outputs[0]|contains($issuers)|not) | .outputs[0])' 2>/dev/null); do
|
||||||
[[ $isWeb != "web" ]] && echo -e "iter $iter \n$WALLETS0"
|
[[ $isWeb != "web" ]] && echo -e "iter $iter \n$WALLETS0"
|
||||||
sleep 2
|
sleep 2
|
||||||
WALLETS0=$(curl -s ${DUNITER}/blockchain/block/${TXBLOCKS[$i]})
|
WALLETS0=$(curl -s ${DUNITER}/blockchain/block/${TXBLOCKS[$i]})
|
||||||
|
@ -281,3 +281,6 @@ echo -e "$sleepyG1% des Ḡ1 n'ont jamais été utilisés."
|
||||||
rm $outFile
|
rm $outFile
|
||||||
day=$(date +'%d-%m-%y')
|
day=$(date +'%d-%m-%y')
|
||||||
echo "$day - Heure de fin: $(date +'%H:%M')"
|
echo "$day - Heure de fin: $(date +'%H:%M')"
|
||||||
|
|
||||||
|
echo "Début de la journalisation ..."
|
||||||
|
$SCRIPTPATH/soldeByDays.sh
|
||||||
|
|
|
@ -7,7 +7,6 @@ echo -e "\n############# $day à $startTime #############\n"
|
||||||
SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
|
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
|
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 }')
|
lsDaysW=$(ls $SCRIPTPATH/tmp/*_wallets) # | awk -F/ '{ print $NF }') # | awk -F_ '{ print $1 }')
|
||||||
nbrW=$(cat $lsDaysW | wc -l)
|
nbrW=$(cat $lsDaysW | wc -l)
|
||||||
lsDaysW=$(echo "$lsDaysW" | awk -F/ '{ print $NF }')
|
lsDaysW=$(echo "$lsDaysW" | awk -F/ '{ print $NF }')
|
||||||
|
@ -17,15 +16,20 @@ nbrM=$(cat $lsDaysM | wc -l)
|
||||||
lsDaysM=$(echo "$lsDaysM" | awk -F/ '{ print $NF }')
|
lsDaysM=$(echo "$lsDaysM" | awk -F/ '{ print $NF }')
|
||||||
|
|
||||||
rm $SCRIPTPATH/tmp/*_solde 2>/dev/null
|
rm $SCRIPTPATH/tmp/*_solde 2>/dev/null
|
||||||
|
! [[ -d $SCRIPTPATH/db ]] && mkdir $SCRIPTPATH/db
|
||||||
|
echo "[" > $SCRIPTPATH/db/recus.json
|
||||||
|
|
||||||
daysLoop() {
|
daysLoop() {
|
||||||
k=0
|
k=0
|
||||||
|
l=0
|
||||||
for i in $lsDays; do
|
for i in $lsDays; do
|
||||||
# [[ $k -le 50 ]] && ((k++)) && continue
|
[[ $l -ge 20 ]] && break ## ((k++)) && continue
|
||||||
|
((l++))
|
||||||
|
|
||||||
walletDay=$(cat $SCRIPTPATH/tmp/$i)
|
walletDay=$(cat $SCRIPTPATH/tmp/$i)
|
||||||
[[ -z $walletDay ]] && continue
|
[[ -z $walletDay ]] && continue
|
||||||
dateLDay=$(echo $i | awk -F_ '{ print $1 }')
|
dateT=$(echo $i | awk -F_ '{ print $1 }')
|
||||||
dateLDay=$(date -d "$dateLDay" +%s -u)
|
dateLDay=$(date -d "$dateT" +%s -u)
|
||||||
dateLDay=$(($dateLDay-3600*2))
|
dateLDay=$(($dateLDay-3600*2))
|
||||||
dateHDay=$(($dateLDay+60*60*24))
|
dateHDay=$(($dateLDay+60*60*24))
|
||||||
dateHDay=$(($dateHDay+3600*2))
|
dateHDay=$(($dateHDay+3600*2))
|
||||||
|
@ -43,6 +47,25 @@ for i in $lsDays; do
|
||||||
# Somme de la journée
|
# Somme de la journée
|
||||||
soldes=$(cat $SCRIPTPATH/tmp/${i}_solde | awk '{total+=$1}END{print total}')
|
soldes=$(cat $SCRIPTPATH/tmp/${i}_solde | awk '{total+=$1}END{print total}')
|
||||||
echo $soldes > $SCRIPTPATH/tmp/${i}_solde
|
echo $soldes > $SCRIPTPATH/tmp/${i}_solde
|
||||||
|
|
||||||
|
# Écriture en JSON
|
||||||
|
soldes=$(echo "scale=2; $soldes/100" | bc)
|
||||||
|
if [[ $lsDays == $lsDaysW ]]; then
|
||||||
|
local jsonTPL=$(sed s/_DATE/$dateT/g $SCRIPTPATH/tpl/recus.json)
|
||||||
|
local jsonTPL=$(sed s/_RWALLETS/$soldes/g <<< $jsonTPL)
|
||||||
|
local jsonTPL=$(sed s/_RMEMBRES/_RMEMBRES_$dateT/g <<< $jsonTPL)
|
||||||
|
echo -e "$jsonTPL" | tr -d '\\' >> $SCRIPTPATH/db/recus.json
|
||||||
|
elif [[ $lsDays == $lsDaysM ]]; then
|
||||||
|
if [[ ! $(grep $dateT $SCRIPTPATH/db/recus.json) ]]; then
|
||||||
|
local jsonTPL=$(sed s/_DATE/$dateT/g $SCRIPTPATH/tpl/recus.json)
|
||||||
|
local jsonTPL=$(sed s/_RWALLETS/0/g <<< $jsonTPL)
|
||||||
|
local jsonTPL=$(sed s/_RMEMBRES/$soldes/g <<< $jsonTPL)
|
||||||
|
echo -e "$jsonTPL" | tr -d '\\' >> $SCRIPTPATH/db/recus.json
|
||||||
|
else
|
||||||
|
sed -i s/_RMEMBRES_$dateT/$soldes/g $SCRIPTPATH/db/recus.json
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,6 +77,10 @@ lsDays=$lsDaysM
|
||||||
nbr=$nbrM
|
nbr=$nbrM
|
||||||
daysLoop
|
daysLoop
|
||||||
|
|
||||||
|
sed -i '$ s/,//g' $SCRIPTPATH/db/recus.json
|
||||||
|
echo "]" >> $SCRIPTPATH/db/recus.json
|
||||||
|
|
||||||
day=$(date +'%d-%m-%y')
|
day=$(date +'%d-%m-%y')
|
||||||
echo "$day - Heure de fin: $(date +'%H:%M')"
|
echo "$day - Heure de fin: $(date +'%H:%M')"
|
||||||
|
|
||||||
|
$SCRIPTPATH/sum.sh
|
||||||
|
|
Loading…
Reference in New Issue