diff --git a/12345.sh b/12345.sh
index 62a0cca7..2ec82613 100755
--- a/12345.sh
+++ b/12345.sh
@@ -43,8 +43,8 @@ Server: Astroport.ONE
Content-Type: text/html; charset=UTF-8
"
-echo "_________________________________________________________"
-echo "LAUNCHING Astroport API Server - TUBE : $TUBE - "
+echo "_________________________________________________________ $(date)"
+echo "LAUNCHING Astroport API Server - TUBE : $LIBRA - "
echo
echo "OPEN GCHANGE ${myHTTP}${myHOST}:1234/?salt=totodu56&pepper=totodu56&g1pub"
echo "VISA.new ${myHTTP}${myHOST}:1234/?salt=totodu56&pepper=totodu56&g1pub=on&email=totodu56@yopmail.com"
@@ -486,7 +486,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
echo "$HTTPCORS -
BOOTING - ASTRONAUT $PSEUDO
IPFS FORMATING - [$SALT + $PEPPER] (${WHAT})
- TW - http://${myHOST}:8080/ipns/$ASTRONAUTENS
- GW - /ipns/$IPFSNODEID" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
- echo "(☓‿‿☓) Execution time was "`expr $end - $start` seconds.
+
continue
else
# ASTRONAUT EXISTING ${WHAT}
@@ -556,14 +556,14 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
"title": "'${MOATS}'",
"type": "'text/vnd.tiddlywiki'",
"text": "'$(urldecode $wsource)'",
- "tags": "'CopierYoutube ${${WHAT}}'"
+ "tags": "'CopierYoutube ${WHAT}'"
}
]
-' > ~/.zen/tmp/${${WHAT}}.${MOATS}.import.json
+' > ~/.zen/tmp/${WHAT}.${MOATS}.import.json
- ## TODO ASTROBOT "G1AstroAPI" READS ~/.zen/tmp/${${WHAT}}.${MOATS}.import.json
+ ## TODO ASTROBOT "G1AstroAPI" READS ~/.zen/tmp/${WHAT}.${MOATS}.import.json
- (echo "$HTTPCORS OK - ~/.zen/tmp/${${WHAT}}.${MOATS}.import.json WORKS IF YOU MAKE THE WISH voeu 'AstroAPI'" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && continue
+ (echo "$HTTPCORS OK - ~/.zen/tmp/${WHAT}.${MOATS}.import.json WORKS IF YOU MAKE THE WISH voeu 'AstroAPI'" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && continue
fi
fi
diff --git a/ASTROBOT/PLAYER.refresh.sh b/ASTROBOT/PLAYER.refresh.sh
index 61b50201..30b73b0f 100755
--- a/ASTROBOT/PLAYER.refresh.sh
+++ b/ASTROBOT/PLAYER.refresh.sh
@@ -57,8 +57,7 @@ isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(
echo "Getting latest online TW..."
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);
LIBRA=$(head -n 2 ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | tail -n 1 | cut -d ' ' -f 2)
- echo "$LIBRA/ipns/$ASTRONAUTENS"
- echo "http://$myIP:8080/ipns/$ASTRONAUTENS ($YOU)"
+ echo "($YOU) /ipns/$ASTRONAUTENS $LIBRA"
[[ $YOU ]] && ipfs --timeout 30s cat /ipns/$ASTRONAUTENS > ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html \
|| curl -m 30 -so ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html "$LIBRA/ipns/$ASTRONAUTENS"
@@ -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/gateway/http/localhost","tags":"$:/ipfs/core $:/ipfs/saver/gateway","text":"http://'$TUBE':8080"}]' > ~/.zen/tmp/8080.json
+ echo '[{"title":"$:/ipfs/saver/gateway/http/localhost","tags":"$:/ipfs/core $:/ipfs/saver/gateway","text":"https://ipfs.copylaradio.com"}]' > ~/.zen/tmp/8080.json
tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html \
--import "$HOME/.zen/tmp/MadeInZion.json" "application/json" \
diff --git a/README.md b/README.md
index 5aefbffa..506c0de7 100644
--- a/README.md
+++ b/README.md
@@ -48,9 +48,18 @@ Trouvez le moyen d'accéder à votre "Station Astroport" en explorant les enviro
make install
```
-# https://ipfs.copylaradio.com/ipns/support.qo-op.com.localhost.copylaradio.com : IPNS : TW index du PLAYER support@qo-op.com
+Plus de connexion officielle.
+L'UTILISATEUR devient un JOUEUR, en semant son propre IPFS, en utilisant un Docker sur un nœud Astroport géré par un autre JOUEUR.
-# USAGE
+Ainsi, les AMIS peuvent héberger d'autres AMIS.
+
+# RESULTAT
+
+TW du PLAYER support@qo-op.com
+
+https://ipfs.copylaradio.com/ipns/support.qo-op.com.localhost.copylaradio.com
+
+# TW
Selon le modèle de votre TW,
@@ -149,7 +158,6 @@ Exemple pour l'application "G1Voeu" https://ipfs.copylaradio.com/ipns/12D3KooWL2
Application "messaging"
http://tube.copylaradio.com:1234/?salt=toto&pepper=toto&messaging=on
-
Pour écrire une application on pourra utiliser "jsipfs"
https://js.ipfs.tech/
diff --git a/ajouter_media.sh b/ajouter_media.sh
index 41f23dde..77a72206 100755
--- a/ajouter_media.sh
+++ b/ajouter_media.sh
@@ -36,13 +36,12 @@ alias espeak='espeak 1>&2>/dev/null'
PLAYER=$(cat ~/.zen/game/players/.current/.player 2>/dev/null)
[[ ${PLAYER} == "" ]] \
-&& espeak "PLEASE RUN START AND CONNECT PLAYER" \
-&& OUTPUT=$(zenity --forms --width 480 --title="CONNEXION" --text="Vos Clés ?" --separator="~" --add-entry="Phrase 1" --add-entry="Phrase 2") \
+&& espeak "YOU MUST CONNECT A PLAYER" \
+&& OUTPUT=$(zenity --forms --width 480 --title="CONNEXION" --text="Ecrivez la formule magique" --separator="~" --add-entry="Phrase 1" --add-entry="Phrase 2") \
&& SALT=$(awk -F '~' '{print $1}' <<<$OUTPUT) \
&& PEPPER=$(awk -F '~' '{print $2}' <<<$OUTPUT) \
-&& PLAYER=$(zenity --entry --width 300 --title "PLAYER" --text "Indiquez votre email" --entry-text="")
-
-[[ ${PLAYER} == "" ]] && espeak "Who are you?" && exit 1
+&& PLAYER=$(zenity --entry --width 300 --title "PLAYER" --text "Indiquez votre email" --entry-text="user@domain.tld") \
+&& ${MY_PATH}/tools/VISA.new.sh "$SALT" "$PEPPER" "$PLAYER"
PSEUDO=$(cat ~/.zen/game/players/${PLAYER}/.pseudo 2>/dev/null)
espeak "Hello $PSEUDO"
@@ -119,6 +118,12 @@ if [[ $1 == "on" ]]; then
REP=$(${MY_PATH}/tools/cron_VRFY.sh ON) && zenity --warning --width 600 --text "$REP"
fi
+###
+# IS THERE ANY RUNNING IPFS ADD
+ISADDING=$(ps auxf --sort=+utime | grep -w 'ipfs add' | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1)
+ISPUBLISHING=$(ps auxf --sort=+utime | grep -w 'ipfs name publish' | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1)
+[[ $ISADDING || $ISPUBLISHING ]] \
+&& espeak "I P F S progressing. Please try again later" && exit 1
########################################################################
espeak "restart I P F S daemon"
diff --git a/tools/Connect_PLAYER_To_Gchange.sh b/tools/Connect_PLAYER_To_Gchange.sh
index 3f72c644..8f63e1e2 100755
--- a/tools/Connect_PLAYER_To_Gchange.sh
+++ b/tools/Connect_PLAYER_To_Gchange.sh
@@ -150,7 +150,7 @@ do
## AUCUN VISA ASTRONAUTE ENVOYER UN MESSAGE PAR GCHANGE
echo "AUCUN TW ACTIF. ENVOYONS LUI UN MESSAGE..."
- $MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey -n "https://data.gchange.fr" send -d "${liking_me}" -t "BRO !" -m ">>> (◕‿‿◕) <<< https://astroport.copylaradio.com >>> (◕‿‿◕) <<<"
+ $MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey -n "https://data.gchange.fr" send -d "${liking_me}" -t "HEY BRO !" -m ">>> (◕‿‿◕) <<< https://ipfs.copylaradio.com/ipns/$ASTRONAUTENS >>> (◕‿‿◕) <<< ACTIVE TON TW ICI : https://astroport.copylaradio.com"
else
diff --git a/tools/new_file_in_astroport.sh b/tools/new_file_in_astroport.sh
index e3bab4b5..6cc97734 100755
--- a/tools/new_file_in_astroport.sh
+++ b/tools/new_file_in_astroport.sh
@@ -258,9 +258,12 @@ then
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' )
+ YEAR=$(cat ~/Astroport/${TyPE}/${REFERENCE}/${MOATS}_ajouter_video.txt | cut -d ';' -f 3 )
## Adapt TMDB url for season & tag naming
- [[ $CAT == "Film" ]] && H1="" \
+ [[ $CAT == "Film" ]] \
+ && TITLE="$TITLE ($YEAR)"
+ && H1="" \
&& FILETAG="$CapitalGluedTitle"
[[ $CAT == "Serie" ]] && H1="" \
@@ -302,7 +305,7 @@ then
echo '[
{
"text": "'${TEXT}'",
- "title": "'${CapitalGluedTitle}'",
+ "title": "'${TITLE}'",
"season": "'${SAISON}'",
"created": "'${MOATS}'",
"resolution": "'${RES}'",