remove UPLANETNAME need for PLAYER.refresh (step 1)
This commit is contained in:
parent
2abd32a8ad
commit
5fc35a7880
|
@ -37,12 +37,14 @@ done
|
||||||
echo "TODAY UPlanet landings"
|
echo "TODAY UPlanet landings"
|
||||||
ls ~/.zen/tmp/ZONE_* 2>/dev/null
|
ls ~/.zen/tmp/ZONE_* 2>/dev/null
|
||||||
|
|
||||||
## REMOVE TMP BUT KEEP SWARM and coucou
|
## REMOVE TMP BUT KEEP swarm, flashmem and coucou
|
||||||
mv ~/.zen/tmp/swarm ~/.zen/swarm
|
mv ~/.zen/tmp/swarm ~/.zen/swarm
|
||||||
mv ~/.zen/tmp/coucou ~/.zen/coucou
|
mv ~/.zen/tmp/coucou ~/.zen/coucou
|
||||||
|
mv ~/.zen/tmp/flashmem ~/.zen/flashmem
|
||||||
rm -Rf ~/.zen/tmp/*
|
rm -Rf ~/.zen/tmp/*
|
||||||
mv ~/.zen/swarm ~/.zen/tmp/swarm
|
mv ~/.zen/swarm ~/.zen/tmp/swarm
|
||||||
mv ~/.zen/coucou ~/.zen/tmp/coucou
|
mv ~/.zen/coucou ~/.zen/tmp/coucou
|
||||||
|
mv ~/.zen/flashmem ~/.zen/tmp/flashmem
|
||||||
|
|
||||||
### DELAY _12345 ASTROPORT DURING 20H12 UPDATE ###
|
### DELAY _12345 ASTROPORT DURING 20H12 UPDATE ###
|
||||||
MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
|
MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
|
||||||
|
|
|
@ -226,6 +226,21 @@ for PLAYER in ${PLAYERONE[@]}; do
|
||||||
LON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon)
|
LON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon)
|
||||||
[[ $LON == "null" || $LON == "" ]] && LON="0.00"
|
[[ $LON == "null" || $LON == "" ]] && LON="0.00"
|
||||||
|
|
||||||
|
SLAT="${LAT::-1}"
|
||||||
|
SLON="${LON::-1}"
|
||||||
|
RLAT="$(echo ${LAT} | cut -d '.' -f 1)"
|
||||||
|
RLON="$(echo ${LON} | cut -d '.' -f 1)"
|
||||||
|
MYNS=$(cat ~/.zen/tmp/swarm/12D*/UPLANET/__/_${RLAT}_${RLON}/_${SLAT}_${SLON}/_${LAT}_${LON}/TODATENS | tail -n 1)
|
||||||
|
# EXTRACT "${G1PUB}:${DEMAINDATE}:${NEXTNS}"
|
||||||
|
if [[ ${MYNS} != "" ]]; then
|
||||||
|
echo "UMAP NEXTNS"
|
||||||
|
cat ~/.zen/tmp/flashmem/${MYNS}/_next.umap
|
||||||
|
echo "SECTOR NEXTNS"
|
||||||
|
cat ~/.zen/tmp/flashmem/${MYNS}/_next.sector
|
||||||
|
echo "REGION NEXTNS"
|
||||||
|
cat ~/.zen/tmp/flashmem/${MYNS}/_next.region
|
||||||
|
fi
|
||||||
|
|
||||||
UMAPG1PUB=$(${MY_PATH}/../tools/keygen "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}")
|
UMAPG1PUB=$(${MY_PATH}/../tools/keygen "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}")
|
||||||
|
|
||||||
## CALCULATE UMAP TODATENS ################
|
## CALCULATE UMAP TODATENS ################
|
||||||
|
|
|
@ -99,8 +99,8 @@ for UMAP in ${unique_combined[@]}; do
|
||||||
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
|
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
|
||||||
start=`date +%s`
|
start=`date +%s`
|
||||||
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
|
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
|
||||||
echo "## IPFS GET YESTERDATENS"
|
|
||||||
mkdir ~/.zen/tmp/${MOATS}/${UMAP}
|
mkdir ~/.zen/tmp/${MOATS}/${UMAP}
|
||||||
|
echo "## IPFS GET YESTERDATENS"
|
||||||
ipfs --timeout 300s get -o ~/.zen/tmp/${MOATS}/${UMAP}/ /ipns/${YESTERDATENS}/
|
ipfs --timeout 300s get -o ~/.zen/tmp/${MOATS}/${UMAP}/ /ipns/${YESTERDATENS}/
|
||||||
if [[ $? != 0 ]]; then
|
if [[ $? != 0 ]]; then
|
||||||
echo "(╥☁╥ ) swarm online memory empty (╥☁╥ )"
|
echo "(╥☁╥ ) swarm online memory empty (╥☁╥ )"
|
||||||
|
@ -175,9 +175,9 @@ for UMAP in ${unique_combined[@]}; do
|
||||||
echo "------8<-------------8<------------------8<-----------------8<-----------------8<"
|
echo "------8<-------------8<------------------8<-----------------8<-----------------8<"
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
########################################
|
################################################################################
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PASSING THERE MAKE IPFSNODEID UMAP REFRESHER
|
# ~~~~~~~~~~~~~ GOING FURTHER ~~~ MEANS IPFSNODEID IS UMAP REFRESHER ~~~~~~~~~~~
|
||||||
|
################################################################################
|
||||||
## NEXT REFRESHER
|
## NEXT REFRESHER
|
||||||
# TODO: INTRODUCE NODE BALANCE AND CHOOSE THE MOST CONFIDENT ONE
|
# TODO: INTRODUCE NODE BALANCE AND CHOOSE THE MOST CONFIDENT ONE
|
||||||
rm ${UREFRESH}
|
rm ${UREFRESH}
|
||||||
|
@ -241,6 +241,41 @@ for UMAP in ${unique_combined[@]}; do
|
||||||
mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${RLAT}_${RLON}
|
mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${RLAT}_${RLON}
|
||||||
echo "<meta http-equiv=\"refresh\" content=\"0; url='/ipns/${TODATEREGIONNS}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/${RLAT}_${RLON}/index.html
|
echo "<meta http-equiv=\"refresh\" content=\"0; url='/ipns/${TODATEREGIONNS}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/${RLAT}_${RLON}/index.html
|
||||||
|
|
||||||
|
####################################################################################
|
||||||
|
######################## NEXTNS : UMAP, SECTOR, REGION
|
||||||
|
####################################################################################
|
||||||
|
## UMAP NEXTNS ############### INFORM "PLAYER.refresh.sh" WITH _next.umap
|
||||||
|
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/next.priv "${DEMAINDATE}${UPLANETNAME}${LAT}" "${DEMAINDATE}${UPLANETNAME}${LON}"
|
||||||
|
ipfs key rm "next" > /dev/null 2>&1
|
||||||
|
NEXTNS=$(ipfs key import "next" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/next.priv)
|
||||||
|
echo "UMAP NEXTNS : ${myIPFS}/ipns/${NEXTNS}"
|
||||||
|
ipfs key rm "next" > /dev/null 2>&1
|
||||||
|
rm ~/.zen/tmp/${MOATS}/next.priv
|
||||||
|
echo "${G1PUB}:${DEMAINDATE}:${NEXTNS}" > ~/.zen/tmp/${MOATS}/${UMAP}/_next.umap
|
||||||
|
|
||||||
|
## SECTOR NEXTNS ############### INFORM "PLAYER.refresh.sh" WITH _next.sector
|
||||||
|
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/next.priv "${DEMAINDATE}${UPLANETNAME}${SECTOR}" "${DEMAINDATE}${UPLANETNAME}${SECTOR}"
|
||||||
|
ipfs key rm "next" > /dev/null 2>&1
|
||||||
|
NEXTNS=$(ipfs key import "next" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/next.priv)
|
||||||
|
echo "SECTOR NEXTNS : ${myIPFS}/ipns/${NEXTNS}"
|
||||||
|
ipfs key rm "next" > /dev/null 2>&1
|
||||||
|
rm ~/.zen/tmp/${MOATS}/next.priv
|
||||||
|
echo "${SECTORG1PUB}:${DEMAINDATE}:${NEXTNS}" > ~/.zen/tmp/${MOATS}/${UMAP}/_next.sector
|
||||||
|
|
||||||
|
## REGION NEXTNS ############### INFORM "PLAYER.refresh.sh" WITH _next.region
|
||||||
|
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/next.priv "${DEMAINDATE}${UPLANETNAME}${REGION}" "${DEMAINDATE}${UPLANETNAME}${REGION}"
|
||||||
|
ipfs key rm "next" > /dev/null 2>&1
|
||||||
|
NEXTNS=$(ipfs key import "next" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/next.priv)
|
||||||
|
echo "REGION NEXTNS : ${myIPFS}/ipns/${NEXTNS}"
|
||||||
|
ipfs key rm "next" > /dev/null 2>&1
|
||||||
|
rm ~/.zen/tmp/${MOATS}/next.priv
|
||||||
|
echo "${REGIONG1PUB}:${DEMAINDATE}:${NEXTNS}" > ~/.zen/tmp/${MOATS}/${UMAP}/_next.region
|
||||||
|
####################################################################################
|
||||||
|
### WRITE TO SWARM CACHE
|
||||||
|
mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${RLAT}_${RLON}/_${SLAT}_${SLON}/_${LAT}_${LON}/
|
||||||
|
echo "${TODATENS}" > ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${RLAT}_${RLON}/_${SLAT}_${SLON}/_${LAT}_${LON}/TODATENS
|
||||||
|
####################################################################################
|
||||||
|
|
||||||
# %%%%%%%%%% ##################################################
|
# %%%%%%%%%% ##################################################
|
||||||
## COLLECT RSS FROM ALL PLAYERS WITH SAME UMAP IN SWARM MEMORY /UPLANET/__/_*_*/_*.?_*.?/_*.??_*.??
|
## COLLECT RSS FROM ALL PLAYERS WITH SAME UMAP IN SWARM MEMORY /UPLANET/__/_*_*/_*.?_*.?/_*.??_*.??
|
||||||
# %%%%%%%%%% ##################################################
|
# %%%%%%%%%% ##################################################
|
||||||
|
|
|
@ -283,9 +283,6 @@ SECTOR="_${LAT::-1}_${LON::-1}" ### SECTOR = 0.1° Planet Slice in MadeInZion Ti
|
||||||
echo "UPlanet 0.1° SECTOR : ${SECTOR}"
|
echo "UPlanet 0.1° SECTOR : ${SECTOR}"
|
||||||
sed -i "s~_SECTOR_~${SECTOR}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
|
sed -i "s~_SECTOR_~${SECTOR}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
|
||||||
|
|
||||||
UMAPNS=$(${MY_PATH}/../tools/keygen -t ipfs "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}")
|
|
||||||
UMAP="/ipns/${UMAPNS}"
|
|
||||||
|
|
||||||
# GET ACTUAL GPS VALUES
|
# GET ACTUAL GPS VALUES
|
||||||
tiddlywiki --load ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html \
|
tiddlywiki --load ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html \
|
||||||
--output ~/.zen/tmp/${MOATS} \
|
--output ~/.zen/tmp/${MOATS} \
|
||||||
|
@ -293,21 +290,15 @@ tiddlywiki --load ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html \
|
||||||
|
|
||||||
OLAT=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lat)
|
OLAT=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lat)
|
||||||
OLON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon)
|
OLON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon)
|
||||||
OUMAP=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].umap)
|
|
||||||
|
|
||||||
# REPLACE WITH NEW LAT LON UMAP
|
# REPLACE WITH NEW LAT LON UMAP
|
||||||
sed -i "s~${OLAT}~${LAT}~g" ~/.zen/tmp/${MOATS}/GPS.json
|
sed -i "s~${OLAT}~${LAT}~g" ~/.zen/tmp/${MOATS}/GPS.json
|
||||||
sed -i "s~${OLON}~${LON}~g" ~/.zen/tmp/${MOATS}/GPS.json
|
sed -i "s~${OLON}~${LON}~g" ~/.zen/tmp/${MOATS}/GPS.json
|
||||||
sed -i "s~${OUMAP}~${UMAP}~g" ~/.zen/tmp/${MOATS}/GPS.json
|
|
||||||
## Add _SECTORTW_
|
## Add _SECTORTW_
|
||||||
cat ~/.zen/tmp/${MOATS}/GPS.json | jq '.[0] + {"sectortw": "_SECTORTW_"}' \
|
cat ~/.zen/tmp/${MOATS}/GPS.json | jq '.[0] + {"sectortw": "_SECTORTW_"}' \
|
||||||
> ~/.zen/tmp/${MOATS}/GPStw.json \
|
> ~/.zen/tmp/${MOATS}/GPStw.json \
|
||||||
&& mv ~/.zen/tmp/${MOATS}/GPStw.json ~/.zen/tmp/${MOATS}/GPS.json
|
&& mv ~/.zen/tmp/${MOATS}/GPStw.json ~/.zen/tmp/${MOATS}/GPS.json
|
||||||
|
|
||||||
## INSERT TODATESECTORNS #########################################
|
|
||||||
TODATESECTORNS=$(${MY_PATH}/../tools/keygen -t ipfs "${TODATE}${UPLANETNAME}${SECTOR}" "${TODATE}${UPLANETNAME}${SECTOR}")
|
|
||||||
sed -i "s~_SECTORTW_~/ipns/${TODATESECTORNS}/TW~g" ~/.zen/tmp/${MOATS}/GPS.json
|
|
||||||
|
|
||||||
###########
|
###########
|
||||||
## GET OLD16
|
## GET OLD16
|
||||||
tiddlywiki \
|
tiddlywiki \
|
||||||
|
@ -549,8 +540,8 @@ echo "<html><head>
|
||||||
<body>
|
<body>
|
||||||
<h1>UPlanet : <a href='${myIPFS}/ipns/${ASTRONAUTENS}'>TW</a></h1>" > ~/.zen/tmp/${MOATS}/ZenCard.html
|
<h1>UPlanet : <a href='${myIPFS}/ipns/${ASTRONAUTENS}'>TW</a></h1>" > ~/.zen/tmp/${MOATS}/ZenCard.html
|
||||||
|
|
||||||
echo "<br><img src='${myIPFSGW}${IASTRO}'\>
|
echo "<h2><a href='${myIPFS}/ipns/${ASTRONAUTENS}#ZenCard' title='${G1PUB}'>ZenCard</a></h2>
|
||||||
<h2><a href='${myIPFS}/ipns/${ASTRONAUTENS}#ZenCard' title='${G1PUB}'>ZenCard</a></h2>" >> ~/.zen/tmp/${MOATS}/ZenCard.html
|
<img src='${myIPFSGW}${IASTRO}'\>" >> ~/.zen/tmp/${MOATS}/ZenCard.html
|
||||||
|
|
||||||
asciiart="${MY_PATH}/../images/astroport.art"
|
asciiart="${MY_PATH}/../images/astroport.art"
|
||||||
while IFS= read -r line
|
while IFS= read -r line
|
||||||
|
@ -580,14 +571,13 @@ echo "<html><head>
|
||||||
}
|
}
|
||||||
</style></head>
|
</style></head>
|
||||||
<body>
|
<body>
|
||||||
<h1>UPlanet : AstroID ($PASS)</h1>" > ~/.zen/tmp/${MOATS}/AstroID.html
|
<h1><a href='${myUPLANET}'>UPlanet</a> : AstroID</h1>" > ~/.zen/tmp/${MOATS}/AstroID.html
|
||||||
|
|
||||||
echo "
|
echo "<a href='${myIPFS}/ipns/${ASTRONAUTENS}#AstroID'>AstroID<br><img width=300px src='${myIPFSGW}${ASTROQR}'\></a>
|
||||||
<h2> <--> SECTOR : <a href='${EARTHCID}/map_render.html?southWestLat=${LAT::-1}&southWestLon=${LON::-1}°=0.1'>${SECTOR}</a> <--> </h2>
|
<h3>SECRET1=\"$SALT\" SECRET2=\"$PEPPER\" ($PASS)</h3>
|
||||||
<h3>SECRET1=\"$SALT\" SECRET2=\"$PEPPER\"</h3>
|
|
||||||
<br><a href='${myIPFS}/ipns/${ASTRONAUTENS}#AstroID'>AstroID<br><img width=240px src='${myIPFSGW}${ASTROQR}'\></a>
|
|
||||||
<h3>ASTROPORT : <a href='${myIPFS}/ipns/${IPFSNODEID}'>/ipns/${IPFSNODEID}</a></h3>
|
<h3>ASTROPORT : <a href='${myIPFS}/ipns/${IPFSNODEID}'>/ipns/${IPFSNODEID}</a></h3>
|
||||||
<a href='https://qo-op.com'>Uplanet</a>" >> ~/.zen/tmp/${MOATS}/AstroID.html
|
<h2> <--> SECTOR : <a href='${EARTHCID}/map_render.html?southWestLat=${LAT::-1}&southWestLon=${LON::-1}°=0.1'>${SECTOR}</a> <--> </h2>
|
||||||
|
" >> ~/.zen/tmp/${MOATS}/AstroID.html
|
||||||
|
|
||||||
asciiart="${MY_PATH}/../images/logoastro.art"
|
asciiart="${MY_PATH}/../images/logoastro.art"
|
||||||
while IFS= read -r line
|
while IFS= read -r line
|
||||||
|
|
Loading…
Reference in New Issue