diff --git a/RUNTIME/REGION.refresh.sh b/RUNTIME/REGION.refresh.sh index 5584edcb..5caf00da 100755 --- a/RUNTIME/REGION.refresh.sh +++ b/RUNTIME/REGION.refresh.sh @@ -23,29 +23,29 @@ REGIONNODE=$5 [[ ! -d ~/.zen/tmp/${MOATS-undefined}/${UMAP-undefined} ]] && echo "MISSING UMAP CONTEXT" && exit 1 -CLAT=$(echo ${LAT} | cut -d '.' -f 1) -CLON=$(echo ${LON} | cut -d '.' -f 1) -REGION="_${CLAT}_${CLON}" +REGLAT=$(echo ${LAT} | cut -d '.' -f 1) +REGLON=$(echo ${LON} | cut -d '.' -f 1) +REGION="_${REGLAT}_${REGLON}" echo "REGION ${REGION}" [[ -s ~/.zen/tmp/${MOATS}/${UMAP}/${REGION}/index.html ]] && echo "ALREADY DONE" && exit 0 [[ "${REGIONNODE}" == "${IPFSNODEID}" ]] && echo ">>> MANAGING REGION PUBLICATION" || exit 0 ############################################################## -REGIONG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${REGION}" "${REGION}") +REGIONG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${REGION}" "${UPLANETNAME}${REGION}") [[ ! ${REGIONG1PUB} ]] && echo "ERROR generating REGION WALLET" && exit 1 COINS=$($MY_PATH/../tools/COINScheck.sh ${REGIONG1PUB} | tail -n 1) echo "REGION : ${REGION} (${COINS} G1) WALLET : ${REGIONG1PUB}" -${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/REGION.priv "${REGION}" "${REGION}" +${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/REGION.priv "${UPLANETNAME}${REGION}" "${UPLANETNAME}${REGION}" ipfs key rm ${REGIONG1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT REGIONNS=$(ipfs key import ${REGIONG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/REGION.priv) ############################################################## mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${REGION} echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${REGION}/index.html -REGIONMAPGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/Umap.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}" -REGIONSATGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/Usat.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}" +REGIONMAPGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/Umap.html?southWestLat=${REGLAT}&southWestLon=${REGLON}°=1&ipns=${REGIONNS}" +REGIONSATGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/Usat.html?southWestLat=${REGLAT}&southWestLon=${REGLON}°=1&ipns=${REGIONNS}" echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/REGION${REGION}.Map.html echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/REGION${REGION}.Sat.html @@ -56,12 +56,12 @@ echo "" > ~/ ipfs --timeout 42s get -o ~/.zen/tmp/${MOATS}/${REGION}/ /ipns/${REGIONNS}/ # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - RSSNODE=($(ls ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${CLAT}*_${CLON}*/RSS/*.rss.json 2>/dev/null)) + RSSNODE=($(ls ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${REGLAT}*_${REGLON}*/RSS/*.rss.json 2>/dev/null)) for RSS in ${RSSNODE[@]}; do echo ${RSS} done NL=${#RSSNODE[@]} - RSSWARM=($(ls ~/.zen/tmp/swarm/*/UPLANET/_${CLAT}*_${CLON}*/RSS/*.rss.json 2>/dev/null)) + RSSWARM=($(ls ~/.zen/tmp/swarm/*/UPLANET/_${REGLAT}*_${REGLON}*/RSS/*.rss.json 2>/dev/null)) for RSS in ${RSSWARM[@]}; do echo ${RSS} done diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh index 866b78ad..095f1e0e 100755 --- a/RUNTIME/SECTOR.refresh.sh +++ b/RUNTIME/SECTOR.refresh.sh @@ -53,12 +53,12 @@ for SECTOR in ${SECTORS[@]}; do SLON=$(echo ${SECTOR} | cut -d '_' -f 3) ############################################################## - SECTORG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${SECTOR}" "${SECTOR}") + SECTORG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}") [[ ! ${SECTORG1PUB} ]] && echo "ERROR generating SECTOR WALLET" && exit 1 COINS=$($MY_PATH/../tools/COINScheck.sh ${SECTORG1PUB} | tail -n 1) echo "SECTOR : ${SECTOR} (${COINS} G1) WALLET : ${SECTORG1PUB}" - ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${SECTOR}.priv "${SECTOR}" "${SECTOR}" + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${SECTOR}.priv "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}" ipfs key rm ${SECTORG1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT SECTORNS=$(ipfs key import ${SECTORG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${SECTOR}.priv) rm ~/.zen/tmp/${MOATS}/${SECTOR}.priv @@ -149,12 +149,10 @@ for SECTOR in ${SECTORS[@]}; do combinedrss=("${RSSNODE[@]}" "${RSSWARM[@]}") RSSALL=($(echo "${combinedrss[@]}" | tr ' ' '\n' | sort -u)) + ################################## TRANSFER SIGNED TIDDLER IN SECTOR TW for RSS in ${RSSALL[@]}; do - ${MY_PATH}/../tools/RSS2UPlanetTW.sh "${RSS}" "${SECTOR}" "${MOATS}" "${INDEX}" - done - TOTL=$((${NL}+${NS})) ############################################################## @@ -209,10 +207,17 @@ for SECTOR in ${SECTORS[@]}; do echo "JSON WISH WORLD READY /ipfs/${IAMAP}/world.js" ########################################################################################### ### APPLY ON APP MODEL + REGLAT=$(echo ${LAT} | cut -d '.' -f 1) + REGLON=$(echo ${LON} | cut -d '.' -f 1) + REGION="_${REGLAT}_${REGLON}" + REGIONNS=$(${MY_PATH}/../tools/keygen -t ipfs "${UPLANETNAME}${REGION}" "${UPLANETNAME}${REGION}") + cat ${MY_PATH}/../templates/UPlanetSector/index.html \ - | sed -e "s~_ZONE_~SECTOR ${SECTOR}~g" \ + | sed -e "s~_ZONE_~SECTOR ${SECTOR}~g" \ + -e "s~_UPZONE_~REGION ${REGION}~g" \ -e "s~QmYdWBx32dP14XcbXF7hhtDq7Uu6jFmDaRnuL5t7ARPYkW/index_fichiers/world.js~${IAMAP}/world.js~g" \ -e "s~_ZONENS_~${SECTORNS}~g" \ + -e "s~_UPZONENS_~${REGIONNS}~g" \ -e "s~http://127.0.0.1:8080~~g" \ > ~/.zen/tmp/${MOATS}/${SECTOR}/_index.html diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh index b51973c5..b11ace0a 100755 --- a/RUNTIME/UPLANET.refresh.sh +++ b/RUNTIME/UPLANET.refresh.sh @@ -74,8 +74,9 @@ mkdir ~/.zen/tmp/${MOATS} echo "~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}/" ## zday of the week for IPFSNODEID -rm ~/.zen/tmp/${MOATS}/${UMAP}/z$(date -d "yesterday" +%A) -echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/z$(date +%A) +rm ~/.zen/tmp/${MOATS}/${UMAP}/z* ## TODO RESTRICT T O z*.html +ZCHAIN=$(cat ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}/_chain | rev | cut -d ':' -f 1 | rev 2>/dev/null) +echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/z$(date +%A-%d_%m_%Y).html # ++++++++++++++++++++ - - - - ADAPT TO NODE TREATMENT TIME @@ -193,7 +194,7 @@ echo "" cp ${RSSFILE} ~/.zen/tmp/${MOATS}/${UMAP}/RSS/ done -## COLLECT TW LINKS FOR SWARM +## COLLECT TW LINKS FROM NODE & SWARM cp -r ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/TW/* ~/.zen/tmp/${MOATS}/${UMAP}/TW/ 2>/dev/null TWFILES=($(ls ~/.zen/tmp/swarm/*/UPLANET/_${LAT}_${LON}/TW/*/index.html 2>/dev/null)) for TWRED in ${TWFILES[@]}; do @@ -261,17 +262,16 @@ echo "" " > ~/.zen/tmp/world.js floop=1 - ZONETW=($(cat ~/.zen/tmp/swarm/*/UPLANET/_${LAT}_${LON}/TW/*/index.html | grep -o "/ipns/[^\"]*" | sed "s/'$//" | sort | uniq)) - - for TWADD in ${ZONETW[@]}; - do - + TWFILES=($(ls ~/.zen/tmp/swarm/*/UPLANET/_${LAT}_${LON}/TW/*/index.html 2>/dev/null)) + for TWRED in ${TWFILES[@]}; do + ZMAIL=$(echo ${TWRED} | rev | cut -d '/' -f 2 | rev) + TWADD=$(cat ${TWRED} | grep -o "/ipns/[^\"]*" | sed "s/'$//") ## ADD ASTRONAUTNS ON SECTOR WORLD MAP echo "${floop}: { alpha: Math.random() * 2 * Math.PI, delta: Math.random() * 2 * Math.PI, - name: '"${floop}"', + name: '"${ZMAIL}"', link: '"${TWADD}"' } ," >> ~/.zen/tmp/world.js @@ -297,10 +297,17 @@ echo "" echo "JSON WISH WORLD READY /ipfs/${IAMAP}/world.js" ########################################################################################### ### APPLY ON APP MODEL + SECLAT="${LAT::-1}" + SECLON="${LON::-1}" + SECTOR="_${SECLAT}_${SECLON}" + SECTORNS=$(${MY_PATH}/../tools/keygen -t ipfs "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}") + cat ${MY_PATH}/../templates/UPlanetSector/index.html \ | sed -e "s~_ZONE_~UMAP ${UMAP}~g" \ + -e "s~_UPZONE_~SECTOR ${SECTOR}~g" \ -e "s~QmYdWBx32dP14XcbXF7hhtDq7Uu6jFmDaRnuL5t7ARPYkW/index_fichiers/world.js~${IAMAP}/world.js~g" \ -e "s~_ZONENS_~${UMAPNS}~g" \ + -e "s~_UPZONENS_~${SECTORNS}~g" \ -e "s~http://127.0.0.1:8080~~g" \ > ~/.zen/tmp/${MOATS}/${UMAP}/_index.html diff --git a/templates/UPlanetSector/index.html b/templates/UPlanetSector/index.html index deb3f925..969ecde8 100644 --- a/templates/UPlanetSector/index.html +++ b/templates/UPlanetSector/index.html @@ -153,7 +153,8 @@ -

"ZONE _ZONE_"

+

"_UPZONE_"

+

"_ZONE_"