diff --git a/ajouter_video.sh b/ajouter_video.sh index 3fbe9e7a..a358850e 100755 --- a/ajouter_video.sh +++ b/ajouter_video.sh @@ -588,7 +588,7 @@ echo "~/.zen/Astroport.ONE/tools/new_file_in_astroport.sh \"$HOME/astroport/${CA echo "rm -f /tmp/\${MEDIAKEY}.pass rm -f /tmp/\${MEDIAKEY}.dunikey ## REMOVE KEYS -mv ~/astroport/Add_${MEDIAKEY}_script.sh ~/astroport/Done_${FILE_NAME}.sh +mv ~/astroport/Add_${MEDIAKEY}_script.sh \"$HOME/astroport/Done_${FILE_NAME}.sh\" " >> ~/astroport/Add_${MEDIAKEY}_script.sh chmod +x ~/astroport/Add_${MEDIAKEY}_script.sh @@ -615,19 +615,9 @@ FILE_SIZE=$(echo "${FILE_BSIZE}" | awk '{ split( "B KB MB GB TB PB" , v ); s=1; #fi ######################################################################## -## CHOOSE LIGHT OR COMPLETE -if [ $1 ]; then - bash ~/astroport/Add_${MEDIAKEY}_script.sh "noh265" - [ $? == 0 ] && echo "${MEDIAKEY} is RECORDED in ASTROPORT. GOOD." && exit 0 - -else - zenity --question --width 300 --text "OK! ~/astroport/Add_${MEDIAKEY}_script.sh ($FILE_SIZE). Voulez-vous lancer immédiatement l'ajout dans Astroport ?"; \ - [ $? == 0 ] && bash ~/astroport/Add_${MEDIAKEY}_script.sh "noh265" \ - && [[ $(cat ~/.zen/game/players/.current/.playerns 2>/dev/null) ]] \ - && xdg-open "http://127.0.0.1:8080/ipns/$(cat ~/.zen/game/players/.current/.playerns)" \ - || ( zenity --warning --width 300 --text "Désolé une erreur est survenue... cat /tmp/${MEDIAKEY}.log" && exit 1 )\ -fi +zenity --warning --width 300 --text "Association de votre fichier à $MEDIAKEY" +bash ~/astroport/Add_${MEDIAKEY}_script.sh "noh265" zenity --warning --width 300 --text "Ajout du Tiddler $MEDIAKEY à votre TW 'moa' $PLAYER" @@ -650,7 +640,7 @@ echo "${VOEUXLIST}" ## TODO MAKE FUNCTION, idem dans G1VOEUX !! echo "Nouveau MEDIAKEY dans MOA $PSEUDO / $PLAYER : http://127.0.0.1:8080/ipns/$ASTRONAUTENS" tiddlywiki --verbose --load ~/.zen/game/players/$PLAYER/ipfs/moa/index.html \ - --import ~/astroport/${TYPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json "application/json" \ + --import ~/astroport/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json "application/json" \ --output ~/.zen/tmp --render "$:/core/save/all" "newindex.html" "text/plain" echo "PLAYER TW Update..." diff --git a/logo96.png b/logo96.png new file mode 100644 index 00000000..5164d576 Binary files /dev/null and b/logo96.png differ diff --git a/start.sh b/start.sh index f67611ad..5d0932f7 100755 --- a/start.sh +++ b/start.sh @@ -78,7 +78,7 @@ ASTRONAUTENS=$(ipfs key list -l | grep -w "$PLAYER" | cut -d ' ' -f 1) echo "Votre MOA : http://127.0.0.1:8080/ipns/$ASTRONAUTENS" PS3="$PLAYER choisissez : __ " -choices=("AJOUTER VLOG" "CREER UN VOEU" "CREER G1ROND" "IMPRIMER VISA" "EXPORTER VISA" "SUPPRIMER VISA" "QUITTER") +choices=("AJOUTER VLOG" "CREER UN VOEU" "IMPRIMER QRVOEU" "IMPRIMER VISA" "EXPORTER VISA" "SUPPRIMER VISA" "QUITTER") select fav in "${choices[@]}"; do case $fav in "IMPRIMER VISA") @@ -114,41 +114,15 @@ select fav in "${choices[@]}"; do "AJOUTER VLOG") echo "Lancement Webcam..." ${MY_PATH}/tools/vlc_webcam.sh - #~/.zen/astrXbian/ajouter_video.sh ;; "CREER UN VOEU") - echo "QRCode à coller sur votre REVE" + echo "QRCode à coller sur les lieux ou objets portant une Gvaleur" ${MY_PATH}/G1VOEUX.sh - # ${MY_PATH}/tools/vlc_webcam.sh - #~/.zen/astrXbian/ajouter_video.sh ;; - "CREER G1ROND") - PS3='Choisissez le voeux ___ ' - voeux=($(ls ~/.zen/game/players/$PLAYER/voeux 2>/dev/null)) - - select voeu in "${voeux[@]}"; do - case $voeu in - *) echo "IMPRESSION $voeu" - myIP=$(hostname -I | awk '{print $1}' | head -n 1) - VOEUXNS=$(ipfs key list -l | grep $voeu | cut -d ' ' -f1) - qrencode -s 12 -o "$HOME/.zen/game/world/$voeu/QR.WISHLINK.png" "http://$myIP:8080/ipns/$VOEUXNS" - convert $HOME/.zen/game/world/$voeu/QR.WISHLINK.png -resize 600 /tmp/QRWISHLINK.png - TITLE=$(cat ~/.zen/game/world/$voeu/.pepper) - convert -gravity northwest -pointsize 35 -fill black -draw "text 250,5 \"$TITLE\"" /tmp/QRWISHLINK.png /tmp/g1voeu.png - echo " QR code $TITLE : http://$myIP:8080/ipns/$VOEUXNS" - - LP=$(ls /dev/usb/lp* | head -n1) - [[ ! $LP ]] && echo "NO PRINTER FOUND - Brother QL700 validated" && continue - - echo "IMPRESSION LIEN TW VOEU" - brother_ql_create --model QL-700 --label-size 62 /tmp/g1voeu.png > /tmp/toprint.bin 2>/dev/null - sudo brother_ql_print /tmp/toprint.bin $LP - - ;; - esac - done + "IMPRIMER QRVOEU") + ${MY_PATH}/tools/VOEUX.print.sh ;; "QUITTER") diff --git a/tools/VOEUX.print.sh b/tools/VOEUX.print.sh new file mode 100755 index 00000000..1e87ce04 --- /dev/null +++ b/tools/VOEUX.print.sh @@ -0,0 +1,52 @@ +#!/bin/bash +######################################################################## +# Version: 0.3 +# 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 +ME="${0##*/}" + +[[ $PLAYER == "" ]] && PLAYER=$(cat ~/.zen/game/players/.current/.player 2>/dev/null) +[[ $PLAYER == "" ]] && echo "PLAYER manquant" && exit 1 +PSEUDO=$(cat ~/.zen/game/players/$PLAYER/.pseudo 2>/dev/null) +[[ $G1PUB == "" ]] && G1PUB=$(cat ~/.zen/game/players/$PLAYER/.g1pub 2>/dev/null) +[[ $G1PUB == "" ]] && echo "G1PUB manquant" && exit 1 +ASTRONAUTENS=$(ipfs key list -l | grep -w "${PLAYER}" | cut -d ' ' -f 1) +[[ $ASTRONAUTENS == "" ]] && echo "ASTRONAUTE manquant" && exit 1 + + +for v in $(cat ~/.zen/game/players/*/voeux/*/.title); do + g1pub=$(grep -r $v ~/.zen/game/players/*/voeux/ $v 2>/dev/null | rev | cut -d '/' -f 2 | rev ) + echo "$v : $g1pub" + echo '------------------------------------------------------------------' +done + +PS3='Choisissez le voeux ___ ' +voeux=($(ls ~/.zen/game/players/$PLAYER/voeux 2>/dev/null) "QUITTER") + +select voeu in "${voeux[@]}"; do + case $voeu in + "QUITTER") + exit 0 + ;; + + *) echo "IMPRESSION $voeu" + myIP=$(hostname -I | awk '{print $1}' | head -n 1) + VOEUXNS=$(ipfs key list -l | grep $voeu | cut -d ' ' -f1) + qrencode -s 12 -o "$HOME/.zen/game/world/$voeu/QR.WISHLINK.png" "http://$myIP:8080/ipns/$VOEUXNS" + convert $HOME/.zen/game/world/$voeu/QR.WISHLINK.png -resize 600 /tmp/QRWISHLINK.png + TITLE=$(cat ~/.zen/game/world/$voeu/.pepper) + convert -gravity northwest -pointsize 35 -fill black -draw "text 250,5 \"$TITLE\"" /tmp/QRWISHLINK.png /tmp/g1voeu.png + echo " QR code $TITLE : http://$myIP:8080/ipns/$VOEUXNS" + + LP=$(ls /dev/usb/lp* | head -n1) + [[ ! $LP ]] && echo "NO PRINTER FOUND - Brother QL700 validated" && continue + + echo "IMPRESSION LIEN TW VOEU" + brother_ql_create --model QL-700 --label-size 62 /tmp/g1voeu.png > /tmp/toprint.bin 2>/dev/null + sudo brother_ql_print /tmp/toprint.bin $LP + + ;; + esac +done diff --git a/tools/new_file_in_astroport.sh b/tools/new_file_in_astroport.sh index 6d97f658..56f26a23 100755 --- a/tools/new_file_in_astroport.sh +++ b/tools/new_file_in_astroport.sh @@ -162,7 +162,7 @@ if [[ $KEY ]]; then echo "$KEYFILE" > ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.ipns.key.keystore_filename # Publishing IPNS key echo "$KEY" > ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.ipns.link - # CREATE .zen = ZEN economic value + # CREATE .zen = ZEN economic value counter touch ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.zen # CREATE other encrypted copies for friends depending DEFCON & stars # > STARGATE 1 - 2 - 3 - 4 - 5 !! @@ -352,7 +352,11 @@ echo $NEWIPFS > ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/ echo "ipfs name publish --quieter --key=${MEDIAKEY} $NEWIPFS" IPNS=$(ipfs name publish --quieter --key="${MEDIAKEY}" $NEWIPFS) -[[ "$IPNS" == "" ]] && echo "~~~ PROBLEM ~~~ ipfs name publish --quieter --key=${MEDIAKEY} $NEWIPFS" && IPNS="$(ipfs key list -l | grep -w ${MEDIAKEY} | cut -f 1 -d ' ')" +[[ "$IPNS" == "" ]] && \ +echo "~~~ PROBLEM ~~~ ipfs name publish --quieter --key=${MEDIAKEY} $NEWIPFS" && \ +IPNS="$(ipfs key list -l | grep -w ${MEDIAKEY} | cut -f 1 -d ' ')" +echo "${MEDIAKEY} : /ipns/$IPNS" + ######################################################################## ######################################################################## @@ -394,7 +398,7 @@ then RES=${FILE_RES%?}0p line="$CAT;${REFERENCE};$YEAR;$TITLE;$SAISON;;${IPNS};$RES;/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" fi - echo "-------------------- UPDATE MY INDEX -----------------------------" + echo "-------------------- UPDATE ${PREFIX}ASTRXBIAN INDEX -----------------------------" echo "$line" echo "$line" >> ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN echo "UPDATE IPNS ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/ajouter_video.txt" @@ -406,7 +410,7 @@ then ## TODO: ACTIVATE SUB DEFCON 4 MODE = encrypt/decrypt file in $G1DEST subdirectory ######################################################################## echo "----------------- REFRESH LOCAL KODI INDEX ----------------------" - cat ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN ~/.zen/game/players/$PLAYER/ipfs_swarm/.*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN | sort | uniq > ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN + cat ~/.zen/game/players/$PLAYER/ipfs*/.*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN | sort | uniq > ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN echo "----------------- PREPARING TIDDLER ----------------------"