diff --git a/RUNTIME/G1PalPay.sh b/RUNTIME/G1PalPay.sh index 06c22814..8b39dc0e 100755 --- a/RUNTIME/G1PalPay.sh +++ b/RUNTIME/G1PalPay.sh @@ -134,6 +134,8 @@ while read LINE; do TXIAMOUNTUD=$(echo $JSON | jq -r .amountUD) COMMENT=$(echo $JSON | jq -r .comment) + lastTXdate=$(cat ~/.zen/game/players/${PLAYER}/.atdate) + [[ -z lastTXdate ]] && lastTXdate=0 [[ $(cat ~/.zen/game/players/${PLAYER}/.atdate) -ge $TXIDATE ]] \ && echo "PalPay $TXIDATE from $TXIPUBKEY ALREADY TREATED - continue" \ && continue @@ -141,7 +143,7 @@ while read LINE; do ## GET EMAILS FROM COMMENT TXIMAILS=($(echo "$COMMENT" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b")) - [[ $(echo "$TXIAMOUNT < 0" | bc) ]] \ + [[ $(echo "$TXIAMOUNT < 0" | bc) -eq 1 ]] \ && echo "TX-OUT $TXIDATE" \ && echo "$TXIDATE" > ~/.zen/game/players/${PLAYER}/.atdate \ && continue diff --git a/tools/search_for_this_email_in_players.sh b/tools/search_for_this_email_in_players.sh index 0158c4e9..204765cc 100755 --- a/tools/search_for_this_email_in_players.sh +++ b/tools/search_for_this_email_in_players.sh @@ -26,31 +26,37 @@ if [[ "${EMAIL}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then ## TODO ? SEARCH WITH DNSLINK echo "export TW=${INDEX} source=${source}" + mkdir -p ~/.zen/tmp/${MOATS} # SWARM CACHE index.html contains # - [[ ${source} != "LOCAL" ]] \ - && EXTERNAL=$(grep -o "url='/[^']*'" ${INDEX} | sed "s/url='\(.*\)'/\1/" | awk -F"/" '{print $3}') - - if [[ ! ${EXTERNAL} ]]; then - ## EXTRACT DATA FROM TW - mkdir -p ~/.zen/tmp/${MOATS} - rm -f ~/.zen/tmp/${MOATS}/Astroport.json - - tiddlywiki --load ${INDEX} --output ~/.zen/tmp/${MOATS} --render '.' 'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport' - - ASTROPORT=$(cat ~/.zen/tmp/${MOATS}/Astroport.json 2>/dev/null | jq -r .[].astroport) - ASTROG1=$(cat ~/.zen/tmp/${MOATS}/Astroport.json 2>/dev/null | jq -r .[].g1pub) - TWCHAIN=$(cat ~/.zen/tmp/${MOATS}/Astroport.json 2>/dev/null | jq -r .[].chain) - - ## GET ASTRONAUTENS - field was missing in TW model Astroport Tiddler - - ASTRONAUTENS=$(cat ~/.zen/tmp/${MOATS}/Astroport.json 2>/dev/null | jq -r .[].astronautens) - [[ ${ASTRONAUTENS} == "null" || ${ASTRONAUTENS} == "" ]] && ASTRONAUTENS="/ipns/"$(ipfs key list -l | grep -w ${ASTROG1} | cut -d ' ' -f1) - [[ ${ASTRONAUTENS} == "/ipns/" ]] && ASTRONAUTENS="/ipfs/${TWCHAIN}" - else - ASTRONAUTENS="/ipfs/${EXTERNAL}" - ASTROPORT="/ipns/$(echo $INDEX | rev | cut -d / -f 4 | rev)" + if [[ ${source} != "LOCAL" ]]; then + EXTERNAL=$(grep -o "url='/[^']*'" ${INDEX} | sed "s/url='\(.*\)'/\1/" | awk -F"/" '{print $3}') + [[ ! -s $HOME/.zen/tmp/flashmem/tw/${EXTERNAL}/index.html ]] \ + && mkdir $HOME/.zen/tmp/flashmem/tw/${EXTERNAL} \ + && ipfs cat /ipfs/${EXTERNAL} > $HOME/.zen/tmp/flashmem/tw/${EXTERNAL}/index.html + INDEX="$HOME/.zen/tmp/flashmem/tw/${EXTERNAL}/index.html" fi + #~ if [[ ! ${EXTERNAL} ]]; then + ## EXTRACT DATA FROM TW + rm -f ~/.zen/tmp/${MOATS}/Astroport.json + + tiddlywiki --load ${INDEX} --output ~/.zen/tmp/${MOATS} --render '.' 'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport' + + ASTROPORT=$(cat ~/.zen/tmp/${MOATS}/Astroport.json 2>/dev/null | jq -r .[].astroport) + ASTROG1=$(cat ~/.zen/tmp/${MOATS}/Astroport.json 2>/dev/null | jq -r .[].g1pub) + TWCHAIN=$(cat ~/.zen/tmp/${MOATS}/Astroport.json 2>/dev/null | jq -r .[].chain) + + ## GET ASTRONAUTENS - field was missing in TW model Astroport Tiddler - + ASTRONAUTENS=$(cat ~/.zen/tmp/${MOATS}/Astroport.json 2>/dev/null | jq -r .[].astronautens) + [[ ${ASTRONAUTENS} == "null" || ${ASTRONAUTENS} == "" ]] && ASTRONAUTENS="/ipns/"$(ipfs key list -l | grep -w ${ASTROG1} | cut -d ' ' -f1) + [[ ${ASTRONAUTENS} == "/ipns/" ]] && ASTRONAUTENS="/ipfs/${TWCHAIN}" + #~ else + #~ ASTRONAUTENS="/ipfs/${EXTERNAL}" + #~ ASTROG1=$(${MY_PATH}/../tools/ipfs_to_g1.py ${EXTERNAL}) + #~ ASTROPORT="/ipns/$(echo $INDEX | rev | cut -d / -f 4 | rev)" + #~ fi + rm -Rf ~/.zen/tmp/${MOATS} # cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r