From bdfa55ad47a8a075cf0618a7ad8a2f2f0a378f32 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Sun, 10 Jan 2021 17:58:41 +0100
Subject: [PATCH] Using ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN for
 ASTROPORT Vstream source

---
 .../resources/sites/astroport.py                   |  4 +--
 cron_MINUTE.sh                                     |  2 +-
 zen/mint_youtube.sh                                | 31 +++++++++++-----------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/.install/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py b/.install/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py
index f11f029..976b3f2 100644
--- a/.install/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py
+++ b/.install/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py
@@ -181,7 +181,7 @@ def load():
 
     # Menu pour ajouter un lien
     oOutputParameterHandler = cOutputParameterHandler()
-    oGui.addDir(SITE_IDENTIFIER, 'addPasteName', '[COLOR coral]Ajouter un dossier PasteBin[/COLOR]', 'listes.png', oOutputParameterHandler)
+    oGui.addDir(SITE_IDENTIFIER, 'addPasteName', '[COLOR coral]Ajouter un dossier[/COLOR]', 'listes.png', oOutputParameterHandler)
 
 
     oGui.setEndOfDirectory()
@@ -223,7 +223,7 @@ def showMenu():
                 oOutputParameterHandler.addParameter('sMedia', 'anime')
                 oGui.addDir(SITE_IDENTIFIER, 'showMenu', 'Animes', 'animes.png', oOutputParameterHandler)
         
-        oGui.addDir(SITE_IDENTIFIER, 'addPasteID', '[COLOR coral]Ajouter un lien PasteBin[/COLOR]', 'listes.png', oOutputParameterHandler)
+        oGui.addDir(SITE_IDENTIFIER, 'addPasteID', '[COLOR coral]Ajouter un lien ASTRXBIAN[/COLOR]', 'listes.png', oOutputParameterHandler)
 
     elif 'film' in sMedia:
         contenu.discard('containSeries')
diff --git a/cron_MINUTE.sh b/cron_MINUTE.sh
index 67fd28e..4f93652 100755
--- a/cron_MINUTE.sh
+++ b/cron_MINUTE.sh
@@ -37,7 +37,7 @@ export YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep'
 ### MODIFY WITH GREAT CARE!!! MUST BE BUG FREE !!!!!
 ### EVERY STATION RUN THIS SCRIPT EVERY MINUTE.
 export isKodiRunning=$(ps auxf --sort=+utime | grep -w kodi | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d ' ' -f 1)
-isinotifywaitRunning=$(ps auxf --sort=+utime | grep -w inotifywait | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d ' ' -f 1)
+export isinotifywaitRunning=$(ps auxf --sort=+utime | grep -w inotifywait | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d ' ' -f 1)
 
 # ? isNextcloudRunning=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d ' ' -f 1)
 ### DETECT FLAVOURS (TODO: Publish and share into ipfs/.12D3KooW***/ )
diff --git a/zen/mint_youtube.sh b/zen/mint_youtube.sh
index 11fadfb..8284fae 100755
--- a/zen/mint_youtube.sh
+++ b/zen/mint_youtube.sh
@@ -79,6 +79,22 @@ else
 	[[ $isLINKinINDEX ]] && echo "$NEWSHARE already in index. DO NOTHING" ## should not happen
 fi
 
+### REFRESH ~/.zen/ipfs_swarm/
+echo "NOW SYNCing with my SWARM..."
+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 | uniq > /tmp/xbian/${PREFIX}ASTRXBIAN.uniq # REMOVE DUPLICATE
+mv /tmp/xbian/${PREFIX}ASTRXBIAN.uniq ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN # Publish to localhost ASTROPORT relay
+
+## REMOVE DUPLICATE FROM ipfs get commands
+cat ~/.zen/ipfs/xbian/_${XZUID} | uniq > /tmp/xbian/_${XZUID}
+mv /tmp/xbian/_${XZUID} ~/.zen/ipfs/xbian/_${XZUID}
 
 ########################################################################
 echo "PUBLISH ~/.zen/ipfs to IPNS self for SWARM SHARING"
@@ -87,20 +103,5 @@ MIPFS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
 echo $MIPFS > ~/.zen/ipfs/.${IPFSNODEID}/_chain ## THIS SIMPLE LINE IS BLOCKCHAIN POWERING ANY DATA PUBLISHED TO IPFS !!!
 NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS)
 
-echo "NOW SYNCing with my SWARM..."
-echo "-----------------------------------------------------------------"
-~/.zen/astrXbian/zen/ipfs_SWARM_refresh.sh
-
-echo "CREATE my local ${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
-cat /tmp/xbian/${PREFIX}ASTRXBIAN | uniq > /tmp/xbian/${PREFIX}ASTRXBIAN.uniq # REMOVE DUPLICATE
-mv /tmp/xbian/${PREFIX}ASTRXBIAN.uniq /var/www/astrxbian/${PREFIX}ASTRXBIAN # Publish to localhost ASTROPORT relay
-
-cat ~/.zen/ipfs/xbian/_${XZUID} | uniq > /tmp/xbian/_${XZUID}
-mv /tmp/xbian/_${XZUID} ~/.zen/ipfs/xbian/_${XZUID}
-
 echo "NEW $TYPE ($file) ADDED."
 echo "INDEX UPDATED : http://127.0.0.1:8181/${PREFIX}ASTRXBIAN"