From 3055b232ee40a3c96c4648a6834288616f32118c Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Mon, 1 Feb 2021 03:39:46 +0100
Subject: [PATCH] optimized simple
 ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN creation

---
 ajouter_video.sh          | 10 ++--------
 zen/ipfs_SWARM_refresh.sh | 33 +++++++++++++++++----------------
 zen/mint_youtube.sh       | 17 ++++-------------
 3 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/ajouter_video.sh b/ajouter_video.sh
index aad1cf9..d548316 100755
--- a/ajouter_video.sh
+++ b/ajouter_video.sh
@@ -183,15 +183,9 @@ then
 		echo "$NEWSHARE already in ASTROPORT. DO NOTHING"
 	fi
 
-	echo "SYNCing with SWARM..."
-	~/.zen/astrXbian/zen/ipfs_SWARM_refresh.sh
-	echo "CREATE ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN ($TYPE) from ipfs_swarm INDEXES"
+	echo "CREATE ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN ($TYPE) from ~/.zen/ipfs*/xbian/${PREFIX}*"
 	echo "-----------------------------------------------------------------"
-	mkdir -p /tmp/xbian/
-	echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > /tmp/xbian/${PREFIX}ASTRXBIAN # CREATE INDEX HEADER
-	cat ~/.zen/ipfs_swarm/xbian/${PREFIX}* | grep -v -E 'CAT;TMDB' >> /tmp/xbian/${PREFIX}ASTRXBIAN # GET All lines without header
-	cat /tmp/xbian/${PREFIX}ASTRXBIAN | sort | uniq > /tmp/xbian/${PREFIX}ASTRXBIAN.uniq # REMOVE DUPLICATE
-	mv /tmp/xbian/${PREFIX}ASTRXBIAN.uniq ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN # Publish ASTROPORT/KODI INDEX
+	cat ~/.zen/ipfs*/xbian/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
 
 	echo "PUBLISH ~/.zen/ipfs to IPNS self for SWARM SHARING"
 	echo "-----------------------------------------------------------------"
diff --git a/zen/ipfs_SWARM_refresh.sh b/zen/ipfs_SWARM_refresh.sh
index 376cc03..fcc2de4 100755
--- a/zen/ipfs_SWARM_refresh.sh
+++ b/zen/ipfs_SWARM_refresh.sh
@@ -80,6 +80,23 @@ done
 	
 ########################################################################
 ########################################################################
+echo "RETRIEVING MY OWN DATA FROM IPNS TO ~/.zen/ipfs_swarm"
+ipfs get --output=/home/$YOU/.zen/ipfs_swarm/ /ipns/$IPFSNODEID
+
+########################################################################
+# REFRESH xbian Film Serie Anime ASTRXBIAN index
+########################################################################
+PREFIX="F"
+cat ~/.zen/ipfs*/xbian/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
+
+PREFIX="S"
+cat ~/.zen/ipfs*/xbian/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
+
+PREFIX="A"
+cat ~/.zen/ipfs*/xbian/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
+
+########################################################################
+
 ########################################################################
 echo "PUBLISHING ~/.zen/ipfs SELF /ipns/$IPFSNODEID"
 echo "$(date -u +%s%N | cut -b1-13)" > /home/$YOU/.zen/ipfs/_timestamp
@@ -87,20 +104,4 @@ MIPFS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
 echo $MIPFS > ~/.zen/ipfs/.${IPFSNODEID}/_chain
 NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS)
 
-echo "RETRIEVING MY OWN DATA FROM IPNS TO ~/.zen/ipfs_swarm"
-ipfs get --output=/home/$YOU/.zen/ipfs_swarm/ /ipns/$IPFSNODEID
-
-
-########################################################################
-# REFRESH xbian Film ASTRXBIAN index
-########################################################################
-PREFIX="F"
-mkdir -p /tmp/xbian/
-echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > /tmp/xbian/${PREFIX}ASTRXBIAN # CREATE INDEX HEADER
-cat ~/.zen/ipfs_swarm/xbian/${PREFIX}* | grep -v -E 'CAT;TMDB' >> /tmp/xbian/${PREFIX}ASTRXBIAN # GET All lines without header
-cat /tmp/xbian/${PREFIX}ASTRXBIAN | sort | uniq > /tmp/xbian/${PREFIX}ASTRXBIAN.uniq # REMOVE DUPLICATE
-mv /tmp/xbian/${PREFIX}ASTRXBIAN.uniq ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN # Publish ASTROPORT/KODI INDEX
-########################################################################
-
-
 exit 0
diff --git a/zen/mint_youtube.sh b/zen/mint_youtube.sh
index dccfd69..3e4a9d5 100755
--- a/zen/mint_youtube.sh
+++ b/zen/mint_youtube.sh
@@ -64,8 +64,9 @@ isLINKinMYINDEX=$(grep "$NEWSHARE" ~/.zen/ipfs/xbian/${PREFIX}${XZUID})
 
 # Is it a new file? Add it to INDEX
 if [[ ! $isFILEinINDEX && ! $isLINKinINDEX ]]; then
+	URLENCODE_FILE_NAME=$(echo ${file} | jq -Rr @uri)
 	echo "ipfs get -o ~/astroport/$TYPE/ \"/ipfs/$NEWSHARE/$file\"" >> ~/.zen/ipfs/xbian/_${XZUID} # "_ASTRXBIAN" is listing ipfs get commands
-	echo "film;$TMDB;$YEAR;$TITLE;$SAISON;;${XZUID};$RES;/ipfs/$NEWSHARE/$file" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
+	echo "film;$TMDB;$YEAR;$TITLE;$SAISON;;${XZUID};$RES;/ipfs/$NEWSHARE/$URLENCODE_FILE_NAME" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
 else
 	if [[ $isFILEinMYINDEX ]]; then
 		echo "$file already in index" ## File was updated => Change OLDLINK
@@ -80,19 +81,9 @@ fi
 cat ~/.zen/ipfs/xbian/_${XZUID} | sort | uniq > /tmp/xbian/_${XZUID}
 mv /tmp/xbian/_${XZUID} ~/.zen/ipfs/xbian/_${XZUID}
 
-### REFRESH ~/.zen/ipfs_swarm/
-echo "NOW SYNCing with my SWARM..."
+echo "CREATE ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN ($TYPE) from ~/.zen/ipfs*/xbian/${PREFIX}*"
 echo "-----------------------------------------------------------------"
-~/.zen/astrXbian/zen/ipfs_SWARM_refresh.sh
-
-echo "CREATE ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN ($TYPE) from ipfs_swarm found indexes"
-echo "-----------------------------------------------------------------"
-mkdir -p /tmp/xbian/
-echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > /tmp/xbian/${PREFIX}ASTRXBIAN # CREATE INDEX HEADER
-cat ~/.zen/ipfs_swarm/xbian/${PREFIX}* | grep -v -E 'CAT;TMDB' >> /tmp/xbian/${PREFIX}ASTRXBIAN # GET All lines (no header)
-cat /tmp/xbian/${PREFIX}ASTRXBIAN | sort | uniq > /tmp/xbian/${PREFIX}ASTRXBIAN.uniq # REMOVE DUPLICATE
-mv /tmp/xbian/${PREFIX}ASTRXBIAN.uniq ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN # Publish to localhost ASTROPORT relay
-
+cat ~/.zen/ipfs*/xbian/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
 
 ########################################################################
 echo "PUBLISH ~/.zen/ipfs to IPNS self for SWARM SHARING"