From 8ba4d2df4d47c7cc0ebd9f73159ac8e464ae72e0 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Sun, 19 Sep 2021 18:57:38 +0200
Subject: [PATCH] ## DO NOT REPUBLISH empty index.html

---
 zen/ipns_TAG_refresh.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/zen/ipns_TAG_refresh.sh b/zen/ipns_TAG_refresh.sh
index fac824f..c2fb7a9 100755
--- a/zen/ipns_TAG_refresh.sh
+++ b/zen/ipns_TAG_refresh.sh
@@ -72,12 +72,14 @@ do
 
     source=$(echo $mediakey | cut -d '_' -f 1)
 
-    ANNONCE=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/${G1PUB}/.gchange.ad)
+    ANNONCE=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/${G1PUB}/.gchange.ad 2>/dev/null)
 
     ## Use natools to decrypt  "/tmp/${mediakey}_filelink.txt
     [[ -f ~/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/${G1PUB}/.ipfs.filelink.natools.encrypt ]] && $MY_PATH/tools/natools.py decrypt -f pubsec -k "$HOME/.zen/secret.dunikey" -i "$HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/${G1PUB}/.ipfs.filelink.natools.encrypt" -o "/tmp/${mediakey}_filelink.txt"
     URLENCODE_FILE_NAME=$(cat /tmp/${mediakey}_filelink.txt | rev | cut -d '/' -f 1 | rev | jq -Rr @uri)
-    IPFSREPFILEID=$(cat /tmp/${mediakey}_filelink.txt | rev | cut -d '/' -f 2- | rev)
+    IPFSREPFILEID=$(cat /tmp/${mediakey}_filelink.txt | rev | cut -d '/' -f 2- | rev | cut -d '/' -f 3)
+
+    echo "IPFS MEDIA link :  /ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME"
 
     ## TREAT OLD DATA from new_file_in_astroport.sh (LATER can be removed)
     if [[ ! -f $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/content.json && -f ~/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/${G1PUB}/video.json ]]; then
@@ -87,6 +89,7 @@ do
         PubFromDunikey=$(cat /tmp/${mediakey}.dunikey | grep "pub" | cut -d ' ' -f2)
         echo "$PubFromDunikey" > $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/MEDIAPUBKEY
     fi
+
     MEDIAPUBKEY=$(cat $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/MEDIAPUBKEY)
     echo "MEDIA G1 WALLET = $MEDIAPUBKEY"
     BALANCE=$(~/.zen/astrXbian/zen/jaklis/jaklis.py balance -p ${MEDIAPUBKEY}) && [[ $BALANCE == null || "$BALANCE" == "" ]] && BALANCE=0
@@ -98,6 +101,7 @@ do
     ### IPNS LINK CAN EVOLVE (REFRESH EVERY 12 H TO MAINTAIN ALIVE IN THE SWARM) # TODO : Use templating
     ### This index.html is ipns link root, 1st welcome page for MEDIAKEY -> *** Redirect to CONTRACTS processing HERE ***
 
+    echo "=======> Mediakey Welcome index.html "
     cat /home/$YOU/.zen/astrXbian/www/boris/youtube_watch_step2.html \
         | sed "s/\${IPNSLINK}/$IPNSLINK/g" \
         | sed "s/\${XZUID}/$XZUID/g" \
@@ -126,6 +130,7 @@ do
     [[ "$FILETYPE" == "mkv" ]] && MIMETYPE="video/x-matroska"
     [[ "$FILETYPE" == "mp3" ]] && MIMETYPE="audio/mpeg" && HTMLTAG="audio"
 
+    echo "=======> Mediakey Contract index.html "
     cat /home/$YOU/.zen/astrXbian/www/boris/youtube_watch_step3.html \
     | sed "s/\${TITLE}/$TITLE/g" \
     | sed "s/\${XZUID}/$XZUID/g" \
@@ -203,6 +208,7 @@ for ipnslink in $(ls ~/.zen/PIN/*/IPNSLINK  2>/dev/null | shuf ); do
     echo "${mediakey} GET IPNS"
     ipfs get -o /tmp/${mediakey} /ipns/$ipnsid
     [ $? -ne 0 ] && continue
+    [ ! -s /tmp/${mediakey}/index.html ] && continue ## DO NOT REPUBLISH empty index.html
 
     ## REFRESH MORE THAN 6 HOURS TIMESTAMP KEY
     TIMESTAMP=$(cat /tmp/${mediakey}/.timestamp  2>/dev/null) # LAST REFRESH