From 2f239feaa685205b92ffae8c2c1b501f88a9a289 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Mon, 10 Apr 2023 20:42:26 +0200
Subject: [PATCH] new earth

---
 API/QRCODE.sh                 |  2 +-
 ASTROBOT/G1CopierYoutube.sh   | 14 +++++++-------
 www/PasseportTerre/index.html |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/API/QRCODE.sh b/API/QRCODE.sh
index 79e6ae9c..4d432dec 100755
--- a/API/QRCODE.sh
+++ b/API/QRCODE.sh
@@ -175,7 +175,7 @@ if [[ ${QRCODE:0:2} == "G1" && ${AND} == "tw" ]]; then
     echo $INDEX
     if [[ -s  ${INDEX} ]]; then
 
-        if [[ "${APPNAME}" == "json" ]]; then
+        if [[ ${APPNAME} == "json" ]]; then
         ##############################################
             echo "DIRECT Tag = ${QRCODE:2} OUTPUT"
             ## DIRECT JSON OUTPUT
diff --git a/ASTROBOT/G1CopierYoutube.sh b/ASTROBOT/G1CopierYoutube.sh
index d415ef44..c3e2adc7 100755
--- a/ASTROBOT/G1CopierYoutube.sh
+++ b/ASTROBOT/G1CopierYoutube.sh
@@ -71,7 +71,7 @@ for YURL in $(cat ~/.zen/game/players/$PLAYER/G1CopierYoutube/CopierYoutube.json
     fi
         # ONE WEEK NEW SCAN
         if [[ $duree -ge 604800000 || ! -s ~/.zen/game/players/$PLAYER/G1CopierYoutube/yt-dlp.cache.$PLAYER ]]; then
-            yt-dlp $BROWSER --print "%(id)s&%(webpage_url)s" "${YURL}" >> ~/.zen/game/players/$PLAYER/G1CopierYoutube/yt-dlp.cache.$PLAYER
+            yt-youtube-dl $BROWSER --print "%(id)s&%(webpage_url)s" "${YURL}" >> ~/.zen/game/players/$PLAYER/G1CopierYoutube/yt-dlp.cache.$PLAYER
             sed -i "s~$lastrun~$MOATS~g" ~/.zen/game/players/$PLAYER/G1CopierYoutube/yt-dlp.command # UPDATE LASTRUN
         fi
 
@@ -113,7 +113,7 @@ if [[ ! ${TIDDLER} ]]; then
         ## LIMIT TO 12 MAXIMUM COPY PER DAY PER PLAYER
         [[ $tot == 13 ]] && echo "MAXIMUM COPY REACHED FOR TODAY" && continue
 
-        TITLE="$(yt-dlp $BROWSER --print "%(title)s" "${ZYURL}"  | detox --inline)"
+        TITLE="$(yt-youtube-dl $BROWSER --print "%(title)s" "${ZYURL}"  | detox --inline)"
         [[ ! $TITLE ]] && echo "NO TITLE" && continue
 
         start=`date +%s`
@@ -123,14 +123,14 @@ if [[ ! ${TIDDLER} ]]; then
         # SUBS ? --write-subs --write-auto-subs --sub-langs "fr, en, en-orig" --embed-subs
         # (bv*[height<=720][vcodec~='^((he|a)vc|h26[45])']+ba)
         # TODO : DELAY COPY OPERATION...  Astro can download quicker at 03:00 AM
-        echo "yt-dlp -f \"(bv*[ext=mp4][height<=720]+ba/b[height<=720])\" --no-mtime --embed-thumbnail --add-metadata -o \"$HOME/.zen/tmp/yt-dlp/$TITLE.%(ext)s\" ${ZYURL}"
+        echo "yt-youtube-dl -f \"(bv*[ext=mp4][height<=720]+ba/b[height<=720])\" --no-mtime --embed-thumbnail --add-metadata -o \"$HOME/.zen/tmp/yt-dlp/$TITLE.%(ext)s\" ${ZYURL}"
 
         #############################################################################
         ## COPY FROM YOUTUBE (TODO DOUBLE COPY & MKV to MP4 OPTIMISATION)
         ## EXTRA PARAM TO TRY
         #  --write-subs --write-auto-subs --sub-langs "fr, en, en-orig" --embed-subs
 
-        yt-dlp  -f "(bv*[ext=mp4][height<=720]+ba/b[height<=720])" \
+        yt-youtube-dl  -f "(bv*[ext=mp4][height<=720]+ba/b[height<=720])" \
                     $BROWSER \
                     --download-archive $HOME/.zen/.yt-dlp.list \
                     -S res,ext:mp4:m4a --recode mp4 --no-mtime --embed-thumbnail --add-metadata \
@@ -187,9 +187,9 @@ if [[ ! ${TIDDLER} ]]; then
         MIME=$(file --mime-type -b "$HOME/.zen/tmp/yt-dlp/$ZFILE")
 
         ## ADD TAGS
-        SEC=$(yt-dlp $BROWSER --print "%(duration)s" "${ZYURL}")
-        CHANNEL=$(yt-dlp $BROWSER --print "%(channel)s" "${ZYURL}" | sed -r 's/\<./\U&/g' | sed 's/ //g') # CapitalGluedWords
-        PLAYLIST=$(yt-dlp $BROWSER --print "%(playlist)s" "${ZYURL}" | sed -r 's/\<./\U&/g' | sed 's/ //g')
+        SEC=$(yt-youtube-dl $BROWSER --print "%(duration)s" "${ZYURL}")
+        CHANNEL=$(yt-youtube-dl $BROWSER --print "%(channel)s" "${ZYURL}" | sed -r 's/\<./\U&/g' | sed 's/ //g') # CapitalGluedWords
+        PLAYLIST=$(yt-youtube-dl $BROWSER --print "%(playlist)s" "${ZYURL}" | sed -r 's/\<./\U&/g' | sed 's/ //g')
         EXTRATAG="$CHANNEL $PLAYLIST"
         ## PREPARE VIDEO HTML5 CODE
         TEXT="<video controls width=100% poster='/ipfs/"${ANIMH}"'>
diff --git a/www/PasseportTerre/index.html b/www/PasseportTerre/index.html
index 80770b6c..e9c7b378 100644
--- a/www/PasseportTerre/index.html
+++ b/www/PasseportTerre/index.html
@@ -236,7 +236,7 @@
         <br><br>
         <br><br>
 
-          <h2>G1_G1VOEU_ W0rld</h2>
+          <h2>G1_G1VOEU_ _PLAYER_</h2>
           <canvas id="sphere" width="400" height="400"></canvas>
           <div id="glow-shadows" class="earth"></div>
           <canvas id="flights" width="400" height="400"></canvas>