From b1e04d5a44e727581345eda7aac0112bf0941123 Mon Sep 17 00:00:00 2001 From: qo-op Date: Mon, 12 Jul 2021 03:46:39 +0200 Subject: [PATCH] Trying new way of MEDIAKEY bootstrap IPNS echo. --- zen/ipns_TAG_refresh.sh | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/zen/ipns_TAG_refresh.sh b/zen/ipns_TAG_refresh.sh index 982e52b..c00b9be 100755 --- a/zen/ipns_TAG_refresh.sh +++ b/zen/ipns_TAG_refresh.sh @@ -28,7 +28,7 @@ G1PUB=$(cat ~/.zen/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) ######################################################################## echo "## FRIENDS IPFS PINGing" -for g1pub in $(ls -t ~/.zen/ipfs/.$IPFSNODEID/FRIENDS/); do [[ $g1pub ]] && ipfs ping --timeout=7s -n 3 /ipfs/$(~/.zen/astrXbian/zen/tools/g1_to_ipfs.py $g1pub 2>/dev/null) 2>/dev/null; done +for g1pub in $(ls -t ~/.zen/ipfs/.$IPFSNODEID/FRIENDS/); do [[ $g1pub ]] && ipfs ping --timeout=3s -n 3 /ipfs/$(~/.zen/astrXbian/zen/tools/g1_to_ipfs.py $g1pub 2>/dev/null) 2>/dev/null; done ######################################################################## # ACTIVATE TO CONTROL SWARM STATION SAME CODE VERSION @@ -87,9 +87,8 @@ do echo "$PubFromDunikey" > $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/MEDIAPUBKEY fi MEDIAPUBKEY=$(cat $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/MEDIAPUBKEY) - - BALANCE=$(~/.zen/astrXbian/zen/jaklis/jaklis.py balance -p ${MEDIAPUBKEY}) - [[ "$BALANCE" == "null" || "$BALANCE" == "" ]] && BALANCE = 0 + echo "MEDIA G1 WALLET = $MEDIAPUBKEY" + BALANCE=$(~/.zen/astrXbian/zen/jaklis/jaklis.py balance -p ${MEDIAPUBKEY}) && [[ $BALANCE == null || "$BALANCE" == "" ]] && BALANCE=0 ZENBALANCE=$(echo "100 * $BALANCE" | bc -l | cut -d '.' -f 1) TUBELINK="https://tube.copylaradio.com$(cat /tmp/${mediakey}_filelink.txt)" @@ -148,7 +147,7 @@ do MIMETYPE="video/$FILETYPE" && HTMLTAG="video" [[ "$FILETYPE" == "avi" ]] && MIMETYPE="video/x-msvideo" [[ "$FILETYPE" == "mkv" ]] && MIMETYPE="video/x-matroska" - [[ "$FILETYPE" == "mp3" ]] && MIMETYPE="audio/mpeg" ]] && HTMLTAG="audio" + [[ "$FILETYPE" == "mp3" ]] && MIMETYPE="audio/mpeg" && HTMLTAG="audio" echo " @@ -225,7 +224,7 @@ do fi echo "${mediakey} NAME PUBLISHING " # KEY ZenTag IPNS name publish - J=$(ipfs name publish -k ${mediakey} --quieter /ipfs/${I}) + J=$(ipfs name publish -k ${mediakey} /ipfs/${I}) echo "$id REFRESHED https://tube.copylaradio.com/ipns/$J" ######################################################################## @@ -247,25 +246,21 @@ for ipnslink in $(ls ~/.zen/PIN/*/IPNSLINK); do [[ ! $(ipfs key list | grep ${mediakey}) ]] && echo "ERROR MISSING MEDIAKEY" && continue ## GET ACTUAL IPNS .chain VALUE - actual=$(ipfs --timeout 12s cat /ipns/$ipnsid/.chain) + mkdir -p /tmp/${mediakey} + echo "${mediakey} GET IPNS" + ipfs --timeout 20s get -o /tmp/${mediakey} /ipns/$ipnsid + echo "ADD TO IPFS" + NEWIPFS=$(ipfs add -rHq /tmp/${mediakey}/ | tail -n 1) + ## PUBLISH IT - if [[ $actual != "" ]]; then - echo "${mediakey} : STATION DHT ONLINE" - ipfs --timeout 20s name publish -k ${mediakey} --quieter /ipfs/${actual} - echo "${actual}" > ~/.zen/PIN/$ipfsid/ACTUAL - else - echo "${mediakey} : STATION OFFLINE" - [[ -f ~/.zen/PIN/$ipfsid/ACTUAL ]] && actual=$(cat ~/.zen/PIN/$ipfsid/ACTUAL) || continue - ipfs --timeout 20s name publish -k ${mediakey} --quieter /ipfs/${actual} - fi - echo "PUBLISH https://tube.copylaradio.com/ipns/$ipnsid TO /ipfs/$actual" - actual="" + ipfs --timeout 60s name publish -k ${mediakey} --quieter /ipfs/$NEWIPFS + echo "ECHO PUBLISHING https://tube.copylaradio.com/ipns/$ipnsid TO /ipfs/$NEWIPFS" done ######################################################################## ######################################################################## ######################################################################## - +## LOVE ### # ACTIVATION MONNAIES LIBRES EQUIBIBREES # En relatif M/N :