From 431d54d1ae6825ae98a2da2903eb8e43622a589d Mon Sep 17 00:00:00 2001 From: fred Date: Thu, 7 Mar 2024 18:59:59 +0100 Subject: [PATCH] GPS.json format adaptation --- API/DRAGONS.sh | 4 ++-- RUNTIME/RSS2UPlanetSECTORTW.sh | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/API/DRAGONS.sh b/API/DRAGONS.sh index 12dd0768..814c8e10 100755 --- a/API/DRAGONS.sh +++ b/API/DRAGONS.sh @@ -55,8 +55,8 @@ rm ~/.zen/tmp/DRAGONS.json if [[ ! -s ~/.zen/tmp/DRAGONS.json ]]; then echo " ## cat ***/GPS.json" - cat ~/.zen/tmp/${IPFSNODEID}/GPS.json 2>/dev/null | jq -c '.[] + {ipfsnodeid: "'$IPFSNODEID'"}' > ~/.zen/tmp/${MOATS}/gps.grid - cat ~/.zen/tmp/swarm/12D*/GPS.json 2>/dev/null | jq -c '.[] + {ipfsnodeid: "'$IPFSNODEID'"}' | sort -u >> ~/.zen/tmp/${MOATS}/gps.grid + cat ~/.zen/tmp/${IPFSNODEID}/GPS.json 2>/dev/null | jq -c '. + {ipfsnodeid: "'$IPFSNODEID'"}' > ~/.zen/tmp/${MOATS}/gps.grid + cat ~/.zen/tmp/swarm/12D*/GPS.json 2>/dev/null | jq -c '. + {ipfsnodeid: "'$IPFSNODEID'"}' | sort -u >> ~/.zen/tmp/${MOATS}/gps.grid cat ~/.zen/tmp/${MOATS}/gps.grid | jq -s '.' | sed -e 's/\[/[/' -e 's/\]/]/' -e 's/},{/},\n{/g' > ~/.zen/tmp/DRAGONS.json fi diff --git a/RUNTIME/RSS2UPlanetSECTORTW.sh b/RUNTIME/RSS2UPlanetSECTORTW.sh index 16dbcb03..1067fe96 100755 --- a/RUNTIME/RSS2UPlanetSECTORTW.sh +++ b/RUNTIME/RSS2UPlanetSECTORTW.sh @@ -18,14 +18,16 @@ SECTOR=$2 ## Sector identifier _0.0_0.0 MOATS=$3 ## temp cache access INDEX=$4 ## SECTOR TW index file +echo + [[ ! -s ${RSS} ]] && echo "BAD RSS INPUT" && exit 1 +[[ "$(cat ${RSS})" == "[]" ]] && echo "EMPTY RSS " && exit 0 + [[ ! -d ~/.zen/tmp/${MOATS}/${SECTOR}/ ]] && echo "BAD UPLANET CONTEXT" && exit 1 [[ ! -s ${INDEX} ]] \ && sed "s~_SECTOR_~${SECTOR}~g" ${MY_PATH}/../templates/twsector.html > ${INDEX} \ && echo "REFRESHING SECTOR FROM empty TEMPLATE *****" -echo -echo ## EXTRACT PLAYER FROM RSS FILE NAME PLAYER=$(echo ${RSS} | rev | cut -d '/' -f 1 | rev | sed "s~.rss.json~~g") ## GET PLAYER INFORMATION