From 918e55396a947acc761579ccffed4f84e5939851 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Thu, 18 Feb 2021 10:54:12 +0100
Subject: [PATCH] ipns key = TMDB_$CAT_$TMDB (SOURCE_ID)

---
 zen/new_file_in_astroport.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh
index 283ea9d..8c8e5ec 100755
--- a/zen/new_file_in_astroport.sh
+++ b/zen/new_file_in_astroport.sh
@@ -60,23 +60,23 @@ echo "New $TYPE INDEX ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX
 [[ ! -d ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/ ]] && mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/
 
 ########################################################################
-## CREATE NEW ipns KEY : TMDB_$CAT_$TMDB
+## CREATE NEW ipns KEY : TMDB_$TMDB
 ########################################################################
 ########################################################################
-[[ ! -d  ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB} ]] && mkdir -p ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB} && KEY=$(ipfs key gen "TMDB_$CAT_$TMDB") && KEYFILE=$(ls -t ~/.ipfs/keystore/ | head -n 1)
+[[ ! -d  ~/.zen/KEY/TMDB_$TMDB/${G1PUB} ]] && mkdir -p ~/.zen/KEY/TMDB_$TMDB/${G1PUB} && KEY=$(ipfs key gen "TMDB_$TMDB") && KEYFILE=$(ls -t ~/.ipfs/keystore/ | head -n 1)
 ## INIT ipns 
 if [[ $KEY ]]; then
-	echo "$KEYFILE" > ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB}/.ipns.key.keystore_filename
-	echo "$KEY" > ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB}/.ipns.link
-	touch ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB}/.zen
-	mv ~/astroport/${CAT}/${TMDB}/ajouter_video.txt ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB}/ 
-#	echo "<meta http-equiv=\"Refresh\" content=\"0;URL=http://localhost:8181/ipns/$KEY/TMDB_$CAT_$TMDB/${G1PUB}/\">" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/TMDB_$CAT_$TMDB/ipns.html
-#	$MY_PATH/jaklis/lib/natools.py encrypt -k $G1PUB -i ~/.ipfs/keystore/$KEYFILE -o ~/.zen/ipfs/.${IPFSNODEID}/KEY/TMDB_$CAT_$TMDB/.ipns.key.encrypt.natools
+	echo "$KEYFILE" > ~/.zen/KEY/TMDB_$TMDB/${G1PUB}/.ipns.key.keystore_filename
+	echo "$KEY" > ~/.zen/KEY/TMDB_$TMDB/${G1PUB}/.ipns.link
+	touch ~/.zen/KEY/TMDB_$TMDB/${G1PUB}/.zen
+	mv ~/astroport/${CAT}/${TMDB}/ajouter_video.txt ~/.zen/KEY/TMDB_$TMDB/${G1PUB}/ 
+#	echo "<meta http-equiv=\"Refresh\" content=\"0;URL=http://localhost:8181/ipns/$KEY/TMDB_$TMDB/${G1PUB}/\">" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/TMDB_$TMDB/ipns.html
+#	$MY_PATH/jaklis/lib/natools.py encrypt -k $G1PUB -i ~/.ipfs/keystore/$KEYFILE -o ~/.zen/ipfs/.${IPFSNODEID}/KEY/TMDB_$TMDB/.ipns.key.encrypt.natools
 fi
 # IPNS index.html Redirect to ipfs streaming link (could be contract or anything !!)
-echo "<meta http-equiv=\"Refresh\" content=\"0;URL=http://localhost:8181/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME\">" > ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB}/index.html
-NEWIPFS=$(ipfs add -rHq ~/.zen/KEY/TMDB_$CAT_$TMDB | tail -n 1 )
-ipfs name publish --key="TMDB_$CAT_$TMDB" $NEWIPFS
+echo "<meta http-equiv=\"Refresh\" content=\"0;URL=http://localhost:8181/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME\">" > ~/.zen/KEY/TMDB_$TMDB/${G1PUB}/index.html
+NEWIPFS=$(ipfs add -rHq ~/.zen/KEY/TMDB_$TMDB | tail -n 1 )
+ipfs name publish --key="TMDB_$TMDB" $NEWIPFS
 ########################################################################
 
 ########################################################################
@@ -100,7 +100,7 @@ if [[ ! $isFILEinINDEX && ! $isLINKinINDEX ]]; then
 	touch ~/.zen/ipfs/.${IPFSNODEID}/PIN/${IPFSREPFILEID}/$G1PUB
 	# SIMILAR with "ipfs ls /ipns/${IPFSNODEID}/.${IPFSNODEID}/PIN/ (...)"
 	# TODO: switch case $PREFIX
-	[[ -f ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB}/ajouter_video.txt ]] && line=$(cat ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB}/ajouter_video.txt | sed "s/_IPFSREPFILEID_/$IPFSREPFILEID/g") || line="$CAT;$TMDB;$YEAR;$TITLE;$SAISON;;${XZUID};$RES;/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME"
+	[[ -f ~/.zen/KEY/TMDB_$TMDB/${G1PUB}/ajouter_video.txt ]] && line=$(cat ~/.zen/KEY/TMDB_$TMDB/${G1PUB}/ajouter_video.txt | sed "s/_IPFSREPFILEID_/$IPFSREPFILEID/g") || line="$CAT;$TMDB;$YEAR;$TITLE;$SAISON;;${XZUID};$RES;/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME"
 	echo "$line" >> ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
 else
 	if [[ $isFILEinMYINDEX ]]; then