UPLANET.refresh & cache management & bug hunting
This commit is contained in:
parent
b174e15995
commit
9d72e401fe
|
@ -431,7 +431,7 @@ if [[ ${QRCODE:0:5} == "@@@@@" ]]; then
|
||||||
|
|
||||||
# SEARCH FOR DESTMAIL IN SWARM
|
# SEARCH FOR DESTMAIL IN SWARM
|
||||||
$($MY_PATH/../tools/search_for_this_email_in_players.sh ${DESTMAIL}) ## export ASTROTW and more
|
$($MY_PATH/../tools/search_for_this_email_in_players.sh ${DESTMAIL}) ## export ASTROTW and more
|
||||||
echo "export ASTROTW=${ASTRONAUTENS} ASTROG1=${ASTROG1} ASTROMAIL=${DESTMAIL} ASTROFEED=${FEEDNS}"
|
echo "export ASTROTW=${ASTROTW} ASTROG1=${ASTROG1} ASTROMAIL=${DESTMAIL} ASTROFEED=${FEEDNS}"
|
||||||
|
|
||||||
# Create Next G1 & IPNS KEY
|
# Create Next G1 & IPNS KEY
|
||||||
DESTG1PUB=$(${MY_PATH}/../tools/keygen"${DESTMAIL}" "G1${VoeuName} ${PLAYERORIG1}")
|
DESTG1PUB=$(${MY_PATH}/../tools/keygen"${DESTMAIL}" "G1${VoeuName} ${PLAYERORIG1}")
|
||||||
|
|
|
@ -277,11 +277,6 @@ echo "<html>
|
||||||
<br><br>ASTROPORT REGISTERED Crypto Commons : $LAT $LON : ${MOATS} : $(date)
|
<br><br>ASTROPORT REGISTERED Crypto Commons : $LAT $LON : ${MOATS} : $(date)
|
||||||
</body></html>" > ~/.zen/tmp/${MOATS}/MESSAGE.html
|
</body></html>" > ~/.zen/tmp/${MOATS}/MESSAGE.html
|
||||||
|
|
||||||
## HERE YOU PLUG INDEX
|
|
||||||
# echo "BOO" > ~/.zen/tmp/${MOATS}/index.html
|
|
||||||
## WHO WILL BE THE G1 WINNER OF THE AREA
|
|
||||||
# SHOW G1 STATION WALLETS
|
|
||||||
|
|
||||||
## TAKING CARE OF THE CHAIN
|
## TAKING CARE OF THE CHAIN
|
||||||
########################################
|
########################################
|
||||||
IPFSROOT=$(ipfs add -rwHq ~/.zen/tmp/${MOATS}/* | tail -n 1)
|
IPFSROOT=$(ipfs add -rwHq ~/.zen/tmp/${MOATS}/* | tail -n 1)
|
||||||
|
@ -309,6 +304,12 @@ mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/_visitors
|
||||||
echo "<meta http-equiv=\"refresh\" content=\"0; url='/ipns/${UMAPNS}'\" />" > ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/index.html
|
echo "<meta http-equiv=\"refresh\" content=\"0; url='/ipns/${UMAPNS}'\" />" > ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/index.html
|
||||||
echo "${EMAIL}:${IPFSROOT}:${MOATS}" >> ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/_visitors/${EMAIL}.log
|
echo "${EMAIL}:${IPFSROOT}:${MOATS}" >> ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/_visitors/${EMAIL}.log
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
|
########################################
|
||||||
|
### USED BY UPLANET.refresh.sh : inform which IPFSNODEID's are UMAP keepers
|
||||||
|
UREFRESH="${HOME}/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/UMAP.refresh"
|
||||||
|
[[ ! $(cat ${UREFRESH} | grep ${IPFSNODEID} ) ]] \
|
||||||
|
&& echo "${IPFSNODEID}" >> ${UREFRESH}
|
||||||
########################################
|
########################################
|
||||||
|
|
||||||
########################################
|
########################################
|
||||||
|
|
|
@ -97,6 +97,7 @@ while read LINE;
|
||||||
###################################################################
|
###################################################################
|
||||||
## Search for $YID.TW.json TIDDLER in local & MySwarm cache
|
## Search for $YID.TW.json TIDDLER in local & MySwarm cache
|
||||||
echo "--- CACHE SEARCH FOR $YID ---" && TIDDLER=$(ls -t "${HOME}/.zen/game/players/"*"/G1CopierYoutube/$YID.TW.json" 2>/dev/null | head -n 1)
|
echo "--- CACHE SEARCH FOR $YID ---" && TIDDLER=$(ls -t "${HOME}/.zen/game/players/"*"/G1CopierYoutube/$YID.TW.json" 2>/dev/null | head -n 1)
|
||||||
|
## TODO CORRECT - CACHE CHANGED -
|
||||||
[[ ! $TIDDLER ]] && TIDDLER=$(ls -t "${HOME}/.zen/tmp/${IPFSNODEID}/G1CopierYoutube/"*"/$YID.TW.json" 2>/dev/null | head -n 1)
|
[[ ! $TIDDLER ]] && TIDDLER=$(ls -t "${HOME}/.zen/tmp/${IPFSNODEID}/G1CopierYoutube/"*"/$YID.TW.json" 2>/dev/null | head -n 1)
|
||||||
[[ ! $TIDDLER ]] && TIDDLER=$(ls -t "${HOME}/.zen/tmp/swarm/"*"/G1CopierYoutube/"*"/$YID.TW.json" 2>/dev/null | head -n 1)
|
[[ ! $TIDDLER ]] && TIDDLER=$(ls -t "${HOME}/.zen/tmp/swarm/"*"/G1CopierYoutube/"*"/$YID.TW.json" 2>/dev/null | head -n 1)
|
||||||
[[ $TIDDLER ]] && echo "Tiddler Found in CACHE : $TIDDLER" \
|
[[ $TIDDLER ]] && echo "Tiddler Found in CACHE : $TIDDLER" \
|
||||||
|
@ -143,23 +144,28 @@ if [[ ! ${TIDDLER} ]]; then
|
||||||
|
|
||||||
############################################################################
|
############################################################################
|
||||||
### CHECK RESULT CONVERT MKV TO MP4
|
### CHECK RESULT CONVERT MKV TO MP4
|
||||||
[[ -s "${HOME}/.zen/tmp/yt-dlp/$TITLE.mkv" ]] && ffmpeg -loglevel quiet -i "${HOME}/.zen/tmp/yt-dlp/$TITLE.mkv" -c:v libx264 -c:a aac "${HOME}/.zen/tmp/yt-dlp/$TITLE.mp4" # TRY TO CONVERT MKV TO MP4
|
[[ -s "${HOME}/.zen/tmp/yt-dlp/$TITLE.mkv" ]] \
|
||||||
|
&& ffmpeg -loglevel quiet -i "${HOME}/.zen/tmp/yt-dlp/$TITLE.mkv" -c:v libx264 -c:a aac "${HOME}/.zen/tmp/yt-dlp/$TITLE.mp4" \
|
||||||
|
&& rm "${HOME}/.zen/tmp/yt-dlp/$TITLE.mkv"
|
||||||
|
|
||||||
if [[ ! -s "${HOME}/.zen/tmp/yt-dlp/${ZFILE}" ]]; then
|
if [[ ! -s "${HOME}/.zen/tmp/yt-dlp/${ZFILE}" ]]; then
|
||||||
echo "No FILE -- TRYING TO RESTORE CACHE FROM TW -- ${ZFILE}"
|
echo "No FILE -- TRYING TO RESTORE CACHE FROM TW -- ${ZFILE}"
|
||||||
tiddlywiki --load ${INDEX} \
|
tiddlywiki --load ${INDEX} \
|
||||||
--output ~/.zen/game/players/${PLAYER}/G1CopierYoutube \
|
--output ~/.zen/game/players/${PLAYER}/G1CopierYoutube \
|
||||||
--render '.' "$YID.TW.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' "${ZFILE}"
|
--render '.' "$YID.TW.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' "${ZFILE}"
|
||||||
if [[ -s ~/.zen/game/players/${PLAYER}/G1CopierYoutube/$YID.TW.json ]]; then
|
|
||||||
|
if [[ -s ~/.zen/game/players/${PLAYER}/G1CopierYoutube/${YID}.TW.json ]]; then
|
||||||
rm "${HOME}/.zen/game/players/${PLAYER}/G1CopierYoutube/${ZFILE}.json" 2>/dev/null
|
rm "${HOME}/.zen/game/players/${PLAYER}/G1CopierYoutube/${ZFILE}.json" 2>/dev/null
|
||||||
ln -s "${HOME}/.zen/game/players/${PLAYER}/G1CopierYoutube/$YID.TW.json" "${HOME}/.zen/game/players/${PLAYER}/G1CopierYoutube/${ZFILE}.json"
|
ln -s "${HOME}/.zen/game/players/${PLAYER}/G1CopierYoutube/${YID}.TW.json" "${HOME}/.zen/game/players/${PLAYER}/G1CopierYoutube/${ZFILE}.json"
|
||||||
else
|
else
|
||||||
## REMOVE FILE FROM .yt-dlp.list - RETRY NEXT TIME
|
## REMOVE FILE FROM .yt-dlp.list - RETRY NEXT TIME
|
||||||
grep -v -- "$YID" ${HOME}/.zen/.yt-dlp.list > /tmp/.yt-dlp.list
|
grep -v -- "$YID" ${HOME}/.zen/.yt-dlp.list > /tmp/.yt-dlp.list
|
||||||
mv /tmp/.yt-dlp.list ${HOME}/.zen/.yt-dlp.list
|
mv /tmp/.yt-dlp.list ${HOME}/.zen/.yt-dlp.list
|
||||||
fi
|
fi
|
||||||
|
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo
|
echo
|
||||||
|
|
||||||
####################################################
|
####################################################
|
||||||
|
|
|
@ -136,7 +136,8 @@ while read LINE; do
|
||||||
ASTROTW="" STAMP="" ASTROG1="" ASTROIPFS="" ASTROFEED=""
|
ASTROTW="" STAMP="" ASTROG1="" ASTROIPFS="" ASTROFEED=""
|
||||||
|
|
||||||
$($MY_PATH/../tools/search_for_this_email_in_players.sh ${EMAIL}) ## export ASTROTW and more
|
$($MY_PATH/../tools/search_for_this_email_in_players.sh ${EMAIL}) ## export ASTROTW and more
|
||||||
echo "export ASTROTW=${ASTRONAUTENS} ASTROG1=${ASTROG1} ASTROMAIL=${EMAIL} ASTROFEED=${FEEDNS}"
|
echo "export ASTROPORT=${ASTROPORT} ASTROTW=${ASTROTW} ASTROG1=${ASTROG1} ASTROMAIL=${EMAIL} ASTROFEED=${FEEDNS}"
|
||||||
|
[[ ${ASTROTW} == "" ]] && ASTROTW=${ASTRONAUTENS}
|
||||||
|
|
||||||
if [[ ! ${ASTROTW} ]]; then
|
if [[ ! ${ASTROTW} ]]; then
|
||||||
|
|
||||||
|
@ -227,7 +228,8 @@ while read LINE; do
|
||||||
ASTROTW="" STAMP="" ASTROG1="" ASTROIPFS="" ASTROFEED=""
|
ASTROTW="" STAMP="" ASTROG1="" ASTROIPFS="" ASTROFEED=""
|
||||||
#### SEARCH FOR PALPAY ACOUNTS : TODO BETTER §§§
|
#### SEARCH FOR PALPAY ACOUNTS : TODO BETTER §§§
|
||||||
$($MY_PATH/../tools/search_for_this_email_in_players.sh ${ZMAIL}) ## export ASTROTW and more
|
$($MY_PATH/../tools/search_for_this_email_in_players.sh ${ZMAIL}) ## export ASTROTW and more
|
||||||
echo "export ASTROTW=${ASTRONAUTENS} ASTROG1=${ASTROG1} ASTROMAIL=${EMAIL} ASTROFEED=${FEEDNS}"
|
echo "export ASTROPORT=${ASTROPORT} ASTROTW=${ASTROTW} ASTROG1=${ASTROG1} ASTROMAIL=${EMAIL} ASTROFEED=${FEEDNS}"
|
||||||
|
[[ ${ASTROTW} == "" ]] && ASTROTW=${ASTRONAUTENS}
|
||||||
|
|
||||||
if [[ ${ASTROG1} && ${ASTROG1} != ${G1PUB} ]]; then
|
if [[ ${ASTROG1} && ${ASTROG1} != ${G1PUB} ]]; then
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,58 @@
|
||||||
|
#!/bin/bash
|
||||||
|
################################################################################
|
||||||
|
# Author: Fred (support@qo-op.com)
|
||||||
|
# Version: 0.2
|
||||||
|
# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
|
||||||
|
################################################################################
|
||||||
|
MY_PATH="`dirname \"$0\"`" # relative
|
||||||
|
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
|
||||||
|
. "$MY_PATH/../tools/my.sh"
|
||||||
|
################################################################################
|
||||||
|
## MAP REFRESH
|
||||||
|
# LOAD EXTRA DATA TO CACHE ~/.zen/tmp/${IPFSNODEID}/
|
||||||
|
# PUBLISH STATION BALISE
|
||||||
|
############################################
|
||||||
|
echo "## RUNNING MAP.refresh"
|
||||||
|
[[ ${IPFSNODEID} == "" ]] && echo "IPFSNODEID is empty - EXIT -" && exit 1
|
||||||
|
|
||||||
|
#################################################################
|
||||||
|
## IPFSNODEID ASTRONAUTES SIGNALING ## 12345 port
|
||||||
|
############################
|
||||||
|
|
||||||
|
# UDATE STATION BALISE
|
||||||
|
if [[ -d ~/.zen/tmp/${IPFSNODEID} ]]; then
|
||||||
|
|
||||||
|
# ONLY FRESH DATA HERE
|
||||||
|
BSIZE=$(du -b ~/.zen/tmp/${IPFSNODEID} | tail -n 1 | cut -f 1)
|
||||||
|
## Getting actual online version
|
||||||
|
#~ ipfs get -o ~/.zen/tmp/${IPFSNODEID} /ipns/${IPFSNODEID}/
|
||||||
|
|
||||||
|
## COPY STATION yt-dlp.list
|
||||||
|
cp $HOME/.zen/.yt-dlp.list ~/.zen/tmp/${IPFSNODEID}/yt-dlp.list
|
||||||
|
|
||||||
|
## COPY COINS VALUE OF THE DAY
|
||||||
|
mkdir -p ~/.zen/tmp/${IPFSNODEID}/COINS/
|
||||||
|
mv ~/.zen/tmp/${IPFSNODEID}/*.COINS ~/.zen/tmp/${IPFSNODEID}/COINS/ 2>/dev/null ## CORRECT FORMAT : TO REMOVE
|
||||||
|
cp -f ~/.zen/tmp/coucou/*.COINS ~/.zen/tmp/${IPFSNODEID}/COINS/
|
||||||
|
|
||||||
|
## COPY FRIENDS
|
||||||
|
PLAYERONE=($(ls -t ~/.zen/game/players/ | grep "@" 2>/dev/null))
|
||||||
|
echo "FOUND : ${PLAYERONE[@]}"
|
||||||
|
## RUNING FOR ALL LOCAL PLAYERS
|
||||||
|
for PLAYER in ${PLAYERONE[@]}; do
|
||||||
|
echo "${PLAYER} SEEKING OWN FRIENDS"
|
||||||
|
mkdir -p ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/FRIENDS/
|
||||||
|
cp -Rf ~/.zen/game/players/${PLAYER}/FRIENDS/* ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/FRIENDS/
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "############################################ MY MAP "
|
||||||
|
ls ~/.zen/tmp/${IPFSNODEID}/
|
||||||
|
echo "############################################"
|
||||||
|
NSIZE=$(du -b ~/.zen/tmp/${IPFSNODEID} | tail -n 1 | cut -f 1)
|
||||||
|
ROUTING=$(ipfs add -rwHq ~/.zen/tmp/${IPFSNODEID}/* | tail -n 1 )
|
||||||
|
ipfs name publish /ipfs/${ROUTING}
|
||||||
|
echo ">> $NSIZE Bytes STATION BALISE > ${myIPFS}/ipns/${IPFSNODEID}"
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit 0
|
|
@ -19,6 +19,9 @@ PLAYERONE="$1"
|
||||||
|
|
||||||
echo "FOUND : ${PLAYERONE[@]}"
|
echo "FOUND : ${PLAYERONE[@]}"
|
||||||
|
|
||||||
|
echo "CLEANING UPLANET KEYS"
|
||||||
|
rm -Rf ~/.zen/tmp/${IPFSNODEID}/UPLANET/_*_*
|
||||||
|
|
||||||
## RUNING FOR ALL LOCAL PLAYERS
|
## RUNING FOR ALL LOCAL PLAYERS
|
||||||
for PLAYER in ${PLAYERONE[@]}; do
|
for PLAYER in ${PLAYERONE[@]}; do
|
||||||
[[ ! -d ~/.zen/game/players/${PLAYER:-undefined} ]] && echo "BAD ${PLAYERONE}" && continue
|
[[ ! -d ~/.zen/game/players/${PLAYER:-undefined} ]] && echo "BAD ${PLAYERONE}" && continue
|
||||||
|
@ -247,7 +250,7 @@ for PLAYER in ${PLAYERONE[@]}; do
|
||||||
echo "(☉_☉ ) (☉_☉ ) (☉_☉ ) RSS"
|
echo "(☉_☉ ) (☉_☉ ) (☉_☉ ) RSS"
|
||||||
## CREATING 30 DAYS RSS STREAM
|
## CREATING 30 DAYS RSS STREAM
|
||||||
tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html \
|
tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html \
|
||||||
--output ~/.zen/game/players/${PLAYER}/ipfs --render '.' "${PLAYER}.rss.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[days:created[-30]]'
|
--output ~/.zen/game/players/${PLAYER}/ipfs --render '.' "${PLAYER}.rss.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[days:created[-30]!is[system]]'
|
||||||
[[ ! -s ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json ]] && echo "NO ${PLAYER} RSS - BAD ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json -"
|
[[ ! -s ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json ]] && echo "NO ${PLAYER} RSS - BAD ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json -"
|
||||||
|
|
||||||
IRSS=$(ipfs add -q ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json | tail -n 1) \
|
IRSS=$(ipfs add -q ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json | tail -n 1) \
|
||||||
|
@ -275,6 +278,10 @@ for PLAYER in ${PLAYERONE[@]}; do
|
||||||
done
|
done
|
||||||
echo "PLAYER.refresh DONE."
|
echo "PLAYER.refresh DONE."
|
||||||
|
|
||||||
|
echo "REFRESHING MAP"
|
||||||
${MY_PATH}/MAP.refresh.sh
|
${MY_PATH}/MAP.refresh.sh
|
||||||
|
|
||||||
|
echo "REFRESHING UPLANET"
|
||||||
|
${MY_PATH}/UPLANET.refresh.sh
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
|
@ -31,6 +31,7 @@ mkdir ~/.zen/tmp/${MOATS}
|
||||||
echo ">>> REFRESHING ${UMAP}"
|
echo ">>> REFRESHING ${UMAP}"
|
||||||
LAT=$(echo ${UMAP} | cut -d '_' -f 2)
|
LAT=$(echo ${UMAP} | cut -d '_' -f 2)
|
||||||
LON=$(echo ${UMAP} | cut -d '_' -f 3)
|
LON=$(echo ${UMAP} | cut -d '_' -f 3)
|
||||||
|
|
||||||
##############################################################
|
##############################################################
|
||||||
WALLET=$(${MY_PATH}/../tools/keygen -t duniter "$LAT" "$LON")
|
WALLET=$(${MY_PATH}/../tools/keygen -t duniter "$LAT" "$LON")
|
||||||
[[ ! ${WALLET} ]] && echo "ERROR generating WALLET" && exit 1
|
[[ ! ${WALLET} ]] && echo "ERROR generating WALLET" && exit 1
|
||||||
|
@ -38,16 +39,46 @@ mkdir ~/.zen/tmp/${MOATS}
|
||||||
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/WALLET.priv "$LAT" "$LON"
|
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/WALLET.priv "$LAT" "$LON"
|
||||||
ipfs key rm ${WALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
|
ipfs key rm ${WALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
|
||||||
UMAPNS=$(ipfs key import ${WALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/WALLET.priv)
|
UMAPNS=$(ipfs key import ${WALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/WALLET.priv)
|
||||||
|
##############################################################
|
||||||
|
|
||||||
## GET ONLINE UMAPNS
|
## GET ONLINE UMAPNS
|
||||||
mkdir ~/.zen/tmp/${MOATS}/${UMAP}
|
mkdir ~/.zen/tmp/${MOATS}/${UMAP}
|
||||||
ipfs get -o ~/.zen/tmp/${MOATS}/${UMAP}/ /ipns/${UMAPNS}/
|
ipfs get -o ~/.zen/tmp/${MOATS}/${UMAP}/ /ipns/${UMAPNS}/
|
||||||
|
###############################################
|
||||||
|
|
||||||
[[ ! -d ~/.zen/tmp/${MOATS}/${UMAP}/${UMAP} ]] \
|
## FORMAT CONTROL
|
||||||
&& echo "UMAP IS BAD FORMAT - PLEASE CORRECT -" \
|
[[ ! -s ~/.zen/tmp/${MOATS}/${UMAP}/${UMAP}/UMAP.refresh ]] \
|
||||||
&& exit 1
|
&& echo ">>> ERROR - UMAP.refresh MISSING - ERROR -" \
|
||||||
|
&& continue
|
||||||
|
|
||||||
|
########################################################
|
||||||
|
## NODE SELECTION in UMAP.refresh
|
||||||
|
UREFRESH="${HOME}/.zen/tmp/${MOATS}/${UMAP}/${UMAP}/UMAP.refresh"
|
||||||
|
ALLNODES=($(cat ${UREFRESH})) # ${ALLNODES[@]}
|
||||||
|
STRAPS=($(ipfs bootstrap | rev | cut -f 1 -d'/' | rev)) ## ${STRAPS[@]}
|
||||||
|
# STRAPS=($(cat ${MY_PATH}/../A_boostrap_nodes.txt | grep -Ev "#"))
|
||||||
|
|
||||||
|
IAMINBOOTSTRAP=$(echo ${STRAPS[@]} | grep ${IPFSNODEID})
|
||||||
|
[[ ! ${IAMINBOOTSTRAP} ]] && ACTINGNODE=$(cat ${UREFRESH} | tail -n 1) ## LAST NODE
|
||||||
|
|
||||||
|
# PRIORITY TO BOOSTRAP
|
||||||
|
for NODE in ${ALLNODES[@]}; do
|
||||||
|
for STRAP in ${STRAPS[@]}; do
|
||||||
|
[[ "$NODE" == "$STRAP" ]] && ACTINGNODE=$(NODE) ## PREFERED 1ST NODE BEING BOOSTRAP
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
[[ "${ACTINGNODE}" != "${IPFSNODEID}" ]] \
|
||||||
|
&& echo ">> ACTINGNODE=${ACTINGNODE} is not ME - NEXT -" \
|
||||||
|
&& continue
|
||||||
|
|
||||||
|
# SHUFFLE UMAP.refresh
|
||||||
|
cat ${UREFRESH} | shuf > ${UREFRESH}.shuf
|
||||||
|
mv ${UREFRESH}.shuf ${UREFRESH}
|
||||||
|
######################################################## # NODE SELECTION in UMAP.refresh
|
||||||
|
|
||||||
|
##############################################################
|
||||||
|
## CALCULATE SURROUNDING UMAPS
|
||||||
##############################################################
|
##############################################################
|
||||||
# North Umap
|
# North Umap
|
||||||
NLAT=$(echo "$LAT + 0.01" | bc)
|
NLAT=$(echo "$LAT + 0.01" | bc)
|
||||||
|
|
|
@ -36,8 +36,8 @@ rm -Rf ~/.zen/tmp/${IPFSNODEID}/swarm
|
||||||
|
|
||||||
## TIMESTAMPING
|
## TIMESTAMPING
|
||||||
MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
|
MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
|
||||||
echo "${MOATS}" > ~/.zen/tmp/.MySwarm.moats
|
echo "${MOATS}" > ~/.zen/tmp/${IPFSNODEID}/.MySwarm.moats
|
||||||
echo "$(date -u)" > ~/.zen/tmp/.MySwarm.staom
|
echo "$(date -u)" > ~/.zen/tmp/${IPFSNODEID}/.MySwarm.staom
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
## MySwarm KEY INIT & SET
|
## MySwarm KEY INIT & SET
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -153,7 +153,6 @@ echo "### ${PLAYER} #################"
|
||||||
echo "SCANNING - ${G1PUB} STAR FRIENDS"
|
echo "SCANNING - ${G1PUB} STAR FRIENDS"
|
||||||
echo "########################################################################"
|
echo "########################################################################"
|
||||||
################## CHECKING WHO GAVE ME STARS
|
################## CHECKING WHO GAVE ME STARS
|
||||||
################## BOOTSTRAP LIKES THEM BACK
|
|
||||||
################## SEND ipfstryme MESSAGES to FRIENDS
|
################## SEND ipfstryme MESSAGES to FRIENDS
|
||||||
rm -f ~/.zen/tmp/${IPFSNODEID}/GCHANGE/${PLAYER}/my_star_level
|
rm -f ~/.zen/tmp/${IPFSNODEID}/GCHANGE/${PLAYER}/my_star_level
|
||||||
|
|
||||||
|
|
|
@ -107,7 +107,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
TWMODEL="/ipfs/bafybeiai3wvr3jpdpaslx72yfw2ipoc7acrse7aktdpykdairhsgkujsa4"
|
TWMODEL="/ipfs/bafybeidmzuostuxqjyp6jinoic4adybxesvdm2onncqpuufo4miy37wxvm"
|
||||||
# ipfs cat $TWMODEL > templates/twdefault.html
|
# ipfs cat $TWMODEL > templates/twdefault.html
|
||||||
##################################################### # NEW PLAYER ###############
|
##################################################### # NEW PLAYER ###############
|
||||||
################################################################################
|
################################################################################
|
||||||
|
@ -277,6 +277,8 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
|
||||||
sed -i "s~_MEDIAKEY_~${PLAYER}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
|
sed -i "s~_MEDIAKEY_~${PLAYER}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
|
||||||
sed -i "s~k2k4r8kxfnknsdf7tpyc46ks2jb3s9uvd3lqtcv9xlq9rsoem7jajd75~${ASTRONAUTENS}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
|
sed -i "s~k2k4r8kxfnknsdf7tpyc46ks2jb3s9uvd3lqtcv9xlq9rsoem7jajd75~${ASTRONAUTENS}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
|
||||||
|
|
||||||
|
sed -i "s~_ASTRONAUTENS_~/ipns/${ASTRONAUTENS}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
|
||||||
|
|
||||||
## AstroID G1CARD Update
|
## AstroID G1CARD Update
|
||||||
[[ ! $AstroID ]] && AstroID="/ipfs/bafybeifbebc3ewnzrzbm44arddedbralegnxklhua5d5ymzaqtf2kaub7i"
|
[[ ! $AstroID ]] && AstroID="/ipfs/bafybeifbebc3ewnzrzbm44arddedbralegnxklhua5d5ymzaqtf2kaub7i"
|
||||||
sed -i "s~${AstroID}~${ASTROQR}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
|
sed -i "s~${AstroID}~${ASTROQR}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
|
||||||
|
|
|
@ -19,7 +19,6 @@ EMAIL="$1"
|
||||||
|
|
||||||
if [[ "${EMAIL}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
|
if [[ "${EMAIL}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
|
||||||
|
|
||||||
|
|
||||||
INDEX=$(ls $HOME/.zen/game/players/${EMAIL}/ipfs/moa/index.html 2>/dev/null) ## LOCAL
|
INDEX=$(ls $HOME/.zen/game/players/${EMAIL}/ipfs/moa/index.html 2>/dev/null) ## LOCAL
|
||||||
[[ ! $INDEX ]] && INDEX=$(ls $HOME/.zen/tmp/${IPFSNODEID}/TW/${EMAIL}/index.html 2>/dev/null) ## CACHE
|
[[ ! $INDEX ]] && INDEX=$(ls $HOME/.zen/tmp/${IPFSNODEID}/TW/${EMAIL}/index.html 2>/dev/null) ## CACHE
|
||||||
[[ ! $INDEX ]] && INDEX=$(ls $HOME/.zen/tmp/swarm/*/TW/${EMAIL}/index.html 2>/dev/null) ## SWARM
|
[[ ! $INDEX ]] && INDEX=$(ls $HOME/.zen/tmp/swarm/*/TW/${EMAIL}/index.html 2>/dev/null) ## SWARM
|
||||||
|
@ -33,9 +32,14 @@ if [[ "${EMAIL}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
|
||||||
|
|
||||||
tiddlywiki --load ${INDEX} --output ~/.zen/tmp/${MOATS} --render '.' 'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport'
|
tiddlywiki --load ${INDEX} --output ~/.zen/tmp/${MOATS} --render '.' 'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport'
|
||||||
|
|
||||||
ASTRONAUTENS=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].astroport)
|
ASTROPORT=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].astroport)
|
||||||
ASTROG1=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].g1pub)
|
ASTROG1=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].g1pub)
|
||||||
|
|
||||||
|
## GET ASTRONAUTENS - field was missing in TW model Astroport Tiddler -
|
||||||
|
ASTRONAUTENS=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].astronautens)
|
||||||
|
[[ ${ASTRONAUTENS} == "null" || ${ASTRONAUTENS} == "" ]] && ASTRONAUTENS="/ipns/"$(ipfs key list -l | grep -w ${ASTROG1} | cut -d ' ' -f1)
|
||||||
|
[[ ${ASTRONAUTENS} == "/ipns/" ]] && ASTRONAUTENS=""
|
||||||
|
|
||||||
rm -Rf ~/.zen/tmp/${MOATS}
|
rm -Rf ~/.zen/tmp/${MOATS}
|
||||||
# cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r
|
# cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r
|
||||||
|
|
||||||
|
@ -47,5 +51,5 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
echo "export ASTROTW=$ASTRONAUTENS ASTROG1=$ASTROG1 ASTROMAIL=$EMAIL ASTROFEED=$FEEDNS"
|
echo "export ASTROPORT=$ASTROPORT ASTROTW=$ASTRONAUTENS ASTROG1=$ASTROG1 ASTROMAIL=$EMAIL ASTROFEED=$FEEDNS"
|
||||||
exit 0
|
exit 0
|
||||||
|
|
Loading…
Reference in New Issue