diff --git a/cron_MINUTE.sh b/cron_MINUTE.sh index 752beb7..a8f801c 100755 --- a/cron_MINUTE.sh +++ b/cron_MINUTE.sh @@ -77,7 +77,8 @@ echo $timebar if [[ $(($minute % 15)) == 0 ]]; then ########## DESYNCH SWARM NODE REQUESTS ################# sleep $((1 + RANDOM % 120)) - git reset --hard && git pull + # git reset --hard + git pull # if [[ $(diff ~/.zen/astrXbian/.install/.kodi/userdata/addon_data/plugin.video.vstream/settings.xml ~/.kodi/userdata/addon_data/plugin.video.vstream/settings.xml) ]]; then # cp ~/.zen/astrXbian/.install/.kodi/userdata/addon_data/plugin.video.vstream/settings.xml ~/.kodi/userdata/addon_data/plugin.video.vstream/settings.xml @@ -133,6 +134,9 @@ if [[ "$timebar" == "12:12" || "$timebar" == "00:12" ]]; then # # REFRESHing KEY ZenTAG nano DHTs => Zen File ECONOMY door $MY_PATH/zen/ipns_TAG_refresh.sh + + ## RESCAN dead swarm + rm -f ~/.zen/A_dead_swarm.txt fi ################################################################## @@ -176,7 +180,10 @@ echo ' diskSize="$((availableDiskSize / 2))" ipfs config Datastore.StorageMax $diskSize echo "StorageMax = $diskSize" + + # New full test review in gchange_INIT.sh rm -f ~/.ipfs/test.disk + # LOG ROTATE [[ -f /tmp/astroport.log ]] && tar cvzf ~/.zen/astroport.$weeknumber.log.tgz /tmp/astroport.log && echo "" > /tmp/astroport.log diff --git a/zen/ipfs_SWARM_refresh.sh b/zen/ipfs_SWARM_refresh.sh index a01c7db..618c171 100755 --- a/zen/ipfs_SWARM_refresh.sh +++ b/zen/ipfs_SWARM_refresh.sh @@ -29,22 +29,23 @@ ___ _ _ __ __ _ _ _ _ _ _ __ _|_| | __) __)\/\//--\| \| | | \|_| | \|___)| | ' -echo "I am $IPFSNODEID" +echo "I am $IPFSNODEID CONTROLING MY SWARM" timestamp=$(date -u +%s%N | cut -b1-13) ######################################################################## # Delete "ipfs" & "ipfs_swarm" after reboot -[[ ! -f /tmp/swarm_cleaned ]] && rm -Rf ~/.zen/ipfs/* && rm -Rf ~/.zen/ipfs_swarm/ && mkdir -p ~/.zen/ipfs_swarm && echo "IPFS CLEANING OK" > /tmp/swarm_cleaned +# [[ ! -f /tmp/swarm_cleaned ]] && rm -Rf ~/.zen/ipfs/* && rm -Rf ~/.zen/ipfs_swarm/ && mkdir -p ~/.zen/ipfs_swarm && echo "IPFS CLEANING OK" > /tmp/swarm_cleaned ######################################################################## rm /tmp/treated.ipfs.swarm touch /tmp/treated.ipfs.swarm +touch ~/.zen/A_dead_swarm.txt count=1 for peerline in $(ipfs swarm peers && cat ~/.zen/A_swarm_map.txt | sort | uniq); do ipfsnodeid=$(echo "$peerline" | awk -F '/' '{print $8}') [[ "$ipfsnodeid" == "" ]] && continue - + [[ $(cat ~/.zen/A_dead_swarm.txt | grep "$ipfsnodeid") ]] && continue # Convert ipfsnodeid into g1pub whoisg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid) @@ -57,7 +58,7 @@ do nowdate=$(date) - echo "### ANALYSING $whoisg1 = $ipfsnodeid ($ip) ###" + echo "### ANALYZING $whoisg1 = $ipfsnodeid ($ip) ###" echo "${peerline}" myfriendpeer=$(cat ~/.zen/A_my_swarm.txt | grep $ipfsnodeid ) if [[ "$myfriendpeer" != "" ]]; then @@ -67,6 +68,7 @@ do if [ $? != 0 ]; then echo "TIMEOUT REACHED ___ REMOVE $ipfsnodeid FROM ~/.zen/A_my_swarm.txt"; grep -vEi $ip ~/.zen/A_my_swarm.txt + echo $ipfsnodeid > ~/.zen/A_dead_swarm.txt fi else [[ -f ~/.zen/DEFCON ]] && export DEFCON=$(cat ~/.zen/DEFCON) || export DEFCON=$(cat ~/.zen/astrXbian/DEFCON) # like in crom_MINUTE.sh @@ -102,9 +104,17 @@ do done ######################################################################## -# REFRESH tiddlywiki index # TODO create local index from swarm wiki +# TODO PUBLISH tiddlywiki WALL OF FRIENDS ######################################################################## -for wiki in $(ls ~/.zen/ipfs_swarm/.12D*/index.html 2>/dev/null); do echo $wiki; done +# for wiki in $(ls ~/.zen/ipfs_swarm/.12D*/index.html 2>/dev/null); do + ipfsnodeid=$(echo $wiki | cut -d '.' -f 3-) + whoisg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid) +printf "" +done ######################################################################## ########################################################################