diff --git a/actions/p4n.swarmscraper.sh b/actions/p4n.swarmscraper.sh index 62311db..8940095 100755 --- a/actions/p4n.swarmscraper.sh +++ b/actions/p4n.swarmscraper.sh @@ -131,5 +131,8 @@ echo "SUB-SCRAPING lieu FROM /astroport/map/$lat.$lon/p4n/spot.json" loop=$(($loop+1)); done +## CHECK SWARM GEODATA MAP +# ls -d ~/.zen/ipfs_swarm/.*/astroport/map/*/ | rev | cut -d '/' -f 2 | rev | sort +## NB OF lieu: ls -d ~/.zen/ipfs_swarm/.*/astroport/map/p4n/lieu/*/ | rev | cut -d '/' -f 2 | rev | sort | wc # ipfs cat /ipns/$IPFSNODEID/.$IPFSNODEID/astroport/map/$lat.$lon/p4n/spot.json | jq exit 0 diff --git a/cron_MINUTE.sh b/cron_MINUTE.sh index 61aba9f..09d75cb 100755 --- a/cron_MINUTE.sh +++ b/cron_MINUTE.sh @@ -195,7 +195,12 @@ fi ## SYNC SWARM EVERY 6h runtime [[ $(($runtime % 370)) == 0 || "$runtime" == "10" ]] && $MY_PATH/zen/gchange_IPFS_swarm.sh 2>&1 > /home/${YOU}/.zen/ipfs/.${IPFSNODEID}/.log.gchange_IPFS_swarm.txt # QUICK SYNC SWARM EVERY 21 minutes -[[ $(($runtime % 21)) == 0 ]] && $MY_PATH/zen/ipfs_SWARM_refresh.sh 2>&1 > /home/${YOU}/.zen/ipfs/.${IPFSNODEID}/.log.ipfs_SWARM_refresh.txt +## CLEAN OLD SESSION +if [[ $(($runtime % 21)) == 0 ]]; then + kill -9 $(ps auxf --sort=+utime | grep -w p4n.swarmscraper.sh | grep -v -E 'color=auto|grep' | tail -n 1 | awk '{print $2}') + killall chromium + $MY_PATH/zen/ipfs_SWARM_refresh.sh 2>&1 > /home/${YOU}/.zen/ipfs/.${IPFSNODEID}/.log.ipfs_SWARM_refresh.txt +fi ## TODO ACTIVATE/DESACTIVATE LOG ######################################################################## # ACTIVATE ~/astroport directory monitoring (xbian only) diff --git a/zen/ipfs_FRIENDS_refresh.sh b/zen/ipfs_FRIENDS_refresh.sh index 85b68d6..2a96ec5 100755 --- a/zen/ipfs_FRIENDS_refresh.sh +++ b/zen/ipfs_FRIENDS_refresh.sh @@ -32,17 +32,22 @@ IPFSNODEID=$(ipfs --timeout=20s id -f='\n') for g1id in $(ls ~/.zen/ipfs/.$IPFSNODEID/FRIENDS | shuf); do [[ "$g1id" == "index.html" ]] && continue - ipfsnodeid=$(~/.zen/astrXbian/zen/tools/g1_to_ipfs.py $g1id) + [ -d ~/.zen/ipfs/.$IPFSNODEID/FRIENDS/$g1id ] && ipfsnodeid=$(~/.zen/astrXbian/zen/tools/g1_to_ipfs.py $g1id) || continue + echo "==============================================" + echo "$ipfsnodeid" + echo "==============================================" # Try to ping my friend OR continue - ipfs --timeout=10s ping -n 3 /p2p/$ipfsnodeid || continue + #ipfs --timeout=10s ping -n 3 /p2p/$ipfsnodeid || continue - echo "REFRESHING Friend /ipns/$ipfsnodeid INTO ~/.zen/ipfs_swarm/" - ipfs --timeout=90s get --output=/home/$YOU/.zen/ipfs_swarm/ /ipns/$ipfsnodeid - [[ -f /home/$YOU/.zen/ipfs_swarm/.$ipfsnodeid/_xbian.zuid ]] && cat /home/$YOU/.zen/ipfs_swarm/.$ipfsnodeid/_xbian.zuid || echo "NO ZUID" + #echo "REFRESHING Friend /ipns/$ipfsnodeid INTO ~/.zen/ipfs_swarm/" + #ipfs --timeout=90s get --output=/home/$YOU/.zen/ipfs_swarm/ /ipns/$ipfsnodeid + #[[ -f /home/$YOU/.zen/ipfs_swarm/.$ipfsnodeid/_xbian.zuid ]] && cat /home/$YOU/.zen/ipfs_swarm/.$ipfsnodeid/_xbian.zuid || echo "NO ZUID" - echo "This is the list of your friend friends" - ls -d ~/.zen/ipfs_swarm/.$ipfsnodeid/FRIENDS/*/ | rev | cut -d '/' -f 2 | rev + echo "This is the list of your friend $g1id friends liking you" + ls -d ~/.zen/ipfs_swarm/.$ipfsnodeid/FRIENDS/*/ 2>/dev/null | rev | cut -d '/' -f 2 | rev + echo "LIKING YOU?" + ls -d ~/.zen/ipfs_swarm/.$ipfsnodeid/FRIENDS/$G1PUB/ 2>/dev/null | rev | cut -d '/' -f 2 | rev done diff --git a/zen/ipfs_SWARM_refresh.sh b/zen/ipfs_SWARM_refresh.sh index 8c1c1e9..b3b9562 100755 --- a/zen/ipfs_SWARM_refresh.sh +++ b/zen/ipfs_SWARM_refresh.sh @@ -338,8 +338,6 @@ echo "" >> ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/index.html ## [[ $(which wp) ]] && ~/.zen/astrXbian/zen/wordpress_channel.sh ## CLEAN RUN p4n.swarmscraper.sh -killall p4n.swarmscraper.sh -killall chromium ~/.zen/astrXbian/actions/p4n.swarmscraper.sh # IPNS SELF PUBLISH = mise à jour balise Station