From e170453c08876b7d174dd70ef5d9ed57bcc32a08 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Sun, 4 Dec 2022 15:06:09 +0100
Subject: [PATCH] make a wish, and make it real

---
 ASTROBOT/PLAYER.refresh.sh | 9 ++++-----
 A_boostrap_nodes.txt       | 2 +-
 ajouter_media.sh           | 9 +++++++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ASTROBOT/PLAYER.refresh.sh b/ASTROBOT/PLAYER.refresh.sh
index cb69c517..61b50201 100755
--- a/ASTROBOT/PLAYER.refresh.sh
+++ b/ASTROBOT/PLAYER.refresh.sh
@@ -120,13 +120,12 @@ isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(
         ##############################################################
         ## SPECIAL TAG "voeu" => Creation G1Voeu (G1Titre) makes AstroBot TW G1Processing
         ##############################################################
-        $MY_PATH/VOEUX.create.sh ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html $PLAYER
-
+        ${MY_PATH}/VOEUX.create.sh ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html "$PLAYER"
         # VOEUX.refresh.sh
         ##############################################################
-        ## RUN ASTROBOT G1Voeux SUBPROCESS (SPECIFIC AND STANDARD Ŋ1 SYNC)
+        ## RUN ASTROBOT G1Voeux SUBPROCESS (SPECIFIC Ŋ1 COPY)
         ##############################################################
-        $MY_PATH/VOEUX.refresh.sh ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html $PLAYER
+        ${MY_PATH}/VOEUX.refresh.sh ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html "$PLAYER"
         ##############################################################
 
         ####################
@@ -143,7 +142,7 @@ isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(
 
                 ###########################
                 # Modification Tiddlers de contrôle de GW & API
-            echo '[{"title":"$:/ipfs/saver/api/http/localhost/5001","tags":"$:/ipfs/core $:/ipfs/saver/api","text":"http:/ipfs.localhost:5001"}]' > ~/.zen/tmp/5001.json
+            echo '[{"title":"$:/ipfs/saver/api/http/localhost/5001","tags":"$:/ipfs/core $:/ipfs/saver/api","text":"http://ipfs.localhost:5001"}]' > ~/.zen/tmp/5001.json
             echo '[{"title":"$:/ipfs/saver/gateway/http/localhost","tags":"$:/ipfs/core $:/ipfs/saver/gateway","text":"http://'$TUBE':8080"}]' > ~/.zen/tmp/8080.json
 
             tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html \
diff --git a/A_boostrap_nodes.txt b/A_boostrap_nodes.txt
index 726da132..9b4a355f 100644
--- a/A_boostrap_nodes.txt
+++ b/A_boostrap_nodes.txt
@@ -1,5 +1,5 @@
 # CONTAINS Address of 1st Bootstrap Stations (24/24 Public IP) - DO NOT EDIT MANUALY -
-# http://tube.copylaradio.com:8080 ipfs.copylaradio.com
+# https://ipfs.copylaradio.com ipfs.copylaradio.com
 #################################################################
 # astroport.libra.copylaradio.com
 /ip4/149.102.158.67/udp/4001/quic/p2p/12D3KooWL2FcDJ41U9SyLuvDmA5qGzyoaj2RoEHiJPpCvY8jvx9u
diff --git a/ajouter_media.sh b/ajouter_media.sh
index 9248ec73..431de46c 100755
--- a/ajouter_media.sh
+++ b/ajouter_media.sh
@@ -325,7 +325,7 @@ rm -Rf ${YTEMP}
             echo "$IPNSKEY" > $FILE_PATH/$DOMAIN/.ipnshook       # SELF REFERING
 
             ### ADD TO IPFS
-            IPFSREPFILEID=$(ipfs add -qwr $FILE_PATH/$DOMAIN/* | tail -n 1)  # ADDING $DOMAIN TO IPFS
+            IPFSREPFILEID=$(ipfs add -qHwr $FILE_PATH/$DOMAIN/* | tail -n 1)  # ADDING $DOMAIN TO IPFS
             ipfs name publish -k $MEDIAKEY /ipfs/$IPFSREPFILEID   # PUBLISH $MEDIAKEY
 
             ## CREATE ajouter_video.txt
@@ -349,6 +349,7 @@ echo '[
   {
     "created": "'${MOATS}'",
     "modified": "'${MOATS}'",
+    "dur": "'$dur'",
     "title": "'${NIAMOD}'",
     "type": "'text/vnd.tiddlywiki'",
     "text": "'$TEXT'",
@@ -543,6 +544,7 @@ echo '[
     "title": "'$TITLE'",
     "artist": "'$artist'",
     "song": "'$song'",
+    "dur": "'$dur'",
     "type": "'audio/mpeg'",
     "text": "'$TEXT'",
     "size": "'${FILE_BSIZE}'",
@@ -610,7 +612,8 @@ TITLE=$(echo "${TITLE}" | sed "s/[(][^)]*[)]//g" | sed -e 's/;/_/g' ) # Clean TI
 # VIDEO YEAR
 ### CHECK IF PREVIOUS ajouter_video (Serie case)
 [[ -f  ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt ]] \
-&& PRE=$(cat ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt | cut -d ';' -f 3)
+&& PRE=$(cat ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt | cut -d ';' -f 3) \
+|| PRE=""
 YEAR=$(zenity --entry --width 300 --title "Année" --text "Indiquez année de la vidéo. Exemple: 1985" --entry-text="${PRE}")
 
 # VIDEO RESOLUTION
@@ -675,6 +678,8 @@ 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)\"]"
 
+mkdir -p ~/Astroport/${CAT}/${MEDIAID}/
+
 [[ ! -s "$HOME/Astroport/${CAT}/${MEDIAID}/${TITLE}${SAISON}.${FILE_EXT}" ]] \
 && cp "${FILE_PATH}/${FILE_NAME}" "$HOME/Astroport/${CAT}/${MEDIAID}/${TITLE}${SAISON}.${FILE_EXT}" \
 && [ $? != 0 ] \