From c7bd4749225538ddd226dc5b66154ef1ed497973 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 5 Mar 2024 12:26:45 +0100 Subject: [PATCH] ameliorations --- RUNTIME/REGION.refresh.sh | 15 +++++++++---- RUNTIME/RSS2UPlanetSECTORTW.sh | 40 +++++++++++++++++++++------------- tools/PAY4SURE.sh | 3 ++- 3 files changed, 38 insertions(+), 20 deletions(-) diff --git a/RUNTIME/REGION.refresh.sh b/RUNTIME/REGION.refresh.sh index e9bed14f..583d7498 100755 --- a/RUNTIME/REGION.refresh.sh +++ b/RUNTIME/REGION.refresh.sh @@ -31,9 +31,15 @@ for i in $*; do UMAPS=("$i" ${UMAPS[@]}) done -[[ ${#UMAPS[@]} == 0 ]] && UMAPS="_0.00_0.00" +## NO $i PARAMETERS - GET ALL UMAPS +if [[ ${#UMAPS[@]} == 0 ]]; then + MEMAPS=($(ls -td ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/* 2>/dev/null | rev | cut -d '/' -f 1 | rev | sort | uniq)) + SWARMMAPS=($(ls -Gd ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/* 2>/dev/null | rev | cut -d '/' -f 1 | rev | sort | uniq)) + combined=("${MEMAPS[@]}" "${SWARMMAPS[@]}") + UMAPS=($(echo "${combined[@]}" | tr ' ' '\n' | sort -u)) +fi -######## INIT REGIONS ######################## +######## DETERMINE REGIONS FOR ALL UMAPS ################ for UMAP in ${UMAPS[@]}; do LAT=$(echo ${UMAP} | cut -d '_' -f 2) @@ -94,7 +100,8 @@ for REGION in ${REGIONS[@]}; do ## GET from IPNS ipfs --timeout 240s get -o ~/.zen/tmp/${MOATS}/${REGION}/ /ipns/${YESTERDATEREGIONNS}/ # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - + ## SHOULD NEED 12 SIGNATURES + ## FULL REFRESH DEMO... ZEN CHAINING COMING LATER # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> mkdir -p ~/.zen/tmp/${MOATS}/${REGION}/RSS rm -f ~/.zen/tmp/${MOATS}/${REGION}/RSS/_${REGLAT}_${REGLON}.week.rss.json @@ -148,7 +155,7 @@ for REGION in ${REGIONS[@]}; do # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> echo "Numbers of REGION WEEK RSS : ${NL} + ${NS} : "${TOTL} - rm ~/.zen/tmp/${MOATS}/${REGION}/N_* + rm ~/.zen/tmp/${MOATS}/${REGION}/N_* 2>/dev/null echo ${TOTL} > ~/.zen/tmp/${MOATS}/${REGION}/N_${TOTL} diff --git a/RUNTIME/RSS2UPlanetSECTORTW.sh b/RUNTIME/RSS2UPlanetSECTORTW.sh index af44e460..16dbcb03 100755 --- a/RUNTIME/RSS2UPlanetSECTORTW.sh +++ b/RUNTIME/RSS2UPlanetSECTORTW.sh @@ -43,10 +43,10 @@ signatures=0 while read title; do - [[ ${floop} -gt 2 ]] && echo "0lder Tiddlers are similaR... BREAK" && break + [[ ${floop} -gt 2 ]] && echo "0lder Tiddlers are similaR... BREAK LOOP" && break - # FILTER Astroport and les than 4 characters title Tiddlers (ex: GPS, ...). extend to allow personnal Tiddlers - [[ ${title} == "GettingStarted" || "${title::3}" == '$:/' || ${title::4} == ${title} || ${title} == "AstroID" || ${title} == "Voeu1.png" || ${title} == "Astroport" || ${title} == "MadeInZion" || ${title} == "G1Visa" || ${title} == "ZenCard" || ${title::5} == "Draft" ]] \ + # FILTER "UPPERCASE" + Astroport Tid, less than 4 characters title Tiddlers (ex: GPS, ...). + [[ ${title} == "GettingStarted" || "${title^^}" == "${title}" || "${title::3}" == '$:/' || ${title::4} == ${title} || ${title} == "AstroID" || ${title} == "Voeu1.png" || ${title} == "Astroport" || ${title} == "MadeInZion" || ${title} == "G1Visa" || ${title} == "ZenCard" || ${title::5} == "Draft" ]] \ && echo "FILTERED TITLE ${title}" && continue ## CHECK FOR TIDDLER WITH SAME TITTLE IN SECTOR TW @@ -59,7 +59,7 @@ while read title; do TMPTAGS=$(cat ~/.zen/tmp/${MOATS}/TMP.json | jq -r .[].tags) TMPEMAILS=($(echo "$TMPTAGS" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b")) TMPSIGN=${#TMPEMAILS[@]} - echo "INSIDE TIDDLER HAVE ${TMPSIGN} SIGNATURE(S)" + #~ echo "INSIDE TIDDLER HAVE ${TMPSIGN} SIGNATURE(S)" if [[ "${ISHERE}" != "${title}" || ${TMPSIGN} == 0 ]]; then @@ -79,7 +79,7 @@ while read title; do && rm ${INDEX} \ && mv ~/.zen/tmp/${MOATS}/${SECTOR}/${SECTOR}.html ${INDEX} \ && ((gloops++)) \ - && echo "SECTOR (${gloops}) : ${title}" \ + && echo "GLOOPS (${gloops}) : ${title}" \ && signatures=$((signatures + TMPSIGN)) [[ ! -s ${INDEX} ]] && echo "ERROR. TW did not ingest ~/.zen/tmp/${MOATS}/NEW.json" && exit 1 @@ -87,8 +87,9 @@ while read title; do else ## SAME TIDDLER - echo "TIDDLER WITH TITLE $title and more than 1 signature ALREADY EXISTS..." + echo "TIDDLER : $title (${TMPSIGN} signature(s)) ... ALREADY EXISTS..." + ## Remove [] and put inline to compare cat ~/.zen/tmp/${MOATS}/TMP.json | jq -rc .[] > ~/.zen/tmp/${MOATS}/INSIDE.json cat "${RSS}" | jq -rc ".[] | select(.title == \"$title\")" > ~/.zen/tmp/${MOATS}/NEW.json @@ -120,6 +121,12 @@ while read title; do ISIGN=${#IEMAILS[@]} echo "Inside Tiddler $ISIGN signatures : ${IEMAILS[*]}" + ## New should have more signatures than Inside + [[ ${NSIGN} -le ${ISIGN} ]] && echo "Most signed already in..." && continue + ## UPLANET GRID COLLISION PARAM ### + # [[ ${NSIGN} -le 3 ]] && update TW OR continue + # https://www.copylaradio.com/blog/blog-1/post/decentralized-information-ecosystem-51 + if [[ "${NEMAILS[*]}" != "${IEMAILS[*]}" ]]; then ## SEARCH FOR DIFFERENCE IN EMAIL SIGNATURES TAGS @@ -151,6 +158,9 @@ while read title; do NEWTID=$(ipfs add -q ~/.zen/tmp/${MOATS}/NEW.json | tail -n 1) INSIDETID=$(ipfs add -q ~/.zen/tmp/${MOATS}/INSIDE.json | tail -n 1) + ############################### + ## TODO : check STAR level and activate auto merge + for email in "${unique_combined[@]}"; do echo " @@ -164,26 +174,26 @@ echo " } -

(ᵔ◡◡ᵔ)

+

$(date)

-Tiddler with same title is existing in ${unique_combined[*]} TW(s) +

$title

+Tiddler appears in ${unique_combined[*]} TW(s)

-To Accept
- ${COMMON[*]} have to copy NEW Tiddler in their TW +MERGE :
+ ${COMMON[*]} import NEW Tiddler in your TW

-To Refuse
- ${NUNIQUE[*]} must fork by deleting or modifying New Tiddler title. +or FORK :
+ ${NUNIQUE[*]} by deleting or modifying New Tiddler title.
-

Actual TiddlerEngage discussion about it...

+

Arrange a Video Meeting...

" > ~/.zen/tmp/${MOATS}/g1message - ${MY_PATH}/../tools/mailjet.sh "$email" ~/.zen/tmp/${MOATS}/g1message "TIDDLER COLLISION" + ${MY_PATH}/../tools/mailjet.sh "$email" ~/.zen/tmp/${MOATS}/g1message "COLLISION ${title} : ${unique_combined[*]}" done diff --git a/tools/PAY4SURE.sh b/tools/PAY4SURE.sh index 1438c964..f2edd9f6 100755 --- a/tools/PAY4SURE.sh +++ b/tools/PAY4SURE.sh @@ -37,6 +37,7 @@ COMMENT=${COMMENT}" [[ -z ${ISSUERPUB} ]] && echo "CANNOT EXTRACT ISSUERPUB FROM DUNIKEY - EXIT -" && exit 1 COINS=$($MY_PATH/COINScheck.sh ${ISSUERPUB} | tail -n 1) +sleep 3 ## Wait for ()& [[ -z $COINS ]] && echo "ERROR : ${ISSUERPUB}=$COINS EMPTY WALLET - EXIT -" && exit 1 ###### TEST INPUT VALUES @@ -81,7 +82,7 @@ CHK2=$(cat ${PENDINGDIR}/${MOATS}.result.html | head -n 2 ) echo ${CHK1} echo ${CHK2} -if [[ $? == 0 || $(echo "${CHK2}" | grep 'succès') || $(echo "${CHK1}" | grep 'conforme' ) ]]; then +if [[ $? == 0 || $(echo "${CHK2}" | grep 'succès') || $(echo "${CHK1}" | grep 'conforme') ]]; then echo "TRANSACTION SENT" echo "SENT" > ${PENDINGFILE} ## TODO : MONITOR POTENTIAL CHAIN REJECTION (FORK/MERGE WINDOW)