diff --git a/zen/ipns_TAG_refresh.sh b/zen/ipns_TAG_refresh.sh index 33ec87b..fac824f 100755 --- a/zen/ipns_TAG_refresh.sh +++ b/zen/ipns_TAG_refresh.sh @@ -52,7 +52,7 @@ count=0 # [[ ! -d ~/.zen/ipfs/.${IPFSNODEID}/KEY/ ]] && exit 0 ## TAKE CARE OF MY KEY -for mediakey in $(ls ~/.zen/ipfs/.${IPFSNODEID}/KEY/ | shuf); # Alternative search +for mediakey in $(ls ~/.zen/ipfs/.${IPFSNODEID}/KEY/ 2>/dev/null | shuf ); # Alternative search do [[ "${mediakey}" == "" ]] && continue ## prevent empty mediakey # [[ ! $(echo "${mediakey}" | grep "TMDB_") ]] && continue ## REFRESH ONLY TMDB (level 1), youtube is level 0 @@ -76,7 +76,8 @@ do ## 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" - # file=$(cat /tmp/${mediakey}_filelink.txt | rev | cut -d '/' -f 1 | rev) + 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) ## 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 @@ -188,7 +189,7 @@ done ## Then refresh MEDIAKEY IPNS/IPFS RELATION ## CORRECT ISSUE : https://git.p2p.legal/axiom-team/astrXbian/issues/25 ######################################################################## -for ipnslink in $(ls ~/.zen/PIN/*/IPNSLINK | shuf); do +for ipnslink in $(ls ~/.zen/PIN/*/IPNSLINK 2>/dev/null | shuf ); do ipnsid=$(cat $ipnslink) ipfsid=$(echo $ipnslink | cut -d '/' -f 6) mediakey=$(cat ~/.zen/PIN/${ipfsid}/MEDIAKEY) @@ -204,8 +205,8 @@ for ipnslink in $(ls ~/.zen/PIN/*/IPNSLINK | shuf); do [ $? -ne 0 ] && continue ## REFRESH MORE THAN 6 HOURS TIMESTAMP KEY - TIMESTAMP=$(cat /tmp/${mediakey}/.timestamp) # LAST REFRESH - [[ ! $TIMESTAMP ]] && TIMESTAMP=$(cat /tmp/${mediakey}/*/.timestamp | tail -n 1) # INITIAL TIMESTAMP + TIMESTAMP=$(cat /tmp/${mediakey}/.timestamp 2>/dev/null) # LAST REFRESH + [[ ! $TIMESTAMP ]] && TIMESTAMP=$(cat /tmp/${mediakey}/*/.timestamp 2>/dev/null | tail -n 1 ) # INITIAL TIMESTAMP timestamp=$(date -u +%s%N | cut -b1-13) STAMPDIFF=$((timestamp - TIMESTAMP)) echo "PIN WAS LAST UPDATED $STAMPDIFF milliseconds AGO"