From bb47aff2ae628b8adb2e5e408c29ad317ddcff1a Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Thu, 25 Feb 2021 00:16:39 +0100
Subject: [PATCH] correct

---
 ajouter_video.sh             |  9 +++++----
 zen/new_file_in_astroport.sh | 14 ++++++++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ajouter_video.sh b/ajouter_video.sh
index bb182d1..3162da1 100755
--- a/ajouter_video.sh
+++ b/ajouter_video.sh
@@ -108,6 +108,7 @@ fi
 # Get filename, extract ID, make destination dir and move copy.
 YFILE=$(ls -t ${YTEMP} | head -n 1)
 FILE_NAME="$(basename "${YFILE}")"
+FILE_EXT="${FILE_NAME##*.}"
 
 YID=$(echo "${FILE_NAME}" | cut -d "_" -f 1)
 YNAME=$(echo "${FILE_NAME}" | cut -d "_" -f 2)
@@ -223,8 +224,8 @@ zenity --question --width ${large} --title "CONTROLE DES INFORMATIONS - EMBARQUE
 
 ### OK MOVING FILE TO ASTROPORT ####
 mkdir -p ~/astroport/${CAT}/${TMDB}/
-mv "${FILE_PATH}/${FILE_NAME}" ~/astroport/${CAT}/${TMDB}/ && zenity --warning --width ${large} --text "Votre fichier est prêt ~/astroport/${CAT}/${TMDB}/${FILE_NAME} à embarquer. Cliquez sur OK puis patientez quelques minutes..."
-
+mv "${FILE_PATH}/${FILE_NAME}" "$HOME/astroport/${CAT}/${TMDB}/${TITLE}.${FILE_EXT}" && zenity --warning --width ${large} --text "Votre fichier ~/astroport/${CAT}/${TMDB}/${TITLE}.${FILE_EXT} est prêt à embarquer. Cliquez sur OK puis patientez quelques minutes..."
+FILENAME=${TITLE}.${FILE_EXT}
 	;;
 esac
 
@@ -239,5 +240,5 @@ echo "${CAT};$TMDB;$YEAR;$TITLE;$SAISON;${GENRES};${GROUPES};$RES;/ipfs/_IPFSREP
 ~/.zen/astrXbian/zen/new_file_in_astroport.sh "$HOME/astroport/${CAT}/${TMDB}/" "${FILE_NAME}"
 ########################################################################
 ########################################################################
-
-zenity --warning --width 300 --text "OK! Votre source vidéo $cat a été transférée dans Astroport"
+[ $? == 0 ] && zenity --warning --width 300 --text "OK! Votre source vidéo $cat a été transférée dans Astroport" \
+|| zenity --warning --width 300 --text "Désolé une erreur est survenue..."
diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh
index 3f24521..18afb68 100755
--- a/zen/new_file_in_astroport.sh
+++ b/zen/new_file_in_astroport.sh
@@ -94,12 +94,18 @@ fi
 echo "<meta http-equiv=\"Refresh\" content=\"0;URL=http://localhost:8181/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME\">" > ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/index.html
 echo "<h1>REJOIGNEZ <a href='https://astroport.com'>ASTROPORT</a>/KODI</h1>" > ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/index.html
 NEWIPFS=$(ipfs add -rHq ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/ | tail -n 1 )
-ipfs name publish --key="${INDEXPREFIX}${REFERENCE}" $NEWIPFS
+IPNS=$(ipfs name publish --quieter --key="${INDEXPREFIX}${REFERENCE}" $NEWIPFS)
 ########################################################################
 
 ########################################################################
+# PUBLISH GCHANGE AD
 ########################################################################
+GOFFER=$(~/.zen/astrXbian/zen/jaklis/jaklis.py setoffer -t "#astroport ${file}" -d "($G1PUB) http://127.0.0.1:8181/ipns/$IPNS/" -p ~/.zen/astrXbian/disk.png)
+echo $GOFFER > ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.gchange.ad
+NEWIPFS=$(ipfs add -rHq ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/ | tail -n 1 )
+IPNS=$(ipfs name publish --quieter --key="${INDEXPREFIX}${REFERENCE}" $NEWIPFS)
 
+########################################################################
 # FIRST ${PREFIX}ASTRXBIAN header
 [[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN ]] && echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
 
@@ -124,12 +130,12 @@ else
 		OLDLINK=$(echo $isFILEinMYINDEX | cut -d ";" -f 9  | cut -d "/" -f 3 | tail -n 1) # GRAB old ipfs id
 		sed -i "s/$OLDLINK/$IPFSREPFILEID/g" ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
 	fi
-	[[ $isLINKinINDEX ]] && echo "$IPFSREPFILEID already in INDEX $isLINKinINDEX DO NOTHING" && exit 1
+	[[ $isLINKinINDEX ]] && echo "$IPFSREPFILEID already in INDEX $isLINKinINDEX DO NOTHING"
 fi
 
 echo "~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN"
 echo "-----------------------------------------------------------------"
-cat ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN | cat ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
+cat ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
 echo "--------------- KODI INDEX UPDATED ----------------------"
 
 # CLEAN all ipns keys except self
@@ -144,4 +150,4 @@ echo "--------------- KODI INDEX UPDATED ----------------------"
 echo "NEW $TYPE ($file) ADDED."
 echo "INDEX UPDATED : http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/${PREFIX}ASTRXBIAN"
 echo "VIDEO IPNS LINK : http://localhost:8181/ipns/$KEY/$G1PUB/"
-
+exit 0