various optimisations

This commit is contained in:
fred 2021-09-13 18:10:35 +02:00
parent 0fe77cef96
commit e88f343e7b
4 changed files with 21 additions and 10 deletions

View File

@ -131,5 +131,8 @@ echo "SUB-SCRAPING lieu FROM /astroport/map/$lat.$lon/p4n/spot.json"
loop=$(($loop+1)); loop=$(($loop+1));
done 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 # ipfs cat /ipns/$IPFSNODEID/.$IPFSNODEID/astroport/map/$lat.$lon/p4n/spot.json | jq
exit 0 exit 0

View File

@ -195,7 +195,12 @@ fi
## SYNC SWARM EVERY 6h runtime ## 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 [[ $(($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 # 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 ## TODO ACTIVATE/DESACTIVATE LOG
######################################################################## ########################################################################
# ACTIVATE ~/astroport directory monitoring (xbian only) # ACTIVATE ~/astroport directory monitoring (xbian only)

View File

@ -32,17 +32,22 @@ IPFSNODEID=$(ipfs --timeout=20s id -f='<id>\n')
for g1id in $(ls ~/.zen/ipfs/.$IPFSNODEID/FRIENDS | shuf); for g1id in $(ls ~/.zen/ipfs/.$IPFSNODEID/FRIENDS | shuf);
do do
[[ "$g1id" == "index.html" ]] && continue [[ "$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 # 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/" #echo "REFRESHING Friend /ipns/$ipfsnodeid INTO ~/.zen/ipfs_swarm/"
ipfs --timeout=90s get --output=/home/$YOU/.zen/ipfs_swarm/ /ipns/$ipfsnodeid #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" #[[ -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" echo "This is the list of your friend $g1id friends liking you"
ls -d ~/.zen/ipfs_swarm/.$ipfsnodeid/FRIENDS/*/ | rev | cut -d '/' -f 2 | rev 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 done

View File

@ -338,8 +338,6 @@ echo "</main></body></html>" >> ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/index.html
## [[ $(which wp) ]] && ~/.zen/astrXbian/zen/wordpress_channel.sh ## [[ $(which wp) ]] && ~/.zen/astrXbian/zen/wordpress_channel.sh
## CLEAN RUN p4n.swarmscraper.sh ## CLEAN RUN p4n.swarmscraper.sh
killall p4n.swarmscraper.sh
killall chromium
~/.zen/astrXbian/actions/p4n.swarmscraper.sh ~/.zen/astrXbian/actions/p4n.swarmscraper.sh
# IPNS SELF PUBLISH = mise à jour balise Station # IPNS SELF PUBLISH = mise à jour balise Station