diff --git a/zen/ipns_TAG_refresh.sh b/zen/ipns_TAG_refresh.sh index 9a8ab14..c1ea753 100755 --- a/zen/ipns_TAG_refresh.sh +++ b/zen/ipns_TAG_refresh.sh @@ -63,22 +63,22 @@ count=0 [[ ! -d ~/.zen/ipfs/.${IPFSNODEID}/KEY/ ]] && exit 0 ## TAKE CARE OF MY KEY -for id in $(ls ~/.zen/ipfs/.${IPFSNODEID}/KEY/); # Alternative search +for mediakey in $(ls ~/.zen/ipfs/.${IPFSNODEID}/KEY/); # Alternative search do count=$((count+1)) && echo "$count) " - IPNSLINK=$(ipfs key list -l | grep ${id} | cut -d ' ' -f 1) - FILE_NAME=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${id}/${G1PUB}/.ipfs.filename) - TITLE=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${id}/${G1PUB}/.title) + IPNSLINK=$(ipfs key list -l | grep ${mediakey} | cut -d ' ' -f 1) + FILE_NAME=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/${G1PUB}/.ipfs.filename) + TITLE=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/${G1PUB}/.title) source=$(echo $id | cut -d '_' -f 1) - ANNONCE=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${id}/${G1PUB}/.gchange.ad) + ANNONCE=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/${G1PUB}/.gchange.ad) ## CRYPTO EXAMPLE, use natools to decrypt (could also verify signature) - [[ -f ~/.zen/ipfs/.${IPFSNODEID}/KEY/${id}/${G1PUB}/.ipfs.filelink.natools.encrypt ]] && $MY_PATH/tools/natools.py decrypt -f pubsec -k "$HOME/.zen/secret.dunikey" -i "$HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${id}/${G1PUB}/.ipfs.filelink.natools.encrypt" -o "/tmp/${id}_filelink.txt" - # file=$(cat /tmp/${id}_filelink.txt | rev | cut -d '/' -f 1 | rev) + [[ -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" + # file=$(cat /tmp/${mediakey}_filelink.txt | rev | cut -d '/' -f 1 | rev) - TUBELINK="https://tube.copylaradio.com$(cat /tmp/${id}_filelink.txt)" - LOCALTUBELINK="http://127.0.0.1:8181$(cat /tmp/${id}_filelink.txt)" + TUBELINK="https://tube.copylaradio.com$(cat /tmp/${mediakey}_filelink.txt)" + LOCALTUBELINK="http://127.0.0.1:8181$(cat /tmp/${mediakey}_filelink.txt)" MIMETYPE="video/${LOCALTUBELINK##*.}" [[ "$MIMETYPE" == "video/avi" ]] && MIMETYPE="video/x-msvideo" @@ -106,10 +106,10 @@ do