COIN cookies detox & run

12345.sh

@@ -231,6 +231,7 @@ while true; do
     ( ## SUB PROCESS
         COINS=$($MY_PATH/tools/jaklis/jaklis.py -k ~/.zen/tmp/coucou/${MOATS}.secret.key balance)
         echo "+++ WALLET BALANCE _ $COINS (G1) _"
+        [[ $COIN == "" || $COIN == "null" ]] && $MY_PATH/tools/jaklis/jaklis.py -k ~/.zen/tmp/coucou/${MOATS}.secret.key -n "https://data.gchange.fr" send -d "${G1PUB}" -t "BRO." -m "TAPA DE JUNE ? VA AVEC >>> https://cesium.app >>> (ᵔ◡◡ᵔ) FLASHER TON G1VISA "
         end=`date +%s`
         echo "G1WALLET  (☓‿‿☓) Execution time was "`expr $end - $start` seconds.
     ) &
@@ -260,6 +261,7 @@ while true; do
 ##############################################
         if [[ $APPNAME == "pay" ]]; then
             echo "$APPNAME : $WHAT $OBJ $VAL"
+            echo "${MY_PATH}/tools/jaklis/jaklis.py -k ~/.zen/tmp/coucou/${MOATS}.secret.key -a ${WHAT} -p ${VAL} -c 'Bro'"
             echo "$HTTPCORS $(${MY_PATH}/tools/jaklis/jaklis.py -k ~/.zen/tmp/coucou/${MOATS}.secret.key -a ${WHAT} -p ${VAL} -c 'Bro')" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
             end=`date +%s`
             echo "(G_G ) PAYING Execution time was "`expr $end - $start` seconds.
@@ -270,7 +272,7 @@ while true; do
 ##############################################
 # MESSAGING
 ##############################################
-        if [[ $APPNAME == "messaging" || $APPNAME == "email" ]]; then
+        if [[ $APPNAME == "messaging" ]]; then
 
             ( ## & SUB PROCESS
 
@@ -319,7 +321,7 @@ while true; do
 ########################################
 # G1PUB WITH NO EMAIL -> Open Gchange Profile & Update TW cache
 ########################################
-        if [[ "$APPNAME" == "g1pub" && ${arr[7]} == "" ]]; then
+        if [[ "$APPNAME" == "g1pub" && "$OBJ" != "email" ]]; then
 
             [[ ${WHAT} == "astro" ]] && REPLACE="$LIBRA/ipns/$ASTRONAUTENS" \
             || REPLACE="https://www.gchange.fr/#/app/user/${G1PUB}"
@@ -480,14 +482,14 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
         ###################################################################################################
         ###################################################################################################
         # API ONE : ?salt=PHRASE%20UNE&pepper=PHRASE%20DEUX&g1pub=on&email=EMAIL&pseudo=PROFILENAME
-    if [[ ${arr[6]} == "email" && ${arr[7]} != "" ]]; then
+    if [[ ${OBJ} == "email" && "${VAL}" != "" ]]; then
 
                 [[ $APPNAME != "g1pub" ]] && (echo "$HTTPCORS ERROR - BAD COMMAND $APPNAME" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) &&  echo "(☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && continue
 
                 start=`date +%s`
 
                 # WHAT can contain urlencoded FullURL
-                EMAIL=$(urldecode ${arr[7]} | xargs)
+                EMAIL="${VAL}"
                 PSEUDO=$(urldecode ${arr[9]} | xargs)
 
                 [[ ! ${EMAIL} ]] && (echo "$HTTPCORS ERROR - MISSING ${EMAIL} FOR ${WHAT} CONTACT" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) &&  echo "(☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. &&  continue
@@ -540,17 +542,6 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
     fi
 
 
-##############################################
-# VIDEOURL : ADD URL TO 'CopierYoutube' tagged Tiddler : TODO
-##############################################
-        if [[ $APPNAME == "CopierYoutube" ]]; then
-            echo "$HTTPCORS /ipns/${ASTRONAUTENS} ADDING ${WHAT}"| nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
-            end=`date +%s`
-            echo $APPNAME "(☉_☉ ) ${WHAT} Execution time was "`expr $end - $start` seconds.
-            continue
-        fi
-
-
         ## RESPONDING
         cat ~/.zen/tmp/coucou/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > ~/.zen/tmp/coucou/${MOATS}.official.swallow &
         echo "HTTP 1.1 PROTOCOL DOCUMENT READY"

ASTROBOT/G1CopierYoutube.sh

@@ -113,8 +113,7 @@ if [[ ! ${TIDDLER} ]]; then
         echo "COPIE : $ZYURL"
         [[ $boucle == 13 ]] && echo "MAXIMUM COPY REACHED FOR TODAY" && continue
 
-        TITLE="$(yt-dlp --cookies-from-browser $BROWSER --print "%(title)s" "${ZYURL}")"
+        TITLE="$(yt-dlp --cookies-from-browser $BROWSER --print "%(title)s" "${ZYURL}"  | detox --inline)"
-        TITLE=${TITLE//[^A-zÀ-ÿ0-9 ]/}
         [[ ! $TITLE ]] && echo "NO TITLE" && continue
 
         start=`date +%s`

ajouter_media.sh

@@ -210,39 +210,30 @@ mkdir -p ${YTEMP}
 # youtube-dl $YTURL
 echo "VIDEO $YTURL"
 
-#                 --write-subs --write-auto-subs --sub-langs "fr, en, en-orig" --embed-subs
+LINE="$(yt-dlp --cookies-from-browser $BROWSER --print "%(id)s&%(title)s" "${YTURL}")"
+YID=$(echo "$LINE" | cut -d '&' -f 1)
+TITLE=$(echo "$LINE" | cut -d '&' -f 2- | detox --inline)
 
-/usr/local/bin/youtube-dl  -f "(bv*[ext=mp4][height<=480]+ba/b[height<=480])" \
+/usr/local/bin/youtube-dl -f "(bv*[ext=mp4][height<=720]+ba/b[height<=720])" \
-                --cookies-from-browser $BROWSER \
+                --cookies-from-browser $BROWSER --verbose --audio-format mp3\
                 --download-archive $HOME/.zen/.yt-dlp.list \
-                -S res,ext:mp4:m4a --recode mp4 --no-mtime --embed-thumbnail --add-metadata \
+                 -S res,ext:mp4:m4a --recode mp4 --no-mtime --embed-thumbnail --add-metadata \
-                --no-playlist --write-info-json --write-description --no-get-comments \
+                 -o "${YTEMP}/$TITLE.%(ext)s" "$YTURL"
-                --no-mtime -o "${YTEMP}/%(id)s&%(title)s.%(ext)s" $YTURL
 
-# Get filename, extract ID, make destination dir and move copy.
+        ZFILE="$TITLE.mp4"
-YFILE=$(ls -S ${YTEMP} | head -n 1)
+        echo "$ZFILE"
-FILE_NAME="$(basename "${YFILE}")"
+
+FILE_NAME="$(basename "${ZFILE}")"
 FILE_EXT="${FILE_NAME##*.}"
 
-JSON_FILE=$(echo ${FILE_NAME} | sed "s/${FILE_EXT}/json/g")
+echo "OK $ZFILE copied"
-
+espeak "OK $TITLE copied"
-YID=$(echo "${FILE_NAME}" | cut -d "&" -f 1)
-YNAME=$(echo "${FILE_NAME}" | cut -d "&" -f 2- | sed "s/[(][^)]*[)]//g" | sed -e 's/[^A-Za-z0-9._-]/_/g' | sed -e 's/__/_/g' ) # Remove YoutubeID_ and (what is in perentheses)
-[[ $(which detox) ]] && YNAME=$(echo "${FILE_NAME}" | cut -d "&" -f 2- | detox --inline)
-
-espeak "OK $YNAME copied"
 
 MEDIAID="$REVSOURCE${YID}"
-TITLE="${YNAME%.*}"
 MEDIAKEY="YOUTUBE_${MEDIAID}"
 
 FILE_PATH="$HOME/Astroport/youtube/$MEDIAID"
 mkdir -p ${FILE_PATH} && mv -f ${YTEMP}/* ${FILE_PATH}/
-# rename FILE_NAME to YNAME (URL clean)
-mv "${FILE_PATH}/${FILE_NAME}" "${FILE_PATH}/${YNAME}" && FILE_NAME="${YNAME}"
-# get & rename video.json
-jsonfile=$(ls ${FILE_PATH}/*.json)
-mv "${jsonfile}" "${FILE_PATH}/video.json"
 
 FILE_RES=$(ffprobe -v error -select_streams v:0 -show_entries stream=width,height -of csv=s=x:p=0 "${FILE_PATH}/${FILE_NAME}" | cut -d "x" -f 2)
 RES=${FILE_RES%?}0p

install.sh

@@ -30,7 +30,7 @@ then
 
 # Check requirements
 echo "Installateur Astroport.ONE pour distributions DEBIAN et dérivées : LinuxMint (https://www.linuxmint.com/)"
-echo "$USER appuyez sur ENTRER."; read TEST;  [[ "$TEST" != "" ]] && echo "SORTIE" && exit 0 ## Ajouter confirmation à chaque nouvelle étape (+explications)
+# echo "$USER appuyez sur ENTRER."; read TEST;  [[ "$TEST" != "" ]] && echo "SORTIE" && exit 0 ## Ajouter confirmation à chaque nouvelle étape (+explications)
 echo "#############################################"
 echo "###### IPFS BIOS INSTALL ##############################"
 echo "################  CRYPTO TW Ŋ1 PROTOCOL #############"

tools/VISA.new.sh

@@ -295,7 +295,8 @@ NID="${myIPFSGW}" && WID="$NID/api"
         convert -gravity northwest -pointsize 25     -fill black -draw "text 300,140 \"$PEPPER\"" ~/.zen/tmp/${MOATS}/salt.png ~/.zen/game/players/$PLAYER/ID.png
 
         # INSERTED IMAGE IPFS
-        IASTRO=$(ipfs add -Hq ~/.zen/game/players/$PLAYER/ID.png | tail -n 1)
+        # IASTRO=$(ipfs add -Hq ~/.zen/game/players/$PLAYER/ID.png | tail -n 1) ## G1VISA PUBLIC / PRIVATE
+        IASTRO=$(ipfs add -Hq ~/.zen/game/players/$PLAYER/pseudo.png | tail -n 1) ## G1VISA PUBLIC ONLY
         sed -i "s~bafybeidhghlcx3zdzdah2pzddhoicywmydintj4mosgtygr6f2dlfwmg7a~${IASTRO}~g" ~/.zen/game/players/$PLAYER/ipfs/moa/index.html
 
     echo