From e533fb40bc904a4a82353961d36960cee5134c1e Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Mon, 21 Nov 2022 21:30:58 +0100
Subject: [PATCH] talking robot

---
 12345.sh                       |  7 +++--
 ajouter_media.sh               | 39 ++++++++++++------------
 tools/new_file_in_astroport.sh | 54 ++++++++--------------------------
 3 files changed, 38 insertions(+), 62 deletions(-)

diff --git a/12345.sh b/12345.sh
index 77eeeb70..add4ca19 100755
--- a/12345.sh
+++ b/12345.sh
@@ -19,10 +19,12 @@ myIP=$(hostname -I | awk '{print $1}' | head -n 1)
 isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/")
 [[ ! $myIP || $isLAN ]] && myIP="ipfs.localhost"
 
+
 PORT=12345
 
     YOU=$(ipfs swarm peers >/dev/null 2>&1 && echo "$USER" || ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1); ## $USER running ipfs
     LIBRA=$(head -n 2 ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | tail -n 1 | cut -d ' ' -f 2) ## SWARM#0 ENTRANCE URL
+    TUBE=$(head -n 2 ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | tail -n 1 | cut -d ' ' -f 3)
 
 mkdir -p ~/.zen/tmp/coucou/
 
@@ -42,7 +44,7 @@ Content-Type: text/html; charset=UTF-8
 "
 
 echo "_________________________________________________________"
-echo "LAUNCHING Astroport  API Server - TEST - "
+echo "LAUNCHING Astroport  API Server - $TUBE - "
 echo
 echo "CREATE GCHANGE + TW http://$myIP:1234/?salt=totodu56&pepper=totodu56&g1pub=on&email=fred@astroport.com"
 echo
@@ -106,7 +108,7 @@ while true; do
     HOSTP=$(echo "$REQ" | grep '^Host:' | cut -d ' ' -f2  | cut -d '?' -f2)
     HOST=$(echo "$HOSTP" | cut -d ':' -f 1)
     ############################################################################
-    [[ $URL == "/test" ]] && continue
+    [[ $URL == "/test"  || $URL == "" ]] && continue
 
     echo "************************************************************************* "
     echo "ASTROPORT 1234 UP & RUNNING.......................... http://$HOST:1234 PORT"
@@ -499,7 +501,6 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
             else
                 echo "NO TW FOUND - LAUNCHING CENTRAL"
                 ## 302 REDIRECT CENTRAL GW
-                TUBE=$(head -n 2 ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | tail -n 1 | cut -d ' ' -f 3)
                 TWIP=${TUBE}
             fi
 
diff --git a/ajouter_media.sh b/ajouter_media.sh
index 412a102e..554fc3f2 100755
--- a/ajouter_media.sh
+++ b/ajouter_media.sh
@@ -493,28 +493,14 @@ FILM_GENRES=$(zenity --list --checklist --title="GENRE" --height=${haut}\
 # FORMAT GENRES ["genre1","genre2"] # USE  IF YOU ACTIVATE KODI COMPATIBILITY
 GENRES="[\"$(echo ${FILM_GENRES} | sed s/\|/\",\"/g)\"]"
 
-########################################################################
-# Screen capture
-########################################################################
-if [[ $(echo $DISPLAY | cut -d ':' -f 1) == "" ]]; then
-    sleep 1
-    import -window root ~/.zen/tmp/screen.png
-fi
-
-###################################
-### MOVING FILE TO ~/astroport ####
-###################################
-mkdir -p ~/astroport/${CAT}/${MEDIAID}/
-mv ~/.zen/tmp/screen.png ~/astroport/${CAT}/${MEDIAID}/screen.png
-
 mv -f "${FILE_PATH}/${FILE_NAME}" "$HOME/astroport/${CAT}/${MEDIAID}/${TITLE}${SAISON}.${FILE_EXT}"
 
 if [ $? != 0 ]; then
     zenity --warning --width ${large} --text "Impossible de déplacer votre fichier ${FILE_PATH}/${FILE_NAME} vers ~/astroport - EXIT -"
     exit 1
 fi
-FILE_NAME="${TITLE}${SAISON}.${FILE_EXT}"
 
+FILE_NAME="${TITLE}${SAISON}.${FILE_EXT}"
 
 ## CREATE "~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt"
 URLENCODE_FILE_NAME=$(echo ${FILE_NAME} | jq -Rr @uri)
@@ -576,6 +562,22 @@ echo "${CAT};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/i
 
 esac
 
+########################################################################
+# Screen capture
+########################################################################
+if [[ $(echo $DISPLAY | cut -d ':' -f 1) == "" ]]; then
+    espeak "taking a screen shot"
+    sleep 1
+    import -window root ~/.zen/tmp/screen.png
+fi
+
+###################################
+### MOVING FILE TO ~/astroport ####
+###################################
+mkdir -p ~/astroport/${CAT}/${MEDIAID}/
+mv ~/.zen/tmp/screen.png ~/astroport/${CAT}/${MEDIAID}/screen.png
+
+
 ## Extract thumbnail
 MIME=$(file --mime-type -b "$HOME/astroport/${CAT}/${MEDIAID}/${TITLE}${SAISON}.${FILE_EXT}")
 
@@ -648,11 +650,12 @@ FILE_SIZE=$(echo "${FILE_BSIZE}" | awk '{ split( "B KB MB GB TB PB" , v ); s=1;
     ZENBALANCE=0
 #fi
 ########################################################################
-
+espeak "Ready to eat"
 zenity --warning --width 360 --text "(♥‿‿♥) $MEDIAKEY IPFS MIAM (ᵔ◡◡ᵔ)"
 
 bash ~/astroport/Add_${MEDIAKEY}_script.sh "noh265"
 
+espeak "T W index recording"
 zenity --warning --width 320 --text "Ajout à votre TW ${PLAYER}"
 
 
@@ -662,12 +665,12 @@ zenity --warning --width 320 --text "Ajout à votre TW ${PLAYER}"
 echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
 ## GETTING LAST TW via IPFS or HTTP GW
 LIBRA=$(head -n 2 ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | tail -n 1 | cut -d ' ' -f 2)
-rm ~/.zen/tmp/ajouter_media.html
+rm ~/.zen/tmp/ajouter_media.html > /dev/null 2>&1
 [[ $YOU ]] && echo " ipfs --timeout 12s cat /ipns/${ASTRONAUTENS} ($YOU)" && ipfs --timeout 12s cat /ipns/${ASTRONAUTENS} > ~/.zen/tmp/ajouter_media.html
 [[ ! -s ~/.zen/tmp/ajouter_media.html ]] && echo "curl -m 12 $LIBRA/ipns/${ASTRONAUTENS}" && curl -m 12 -so ~/.zen/tmp/ajouter_media.html "$LIBRA/ipns/${ASTRONAUTENS}"
 [[ ! -s ~/.zen/tmp/ajouter_media.html ]] && espeak "WARNING. WARNING. impossible to find your TW online"
 [[ ! -s ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html ]] &&  espeak "FATAL ERROR. No player TW copy found ! EXIT" && exit 1
-echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
+echo "%%%%%%%%%%%%%% I GOT YOUR TW %%%%%%%%%%%%%%%%%%%%%%%%%%"
 
 [[ -s ~/.zen/tmp/ajouter_media.html ]] && cp -f ~/.zen/tmp/ajouter_media.html ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html && espeak "TW Found"
 ###############################
diff --git a/tools/new_file_in_astroport.sh b/tools/new_file_in_astroport.sh
index 5896f901..a07af6af 100755
--- a/tools/new_file_in_astroport.sh
+++ b/tools/new_file_in_astroport.sh
@@ -244,57 +244,34 @@ else
     echo "## ALREADY EXISTING IPNS KEY $KEYFILE ($KEY)"
 fi
 
+
 ########################################################################
-# POST TRAITEMENTS
-if [[ "${type}" == 'page' ]]; then
-    echo "PDF ??"
-fi
+# type TW PUBLISHING
 ########################################################################
-# film/serie PUBLISH
-########################################################################
-if [[ "${type}" =~ ^(film|serie|youtube|video)$ ]]
+if [[ "${type}" =~ ^(page|film|serie|youtube|video)$ ]]
 then
-    ## CREATE GCHANGE AD
-    ## STOP PUBLISHING TO GCHANGE, NOW PLAYER TW ONLY
-    ## ACTIVATE AGAIN TO MAKE ADVERTISMENT OF YOUR MEDIAKEY ACCES
 
-#    if [[ ! -f ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.gchange.ad && ( "${type}" == "film" || "${type}" == "serie") ]]
-#    then
-#
-#     GOFFER=$(~/.zen/Astroport.ONE/tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey -n "https://data.gchange.fr" setoffer -t "${TITLE} #astroport #${MEDIAKEY}" -d "${TITLE} https://tube.copylaradio.com/ipns/$IPNS/ Faites un don à son portefeuille pour le conserver dans le Mediacenter des Amis - https://CopyLaRadio.com - https://astroport.com" -p $HOME/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/QR.png)
-#        echo $GOFFER > ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.gchange.ad
-#        NEWIPFS=$(ipfs add -rHq ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/ | tail -n 1 )
-#        IPNS=$(ipfs name publish --quieter --key="${MEDIAKEY}" $NEWIPFS)
-#        [[ "$IPNS" == "" ]] && IPNS="$(ipfs key list -l | grep -w ${MEDIAKEY} | cut -f 1 -d ' ')"
-#        echo "Annonce gchange : $(cat ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.gchange.ad)"
-#
-#    fi
-    #~ ########################################################################
-    #~ # CREATION DU FICHIER ${PREFIX}ASTRXBIAN FILE : Add Header (TODO DEBUG Kodi Plugin !! )
-    #~ mkdir -p ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/
-    #~ [[ ! -f ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN ]] \
-    #~ && echo "type;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://${myIP}:8080" > ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
+    ## ASK FOR EXTRA METADATA
+[[ ! $3 ]] && OUTPUT=$(zenity --forms --width 480 --title="METADATA" --text="Metadonnées (séparateur espace)" --separator="~" --add-entry="Description" --add-entry="extra tag(s)")
+[[ ! $3 ]] && DESCRIPTION=$(awk -F '~' '{print $1}' <<<$OUTPUT)
+[[ ! $3 ]] && HASHTAG=$(awk -F '~' '{print $2}' <<<$OUTPUT)
 
-    # REFRESH ${MOATS}_ajouter_video.txt FILE
+    # # # # ${MOATS}_ajouter_video.txt DATA # # # #
     if [[ -f ~/astroport/${TyPE}/${REFERENCE}/ajouter_video.txt ]]
     then
         line=$(cat ~/astroport/${TyPE}/${REFERENCE}/ajouter_video.txt | sed "s/_IPFSREPFILEID_/$IPFSREPFILEID/g" | sed "s/_IPNSKEY_/$IPNS/g" )
     else
         line="$type;${REFERENCE};$YEAR;$TITLE;$SAISON;;${IPNS};$RES;/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME"
     fi
-    echo "-------------------- UPDATE ${PREFIX}ASTRXBIAN INDEX -----------------------------"
+    echo "-------------------- ${MOATS}_ajouter_video.txt  -----------------------------"
     echo "$line"
     echo "UPDATE ~/astroport/${TyPE}/${REFERENCE}/ajouter_video.txt"
     echo "$line" > ~/astroport/${TyPE}/${REFERENCE}/ajouter_video.txt
+
+    ## MOATS TIMESTAMPING
     cp ~/astroport/${TyPE}/${REFERENCE}/ajouter_video.txt ~/astroport/${TyPE}/${REFERENCE}/${MOATS}_ajouter_video.txt
 
-    ########################################################################
-    ## TODO: ACTIVATE SUB DEFCON 4 MODE = encrypt/decrypt file in $G1DEST subdirectory
-    ########################################################################
-#    echo "----------------- REFRESH LOCAL KODI INDEX ----------------------"
-#    cat ~/.zen/game/players/$PLAYER/ipfs*/.*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN | sort | uniq > ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
-
-    echo "----------------- PREPARING TIDDLER ----------------------"
+    echo "----------------- GETTING  METADATA ----------------------"
     CAT=$(echo "$type" | sed -r 's/\<./\U&/g' | sed 's/ //g') # CapitalGluedWords
     GENRE=$(cat ~/astroport/${TyPE}/${REFERENCE}/${MOATS}_ajouter_video.txt | cut -d ';' -f 6 | sed 's/|/ /g' | jq -r '@csv' | sed 's/ /_/g' | sed 's/,/ /g' | sed 's/\"//g' )
 
@@ -308,11 +285,6 @@ then
 
     echo $GENRE $SAISON
 
-    ## ASK FOR EXTRA METADATA
-[[ ! $3 ]] && OUTPUT=$(zenity --forms --width 480 --title="METADATA" --text="Metadonnées (séparateur espace)" --separator="~" --add-entry="Description" --add-entry="extra tag(s)")
-[[ ! $3 ]] && DESCRIPTION=$(awk -F '~' '{print $1}' <<<$OUTPUT)
-[[ ! $3 ]] && HASHTAG=$(awk -F '~' '{print $2}' <<<$OUTPUT)
-
     ## Add screenshot (TODO : Make it better. Check what to put; if used & usefull
     [[ -f $HOME/astroport/${TyPE}/${REFERENCE}/screen.png ]] && IPSCREEN=$(ipfs add -q "$HOME/astroport/${TyPE}/${REFERENCE}/screen.png" | tail -n 1)
     [[ $IPSCREEN ]] && POSTER=$IPSCREEN
@@ -333,7 +305,7 @@ then
     Afficher tous les G1${CAT}
     </\$button>"
         TidType="text/vnd.tiddlywiki" ## MAYBE REAL ONCE TW CAN SHOW ATTACHED IPFS VIDEO (TODO: TESTINGS)
-        TAGS="G1${CAT} ${PLAYER} ${FILETAG} $GENRE ipfs ${HASHTAG}"
+        TAGS="G1${CAT} ${PLAYER} ${FILETAG} $SAISON $GENRE ipfs ${HASHTAG}"
         # TyPE="$MIME"
         # CANON="/ipfs/"${IPFSID}
         CANON=''