diff --git a/ASTROBOT/G1CopierYoutube.sh b/ASTROBOT/G1CopierYoutube.sh index 7c622079..0fe20062 100755 --- a/ASTROBOT/G1CopierYoutube.sh +++ b/ASTROBOT/G1CopierYoutube.sh @@ -172,7 +172,7 @@ if [[ ! ${TIDDLER} ]]; then ILINK=$(ipfs add -q "$HOME/.zen/tmp/yt-dlp/$ZFILE" | tail -n 1) echo "/ipfs/$ILINK === $ZFILE" - [[ $ILINK == "" ]] && echo "BIG PROBLEM PAPA. NO IPFS " && continue + [[ $ILINK == "" ]] && echo ">>>>> BIG PROBLEM PAPA. NO IPFS " && continue MIME=$(file --mime-type -b "$HOME/.zen/tmp/yt-dlp/$ZFILE") diff --git a/ASTROBOT/G1Voeu.sh b/ASTROBOT/G1Voeu.sh index 64df1ee9..2d11d8b3 100755 --- a/ASTROBOT/G1Voeu.sh +++ b/ASTROBOT/G1Voeu.sh @@ -77,6 +77,8 @@ echo LIBRA=$(head -n 2 ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | tail -n 1 | cut -d ' ' -f 2) qrencode -s 12 -o "$HOME/.zen/game/world/$WISHKEY/QR.WISHLINK.png" "$LIBRA/ipns/$VOEUNS" + ## TRYING amrzqr + amzqr "$LIBRA/ipns/$VOEUNS" -d "$HOME/.zen/game/world/$WISHKEY" -p ${MY_PATH}/../images/g1magicien.png -c qrencode -s 12 -o "$HOME/.zen/game/world/$WISHKEY/QR.ASTROLINK.png" "$LIBRA/ipns/$ASTRONAUTENS" qrencode -s 12 -o "$HOME/.zen/game/world/$WISHKEY/QR.G1ASTRO.png" "$G1PUB" qrencode -s 12 -o "$HOME/.zen/game/world/$WISHKEY/QR.G1WISH.png" "$WISHKEY" @@ -176,7 +178,7 @@ convert -gravity northwest -pointsize 50 -fill black -draw "text 30,300 \"$PEPPE echo "$SALT" > ~/.zen/game/players/$PLAYER/voeux/$WISHKEY/.salt echo "$PEPPER" > ~/.zen/game/players/$PLAYER/voeux/$WISHKEY/.title echo "$LIBRA/ipns/$VOEUNS" > ~/.zen/game/players/$PLAYER/voeux/$WISHKEY/.link - cp ~/.zen/game/world/$WISHKEY/QR.WISHLINK.png ~/.zen/game/players/$PLAYER/voeux/$WISHKEY/ + cp ~/.zen/game/world/$WISHKEY/*.png ~/.zen/game/players/$PLAYER/voeux/$WISHKEY/ # PUBLISHING banner="## ${PLAYER} YOUR WISH IS READY TO MAKE Ŋ1 TW FLUX for G1$PEPPER" diff --git a/ASTROBOT/VOEUX.refresh.sh b/ASTROBOT/VOEUX.refresh.sh index 22934a68..c3388062 100755 --- a/ASTROBOT/VOEUX.refresh.sh +++ b/ASTROBOT/VOEUX.refresh.sh @@ -48,7 +48,7 @@ echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" ## GET VoeuTitle LIST while read WISH do - [[ ${WISH} == "" || ${WISH} == "null" ]] && continue + [[ ${WISH} == "" || ${WISH} == "null" ]] && echo "BLURP. EMPTY WISH" && continue echo "===============================" echo "G1Voeu ${WISH}" ## Get ${WISHNAME} TW @@ -92,29 +92,33 @@ do [[ ! -s $FRIENDTW ]] && echo "$FRIENDTW VIDE (AMI SANS TW)" && continue APLAYER=$(ls $FRIENDTW | cut -d '/' -f 7) - rm -f ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/${APLAYER}.tiddlers.json + rm -f ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/${APLAYER}.tiddlers.json ## CLEANING OLD FORMAT (TODO REMOVE) + + rm -f ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/_${APLAYER}.tiddlers.json echo "TRY EXPORT [tag[G1${WISHNAME}]] FROM $FRIENDTW" tiddlywiki --load $FRIENDTW \ - --output ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME} --render '.' ${APLAYER}'.tiddlers.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[G1'${WISHNAME}']!tag[G1Voeu]]' - [[ ! -s ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/${APLAYER}.tiddlers.json ]] && echo "NO ${WISHNAME} - CONTINUE -" && continue - [[ $(cat ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/${APLAYER}.tiddlers.json) == "[]" ]] && echo "EMPTY ${WISHNAME} - CONTINUE -" && continue + --output ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME} --render '.' _${APLAYER}'.tiddlers.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[G1'${WISHNAME}']!tag[G1Voeu]]' + [[ ! -s ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/_${APLAYER}.tiddlers.json ]] && echo "NO ${WISHNAME} - CONTINUE -" && continue + [[ $(cat ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/_${APLAYER}.tiddlers.json) == "[]" ]] && echo "EMPTY ${WISHNAME} - CONTINUE -" && continue echo "## TIDDLERS FOUND ;) MIAM >>> (◕‿‿◕) <<<" - echo ">>> G1FRIEND § $myIPFS/$VOEUNS/${APLAYER}.tiddlers.json ${WISHNAME}" + echo ">>> G1FRIEND § $myIPFS/$VOEUNS/_${APLAYER}.tiddlers.json ${WISHNAME}" done ################################## - - echo ">>> MOA § $myIPFS/$VOEUNS/${PLAYER}.tiddlers.json" + ################################## MOA MAINTENANT + echo ">>> MOA § $myIPFS/$VOEUNS/_${PLAYER}.tiddlers.json" tiddlywiki --load $INDEX \ --output ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME} \ - --render '.' ${PLAYER}'.tiddlers.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[G1'${WISHNAME}']!tag[G1Voeu]]' + --render '.'_ ${PLAYER}'.tiddlers.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[G1'${WISHNAME}']!tag[G1Voeu]]' ### PREPARE WISHNAME index.html cat $MY_PATH/../templates/index_gif4.html \ | sed -e "s~_LIBRA_~$(myIpfsGw)~g" -e "s~_G1VOEU_~${WISHNAME}~g" -e "s~_PLAYER_~${PLAYER}~g" -e "s~_VOEUNS_~${VOEUNS}~g" \ > ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/index.html + ## MAKE EARTH MAP TILES + ### ADD TO IPFS echo "++WISH PUBLISHING++ ipfs add -qHwr ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/*" JSONIPFS=$(ipfs add -qHwr ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/* | tail -n 1) # ADDING JSONS TO IPFS diff --git a/templates/index_gif4.html b/templates/index_gif4.html index 052666e0..6e62c482 100644 --- a/templates/index_gif4.html +++ b/templates/index_gif4.html @@ -2,7 +2,20 @@ _PLAYER_ : TW : _G1VOEU_ - + + + + + + + + + + + + + + + + -
+ +

G1_G1VOEU_

@@ -54,6 +70,8 @@
+ + + + + Entrez par le Le Claude + +

Astroport Ŋ1

+ +
Une Planète à Vous
Un Internet à Nous
+
+
+

Installez Cesium !

+ + Flashez le QRCode. du TW de "fred@g1sms.fr" +

+

+ +

Indiquez en commentaire les emails de amis à qui vous souhaitez partager votre don.

+

Compte hébergée par LaSTI Service "G1CopierYoutube" & "G1PalPé"

+
+ +

Scannez votre QRCode

+ +
+ + + + + +
+ + +
+
+

Votre Monde

+ +
+ +
+
+ +

♥BOX, sauvegarde, diffuse et partage vos DATA 👍 à l'abris dans "Le Claude"

+

Powered by Astroport

+ +
+ Choose example: +
+ + +
+
+