From 8c9ce2c3dd20d215bcdb5bd0b078a4427b731af3 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Tue, 27 Feb 2024 02:03:29 +0100
Subject: [PATCH] NEW {} & INSIDE [{}]

---
 API/ZONE.sh                    | 51 +++++++++++++++++++---------------
 RUNTIME/RSS2UPlanetSECTORTW.sh |  8 +++---
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/API/ZONE.sh b/API/ZONE.sh
index 0e44881d..a647ccbf 100755
--- a/API/ZONE.sh
+++ b/API/ZONE.sh
@@ -111,9 +111,9 @@ if [[ ! -s ~/.zen/tmp/${JSON} ]]; then
         UMAPNS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${UMAP}.priv)
 
         echo '{ "gridNumbers": [ {"lat": '${LAT}', "lon": '${LON}', "number": "(_'${LAT}'_'${LON}') = '${totnum}'", "ipns": "'${myIPFS}/ipns/${UMAPNS}/_index.html'" } ] }' \
-            > ~/.zen/tmp/${MOATS}.http.grid
+            > ~/.zen/tmp/${MOATS}/http.grid
 
-        cp ~/.zen/tmp/${MOATS}.http.grid ~/.zen/tmp/${JSON}
+        cp ~/.zen/tmp/${MOATS}/http.grid ~/.zen/tmp/${JSON}
         cat ~/.zen/tmp/${JSON} >> ~/.zen/tmp/${MOATS}.http
 
         cat ~/.zen/tmp/${MOATS}.http | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
@@ -127,44 +127,51 @@ if [[ ! -s ~/.zen/tmp/${JSON} ]]; then
 
     ##############################################
     ## SEARCH FOR UPLANET TW NUMBERS IN THAT ZONE
-    echo '{ "gridNumbers": [' >> ~/.zen/tmp/${MOATS}.http.grid
+    echo '{ "gridNumbers": [' >> ~/.zen/tmp/${MOATS}/http.grid
 
     for i in $(seq 0 9);
     do
-        ZLAT=$(echo "$LAT + ${DEG} * $i" | bc -l )
+
+        ZLAT=$(echo "$LAT + ${DEG} * $i" | bc -l)
         [[ -z  ${ZLAT} ]] && ZLAT=0
-        # [[ ! $(echo $ZLAT | grep "\." ) ]] && ZLAT="${ZLAT}."
-            for j in $(seq 0 9); do
-                ZLON=$(echo "$LON + ${DEG} * $j" | bc -l )
-                [[ -z  ${ZLON} ]] && ZLON=0
-                # [[ ! $(echo $ZLON | grep "\." ) ]] && ZLON="${ZLON}."
-                echo " ## SEARCH UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*"
-                swarmnum=$(ls -d ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
-                nodenum=$(ls -d ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
-                totnum=$(( swarmnum + nodenum ))
 
-                [[ $totnum -gt 9 ]] && displaynum="X" || displaynum=$totnum
+        for j in $(seq 0 9); do
 
-                [[ $displaynum != "0" ]] && echo '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${displaynum}'", "ipns": "'${ZONEINDEX}'" }
-                ,' >> ~/.zen/tmp/${MOATS}.http.grid \
-                    && echo "${DEG} :" '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${totnum}'", "ipns": "'${ZONEINDEX}'" }'
+            ZLON=$(echo "$LON + ${DEG} * $j" | bc -l)
+            [[ -z  ${ZLON} ]] && ZLON=0
+
+            echo " ## SEARCH UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*"
+            swarmnum=$(ls -d ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
+            nodenum=$(ls -d ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
+            totnum=$(( swarmnum + nodenum ))
+
+            [[ $totnum -gt 9 ]] && displaynum="X" || displaynum=$totnum
+
+            [[ $displaynum != "0" ]] && echo '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${displaynum}'", "ipns": "'${ZONEINDEX}'" }
+            ,' >> ~/.zen/tmp/${MOATS}/http.grid \
+                && echo "${DEG} :" '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${totnum}'", "ipns": "'${ZONEINDEX}'" }'
+
+        done
 
-            done
     done
 
-    sed -i '$ d' ~/.zen/tmp/${MOATS}.http.grid ## REMOVE LAST ','
-    echo ']}'  >> ~/.zen/tmp/${MOATS}.http.grid
+    [[ ! $(cat ~/.zen/tmp/${MOATS}/http.grid | tail -n 1 | grep 'gridNumbers' ) ]] \
+        && sed -i '$ d' ~/.zen/tmp/${MOATS}/http.grid ## REMOVE LAST ','
+
+    echo ']}'  >> ~/.zen/tmp/${MOATS}/http.grid
 
     echo "## ADD TO CACHE ~/.zen/tmp/${JSON}"
-    cp ~/.zen/tmp/${MOATS}.http.grid ~/.zen/tmp/${JSON}
+    cp ~/.zen/tmp/${MOATS}/http.grid ~/.zen/tmp/${JSON}
 
 fi
 
+cat ~/.zen/tmp/${JSON} | jq -c
+
 ### SEND RESPONSE ON PORT
 cat ~/.zen/tmp/${JSON} >> ~/.zen/tmp/${MOATS}.http
 (
     cat ~/.zen/tmp/${MOATS}.http | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
-    rm ~/.zen/tmp/${MOATS}.http.grid 2>/dev/null
+    rm ~/.zen/tmp/${MOATS}/http.grid 2>/dev/null
     rm ~/.zen/tmp/${MOATS}.http && echo "BLURP ${JSON}"
 ) &
 ## CLEANING
diff --git a/RUNTIME/RSS2UPlanetSECTORTW.sh b/RUNTIME/RSS2UPlanetSECTORTW.sh
index 113229e7..74a0a004 100755
--- a/RUNTIME/RSS2UPlanetSECTORTW.sh
+++ b/RUNTIME/RSS2UPlanetSECTORTW.sh
@@ -109,7 +109,7 @@ while read title; do
         ## NEED SIGNATURES & TIDDLER SIMILARITY TO COME UP
 
         ## CHECK FOR EMAIL SIGNATURES DIFFERENCE
-        NTAGS=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .[].tags)
+        NTAGS=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .tags)
         NEMAILS=($(echo "$NTAGS" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
         NSIGN=${#NEMAILS[@]}
         echo "New Tiddler $NSIGN signatures : ${NEMAILS[*]}"
@@ -192,9 +192,9 @@ To Refuse<br>
         fi
 
         ## CHECK DIFFERENCE
-        DATENEW=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .[].modified)
-        TEXTNEW=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .[].text)
-        TAGSNEW=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .[].tags)
+        DATENEW=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .modified)
+        TEXTNEW=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .text)
+        TAGSNEW=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .tags)
         DATEINSIDE=$(cat ~/.zen/tmp/${MOATS}/INSIDE.json | jq -r .[].modified)
         TEXTINSIDE=$(cat ~/.zen/tmp/${MOATS}/INSIDE.json | jq -r .[].text)
         TAGSINSIDE=$(cat ~/.zen/tmp/${MOATS}/INSIDE.json | jq -r .[].tags)