This commit is contained in:
fred 2022-10-16 02:57:29 +02:00
parent eebd3c2875
commit fdc84f60b4
5 changed files with 22 additions and 17 deletions

View File

@ -124,11 +124,12 @@ while read YID;
"title": "'$ZFILE'",
"type": "'text/vnd.tiddlywiki'",
"text": "'$TEXT'",
"mime": "'$MIME'",
"size": "'${FILE_BSIZE}'",
"sec": "'${SEC}'",
"ipfs": "'${ILINK}'",
"youtubeid": "'${YID}'",
"tags": "'ipfs G1CopierYoutube ${EXTRATAG} ${MIME}'"
"tags": "'ipfs G1CopierYoutube ${PLAYER} ${EXTRATAG} ${MIME}'"
}
]
' > "$HOME/.zen/tmp/$WISHKEY/$YID.TW.json"

View File

@ -44,7 +44,7 @@ echo
echo "## TITRE POUR CE VOEU ? "
[[ ! $TITRE ]] && read TITRE
PEPPER=$(echo "$TITRE" | sed -r 's/\<./\U&/g' | sed 's/ //g') # CapitalGluedWords
echo "$PEPPER"
echo "$PEPPER" && [[ ! $PEPPER ]] && echo "EMPTY PEPPER - ERROR" && exit 1
echo "## keygen CLEF DE VOEUX"
${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/qrtw.dunikey "$SALT" "$PEPPER"

View File

@ -34,6 +34,7 @@ tiddlywiki --load ${INDEX} --output ~/.zen/tmp --render '.' 'voeu.json' 'text/pl
## Tous les tiddlers comportant le tag "voeu" lancent la création d'un G1VOEU ayant le titre du Voeu comme génrateur de clef TW (pepper).
for VOEU in "$(cat ~/.zen/tmp/voeu.json | jq -r '.[].title')"
do
[[ ! $VOEU ]] && echo "NO NAME" && continue
echo "Detected $VOEU"
VOEU=$(echo "$VOEU" | sed -r 's/\<./\U&/g' | sed 's/ //g') # CapitalGluedWords

View File

@ -26,8 +26,10 @@ echo "Exporting $PLAYER TW [tag[G1Voeu]]"
rm -f ~/.zen/tmp/g1voeu.json
tiddlywiki --load ${INDEX} --output ~/.zen/tmp --render '.' 'g1voeu.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[G1Voeu]]'
cat ~/.zen/tmp/g1voeu.json | jq -r '.[].wish' > ~/.zen/tmp/g1wishes
## GET VoeuTitle LIST
for WISH in "$(cat ~/.zen/tmp/g1voeu.json | jq -r '.[].wish')"
while read WISH
do
echo "G1Voeu $WISH"
## Get $WISHNAME TW
@ -90,17 +92,18 @@ do
FRIENDNS=$(cat ~/.zen/tmp/astroport.json | jq -r .[].astroport) ## Value exists also in "MadeInZion" tiddler
G1FRIEND=$(cat ~/.zen/tmp/astroport.json | jq -r .[].g1pub) ## Value exists also in "MadeInZion" tiddler
[[ ! $FRIENDNS ]] && echo "MISSING /ipns/astroport FOR THAT WISH" && continue
[[ $FRIENDNS == $ASTRONAUTENS ]] && echo "One of My Wish !! " && continue
[[ ! $FRIENDNS ]] && echo "ERROR MISSING /ipns/astroport FOR THAT WISH - CONTINUE -" && continue
[[ $FRIENDNS == $ASTRONAUTENS ]] && echo "One of My Wish !! - CONTINUE -" && continue
FINDEX="$HOME/.zen/game/players/$PLAYER/FRIENDS/$G1FRIEND/index.html"
echo "Expport [tag[G1$WISHNAME]] from $FINDEX"
tiddlywiki --load $FINDEX \
--output ~/.zen/tmp --render '.' 'g1wishtiddlers.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[G1'$WISHNAME']]'
[[ ! -s ~/.zen/tmp/g1wishtiddlers.json ]] && echo "ERROR - FAILED" && continue
# TODO Add Friends G1Voeu Tiddlers to my G1Voeu
## DIRECTLY LOOP SCAN FRIENDS TW !?
#####
done
@ -137,18 +140,18 @@ do
echo "*****************************************************"
done
done < ~/.zen/tmp/g1wishes
############################################
echo "## WORLD VOEUX"
echo "## WORLD VOEUX LIST = "
myIP=$(hostname -I | awk '{print $1}' | head -n 1)
for v in $(cat ~/.zen/game/players/*/voeux/*/.title); do echo $v ;done
for VOEU in $(ls ~/.zen/game/world/);
do
echo "$VOEU"
## TODO REFESH IPNS
done
exit 0

View File

@ -22,7 +22,7 @@ if [[ ! -d ~/.zen/game/players/$PLAYER/FRIENDS/ ]]; then
########################################################################
echo "CREATING $PLAYER GCHANGE+ PROFILE"
########################################################################
$MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey -n "https://data.gchange.fr" set --name "Astronaute $PSEUDO" --avatar "/home/$USER/.zen/Astroport.ONE/images/logo.png" --site "http://qo-op.com:8080/ipns/$ASTRONAUTENS" #GCHANGE+
$MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey -n "https://data.gchange.fr" set --name "Astronaute $PSEUDO" --avatar "/home/$USER/.zen/Astroport.ONE/images/logo.png" --site "http://astroport.com:8080/ipns/$ASTRONAUTENS" #GCHANGE+
[[ ! $? == 0 ]] && echo "GCHANGE PROFILE CREATION FAILED" && echo "Action Manuelle " $MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey -n "https://data.gchange.fr" set --name "Astronaute $PSEUDO" --avatar "/home/$USER/.zen/Astroport.ONE/images/logo.png" --site "http://qo-op.com:8080/ipns/$ASTRONAUTENS" #GCHANGE+
########################################################################
@ -121,8 +121,8 @@ do
# # # # # # # # # # # # # # #
# GET G1Voeux
# # # # # # # # # # # # # # #
## EXPORT [tag[voeu]]
echo "## EXPORT FROM $PLAYER TW [tag[voeu]] $INDEX"
## EXPORT [tag[G1Voeu]]
echo "## EXPORT FRIEND $PLAYER TW [tag[G1Voeu]] $INDEX"
rm -f ~/.zen/tmp/g1amig1voeu.json
tiddlywiki --load ~/.zen/game/players/$PLAYER/FRIENDS/${liking_me}/index.html \
--output ~/.zen/tmp --render '.' 'g1amig1voeu.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[G1Voeu]]'
@ -143,14 +143,15 @@ do
# IPNS could contain VOEUNS or /ipns/VOEUNS (/ tailing)
VOEUNS=$(echo $IPNS | rev | cut -d '/' -f 1 | rev)
echo "Getting latest $VOEUNS TW into Local World"
echo "Getting latest FRIEND G1$TITLE TW into Local World"
mkdir -p ~/.zen/game/world/$WISH
echo "/ipns/$VOEUNS => ~/.zen/game/world/$WISH"
[[ $YOU ]] && ipfs --timeout 12s cat /ipns/$VOEUNS > ~/.zen/tmp/$VOEUNS.html \
|| curl -m 12 -so ~/.zen/tmp/$VOEUNS.html "$LIBRA/ipns/$ipfsnodeid"
[[ -s ~/.zen/tmp/$VOEUNS.html ]] && cp ~/.zen/tmp/$VOEUNS.html ~/.zen/game/world/$WISH/index.html
echo "$TITLE FRIEND G1WISH COPY !"
echo "FRIEND G1WISH COPIED ! $TITLE"
echo "$TITLE" > ~/.zen/game/world/$WISH/.pepper
ls -al ~/.zen/game/world/$WISH/index.html
@ -179,9 +180,8 @@ do
echo ${ipfsnodeid} > ~/.zen/game/players/$PLAYER/FRIENDS/${liking_me}/ipfsnodeid
else
echo "ETOILES!! ... ENVOI MOI UN MESSAGE POUR CONNAITRE QUI"
echo "ETOILES RECUES!! ... ENVOI MOI UN MESSAGE POUR CONNAITRE QUI"
$MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey -n "https://data.gchange.fr" send -d "${G1PUB}" -t "Etoiles de ($my_star_level stars) : Ŋ1 SCORE $f_score" -m "https://www.gchange.fr/#/app/user?q=${liking_me} "
echo "Not Linking ;( YET."
fi