From 80d331029ebbb97a7d3d73dde7fc2c1ebe29af90 Mon Sep 17 00:00:00 2001 From: fred Date: Sat, 17 Feb 2024 13:56:32 +0100 Subject: [PATCH] /ipns/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/_index.html /ipns/${IPFSNODEID}/UPLANET/SECTORS/_${REGLAT}_${REGLON}/_${SLAT}_${SLON}/_index.html /ipns/${IPFSNODEID}/UPLANET/REGIONS/_${REGLAT}_${REGLON}/_index.html --- RUNTIME/PLAYER.refresh.sh | 19 +++++++++--------- RUNTIME/REGION.refresh.sh | 18 +++++++++++++---- RUNTIME/SECTOR.refresh.sh | 42 ++++++++++++++++++++------------------- 3 files changed, 46 insertions(+), 33 deletions(-) diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh index 2e58d63d..aec9eec1 100755 --- a/RUNTIME/PLAYER.refresh.sh +++ b/RUNTIME/PLAYER.refresh.sh @@ -387,17 +387,18 @@ for PLAYER in ${PLAYERONE[@]}; do REGLAT=$(echo ${LAT} | cut -d '.' -f 1) REGLON=$(echo ${LON} | cut -d '.' -f 1) - echo "/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}" - ## IPFSNODEID 12345 CACHE UPLANET/__/_*_*/_*.?_*.?/_*.??_*.?? - mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/RSS/ + echo "/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}" + ## IPFSNODEID 12345 CACHE UPLANET/__/_*_*/_*.?_*.?/_*.??_*.?? + mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/RSS/ - cp ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json \ - ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/RSS/ + cp ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json \ + ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/RSS/ - ${MY_PATH}/../tools/json_dir.all.sh ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/RSS/ - mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/TW/${PLAYER} - cp ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/TW/${PLAYER}/ - echo "" > ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/_index.html + ${MY_PATH}/../tools/json_dir.all.sh ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/RSS/ + mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/TW/${PLAYER} + cp ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/TW/${PLAYER}/ + + echo "" > ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/_index.html fi diff --git a/RUNTIME/REGION.refresh.sh b/RUNTIME/REGION.refresh.sh index e2a63c28..84eb84a4 100755 --- a/RUNTIME/REGION.refresh.sh +++ b/RUNTIME/REGION.refresh.sh @@ -99,7 +99,7 @@ for REGION in ${REGIONS[@]}; do rm -f ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL ## START WITH LOCAL SECTORS RSS WEEK - RSSNODE=($(ls ~/.zen/tmp/${IPFSNODEID}/SECTORS/_${REGLAT}*_${REGLON}*.week.rss.json 2>/dev/null)) + RSSNODE=($(ls ~/.zen/tmp/${IPFSNODEID}/UPLANET/SECTORS/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*.week.rss.json 2>/dev/null)) for RSS in ${RSSNODE[@]}; do [[ $(cat ${RSS}) != "[]" ]] \ && cp ${RSS} ~/.zen/tmp/${MOATS}/${REGION}/RSS/ \ @@ -108,7 +108,7 @@ for REGION in ${REGIONS[@]}; do NL=${#RSSNODE[@]} ## ADD SWARM SECTORS RSS WEEK - RSSWARM=($(ls ~/.zen/tmp/swarm/*/SECTORS/_${REGLAT}*_${REGLON}*.week.rss.json 2>/dev/null)) + RSSWARM=($(ls ~/.zen/tmp/swarm/*/UPLANET/SECTORS/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*.week.rss.json 2>/dev/null)) for RSS in ${RSSWARM[@]}; do [[ $(cat ${RSS}) != "[]" ]] \ && cp ${RSS} ~/.zen/tmp/${MOATS}/${REGION}/RSS/ \ @@ -127,13 +127,23 @@ for REGION in ${REGIONS[@]}; do ~/.zen/tmp/${MOATS}/${REGION}/RSS/_${REGLAT}_${REGLON}.week.rss.json ## PREPARING JOURNAL + rm -Rf ~/.zen/tmp/${IPFSNODEID}/REGIONS ## TODO REMOVE - mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/REGIONS + mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/REGIONS/_${REGLAT}_${REGLON} RWEEKCID=$(ipfs add -q ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL) cp ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL \ - ~/.zen/tmp/${IPFSNODEID}/UPLANET/REGIONS/_${REGLAT}_${REGLON}.JOURNAL.md + ~/.zen/tmp/${IPFSNODEID}/UPLANET/REGIONS/_${REGLAT}_${REGLON}/JOURNAL.md + + ################################### + ## NODE PUBLISH REGION TODATENS LINK + echo "" \ + > ~/.zen/tmp/${IPFSNODEID}/UPLANET/REGIONS/_${REGLAT}_${REGLON}/_index.html + + + + ## DEMO : PREPARE Ask.IA link - PROD will be launched during RUNTIME. echo "" \ diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh index 98913644..540e071a 100755 --- a/RUNTIME/SECTOR.refresh.sh +++ b/RUNTIME/SECTOR.refresh.sh @@ -249,23 +249,23 @@ for SECTOR in ${SECTORS[@]}; do IAMAP=$(ipfs add -qw ~/.zen/tmp/world.js | tail -n 1) echo "JSON WISH WORLD READY /ipfs/${IAMAP}/world.js" -########################################################################################### -## ADD SECTOR ZENPUB.png & INFO.png -convert -font 'Liberation-Sans' \ - -pointsize 80 -fill purple -draw 'text 50,120 "'"${ZEN} Zen"'"' \ - -pointsize 30 -fill purple -draw 'text 40, 180 "'"${SECTOR}"'"' \ - $MY_PATH/../images/G1WorldMap.png "${HOME}/.zen/tmp/${MOATS}/${SECTOR}.png" -# CREATE G1PUB AMZQR -amzqr ${G1PUB} -l H -p "$MY_PATH/../images/zenticket.png" -c -n ZENPUB.png -d ~/.zen/tmp/${MOATS}/${SECTOR}/ -convert ~/.zen/tmp/${MOATS}/${SECTOR}/ZENPUB.png -resize 250 ~/.zen/tmp/${MOATS}/ZENPUB.png -# ADD IT -composite -compose Over -gravity NorthEast -geometry +0+0 ~/.zen/tmp/${MOATS}/ZENPUB.png ~/.zen/tmp/${MOATS}/${SECTOR}.png ~/.zen/tmp/${MOATS}/${SECTOR}/INFO.png + ########################################################################################### + ## ADD SECTOR ZENPUB.png & INFO.png + convert -font 'Liberation-Sans' \ + -pointsize 80 -fill purple -draw 'text 50,120 "'"${ZEN} Zen"'"' \ + -pointsize 30 -fill purple -draw 'text 40, 180 "'"${SECTOR}"'"' \ + $MY_PATH/../images/G1WorldMap.png "${HOME}/.zen/tmp/${MOATS}/${SECTOR}.png" + # CREATE G1PUB AMZQR + amzqr ${G1PUB} -l H -p "$MY_PATH/../images/zenticket.png" -c -n ZENPUB.png -d ~/.zen/tmp/${MOATS}/${SECTOR}/ + convert ~/.zen/tmp/${MOATS}/${SECTOR}/ZENPUB.png -resize 250 ~/.zen/tmp/${MOATS}/ZENPUB.png + # ADD IT + composite -compose Over -gravity NorthEast -geometry +0+0 ~/.zen/tmp/${MOATS}/ZENPUB.png ~/.zen/tmp/${MOATS}/${SECTOR}.png ~/.zen/tmp/${MOATS}/${SECTOR}/INFO.png -## zday marking -rm ~/.zen/tmp/${MOATS}/${SECTOR}/z* 2>/dev/null -echo "${TODATE} ${SECTOR}" > ~/.zen/tmp/${MOATS}/${SECTOR}/z$(date +%A-%d_%m_%Y).html + ## zday marking + rm ~/.zen/tmp/${MOATS}/${SECTOR}/z* 2>/dev/null + echo "${TODATE} ${SECTOR}" > ~/.zen/tmp/${MOATS}/${SECTOR}/z$(date +%A-%d_%m_%Y).html -########################################################################################### + ########################################################################################### ### APPLY ON APP MODEL TODATE REGIONNS LINKING REGLAT=$(echo ${SLAT} | cut -d '.' -f 1) REGLON=$(echo ${SLON} | cut -d '.' -f 1) @@ -293,9 +293,6 @@ echo "${TODATE -e "s~http://127.0.0.1:8080~~g" \ > ~/.zen/tmp/${MOATS}/${SECTOR}/_index.html -## TODO get from ~/.zen/tmp/${IPFSNODEID}/REGIONS/_${REGLAT}_${REGLON}.week.cid produced by REGION.refresh -# -e "s~_RWEEKCID_~/ipfs/QmY4rLRgSXjhhsW3WoKUJYpLe2A1dJCFXb7stNLcAp95w9~g" \ - ################################## cp -f ~/.zen/tmp/${MOATS}/${SECTOR}/_index.html ~/.zen/tmp/${MOATS}/${SECTOR}/index.html rm ~/.zen/tmp/${MOATS}/${SECTOR}/index.html ## MAKE SECTOR VISIBLE ## @@ -324,11 +321,16 @@ echo "${TODATE ## EXTRACT SECTOR LAST WEEK TIDDLERS TO IPFSNODEID CACHE echo "(☉_☉ ) ${REGION}.week.rss.json (☉_☉ )" - mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/SECTORS/ rm -Rf ~/.zen/tmp/${IPFSNODEID}/SECTORS/ ## TODO REMOVE + mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/SECTORS/_${REGLAT}_${REGLON}/_${SLAT}_${SLON} ## CREATING 7 DAYS JSON RSS STREAM tiddlywiki --load ${INDEX} \ - --output ~/.zen/tmp/${IPFSNODEID}/UPLANET/SECTORS --render '.' "${SECTOR}.week.rss.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[days:created[-7]!is[system]!tag[G1Voeu]]' + --output ~/.zen/tmp/${IPFSNODEID}/UPLANET/SECTORS/_${REGLAT}_${REGLON}/_${SLAT}_${SLON} --render '.' "${SECTOR}.week.rss.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[days:created[-7]!is[system]!tag[G1Voeu]]' + + ################################### + ## NODE CACHE SECTOR TODATENS + echo "" \ + > ~/.zen/tmp/${IPFSNODEID}/UPLANET/SECTORS/_${REGLAT}_${REGLON}/_${SLAT}_${SLON}/_index.html ## TODO FILTER INFORMATION WITH MULTIPLE SIGNATURES (DONE in REGION.refresh.sh) ## TODO EXPORT AS RSS ## https://talk.tiddlywiki.org/t/has-anyone-generated-an-rss-feed-from-tiddlywiki/966/28