diff --git a/zen/ipfs_SWARM_refresh.sh b/zen/ipfs_SWARM_refresh.sh index 7272319..d3991cd 100755 --- a/zen/ipfs_SWARM_refresh.sh +++ b/zen/ipfs_SWARM_refresh.sh @@ -27,7 +27,7 @@ ipfsnodeid=$(ipfs id -f='\n') g1pub=$(cat ~/.ssb/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) ######################################################################## -mkdir -p "~/.zen/ipfs_swarm" +mkdir -p ~/.zen/ipfs_swarm echo ' ___ _ _ __ __ _ _ _ _ _ _ __ | |_)|_(_ (_\ //\ |_)|\/| |_)|_|_|_)|_(_ |_| @@ -35,28 +35,27 @@ _|_| | __) __)\/\//--\| \| | | \|_| | \|___)| | ' echo "I am $ipfsnodeid" -cd ~/ -# PUBLISH NODE ipfs shared data to swarm +## CHANNELS SWARM INDEX COPY PROCEDURE +## SIGNAL ~/.zen/g1sms_wallets TODO + + +# NOW PUBLISH ~/.zen/ipfs/ to SWARM [[ ! -d ~/.zen/ipfs ]] && echo "ERROR : ~/.zen/ipfs/ NOT FOUND" && exit 1 IWALLETS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1) NODEIPNS=$(ipfs name publish --quieter /ipfs/$IWALLETS) +ipfs get --output=~/.zen/ipfs_swarm/ /ipns/$ipfsnodeid -## TAKE CARE OF ~/.zen/g1sms_wallets - -# GET IPNS published wallets from ALL SWARM NODES ## TODO: IF NODES are MISSING, check ./wallets_swarm/.QmNODES... -[[ $$ipfsnodeid ]] && ipfs get --output=./.zen/ipfs_swarm/ /ipns/$ipfsnodeid count=1 -# Search for All peers Nodes. ## TODO: To be changed when Swarm is too big or not expendanding -#for id in ./ipfs_swarm/.Qm*/; # Alternative search - - +# Search for All peers Nodes. ## TODO: To be changed when Swarm is too big or not expanding +#for id in $(ls -d ~/.zen/ipfs_swarm/.Qm* | cut -d '.' -f 3); # Alternative search... for id in $(ipfs swarm peers | awk -F '/' '{print $7}'); do count=$((count+1)) - id=$(echo $id | cut -d '.' -f 3 | cut -d '/' -f 1) - echo "Refreshing ~/.zen/ipfs_swarm/.$id" - rm -Rf ./.zen/ipfs_swarm/.$id - $MY_PATH/tools/timeout.sh -t 30 ipfs get --output=./.zen/ipfs_swarm/ /ipns/$id + # FULL REFRESH (allow deletion, for DEV period) + # TODO: COMMENT TO LOWER DISK USAGE + echo "Refreshing ~/.zen/ipfs_swarm/.$id ($count)" + rm -Rf ~/.zen/ipfs_swarm/.$id + $MY_PATH/tools/timeout.sh -t 30 ipfs get --output=~/.zen/ipfs_swarm/ /ipns/$id done diff --git a/zen/ssb_GET_zenyta.sh b/zen/ssb_GET_zenyta.sh index ad583e2..04a5fef 100755 --- a/zen/ssb_GET_zenyta.sh +++ b/zen/ssb_GET_zenyta.sh @@ -57,31 +57,31 @@ do # EXTRACT CMD PARAM msg_key=$(printf %s "$msg" | jq -r .key) author=$(printf %s "$msg" | jq -r .value.author) - -# echo $author timestamp=$(printf %s "$msg" | jq -r .value.timestamp) -# echo $timestamp # TEST CURRENT NODE last_ts [[ $timestamp == $last_ts ]] && echo "ALREADY DONE" && continue - # TEST if SWARM already made it. + # SWARM REFRESH $MY_PATH/ipfs_SWARM_refresh.sh + # SWARM ALREADY DONE CHECKSWARM=$(grep -Rwl "$timestamp" ~/.zen/ipfs_swarm/.Qm*/TAG/*/_tag.zensource | tail -n 1 | cut -f 6 -d '/') - + # OR SWARM PROCESS IN ACTION + [[ ! $CHECKSWARM ]] && $(grep -Rwl "$timestamp" ~/.zen/ipfs_swarm/.Qm*/TAG/process.timestamp.ssb | tail -n 1 | cut -f 6 -d '/') [[ $CHECKSWARM ]] \ && echo "$timestamp ALREADY on NODE $CHECKSWARM CONTINUE" \ && echo "$timestamp" > ~/.zen/zenyta.last.ts \ && continue + + # ANTI DOUBLE COPY START + echo "$timestamp" > ~/.zen/ipfs/.$ipfsnodeid/process.timestamp.ssb + ./ipfs_SWARM_refresh.sh + # ANTI DOUBLE COPY msg_root=$(printf %s "$msg" | jq -r .value.content.root) -# echo $msg_root msg_branch=$(printf %s "$msg" | jq -r .value.content.branch) -# echo $msg_branch msg_text=$(printf %s "$msg" | jq -r .value.content.text) -# echo $msg_text | grep you forces *you* in URL msg_ytdlurl=$(echo $msg_text | egrep -o 'https?://[^ ]+' | grep you | cut -d '\' -f 1 | tail -n 1) -# echo $msg_ytdlurl # YOUTUBE-DL AUDIO @@ -97,4 +97,9 @@ do $MY_PATH/miam_miam.sh "$timestamp" + # ANTI DOUBLE COPY END + echo "$timestamp" > ~/.zen/ipfs/.$ipfsnodeid/process.timestamp.ssb + ./ipfs_SWARM_refresh.sh + # ANTI DOUBLE COPY + done < <(printf '%s\n' "$messages") diff --git a/zen/ssb_GET_zenytv.sh b/zen/ssb_GET_zenytv.sh index b0f3d0f..cd505bd 100755 --- a/zen/ssb_GET_zenytv.sh +++ b/zen/ssb_GET_zenytv.sh @@ -56,30 +56,31 @@ do # EXTRACT CMD PARAM msg_key=$(printf %s "$msg" | jq -r .key) author=$(printf %s "$msg" | jq -r .value.author) -# echo $author timestamp=$(printf %s "$msg" | jq -r .value.timestamp) -# echo $timestamp # TEST CURRENT NODE last_ts [[ $timestamp == $last_ts ]] && echo "ALREADY DONE" && continue - # TEST if SWARM already made it. + # SWARM REFRESH $MY_PATH/ipfs_SWARM_refresh.sh + # SWARM ALREADY DONE CHECKSWARM=$(grep -Rwl "$timestamp" ~/.zen/ipfs_swarm/.Qm*/TAG/*/_tag.zensource | tail -n 1 | cut -f 6 -d '/') - + # OR SWARM PROCESS IN ACTION + [[ ! $CHECKSWARM ]] && $(grep -Rwl "$timestamp" ~/.zen/ipfs_swarm/.Qm*/TAG/process.timestamp.ssb | tail -n 1 | cut -f 6 -d '/') [[ $CHECKSWARM ]] \ && echo "$timestamp ALREADY on NODE $CHECKSWARM CONTINUE" \ && echo "$timestamp" > ~/.zen/zenytv.last.ts \ && continue + # ANTI DOUBLE COPY START + echo "$timestamp" > ~/.zen/ipfs/.$ipfsnodeid/process.timestamp.ssb + ./ipfs_SWARM_refresh.sh + # ANTI DOUBLE COPY + msg_root=$(printf %s "$msg" | jq -r .value.content.root) -# echo $msg_root msg_branch=$(printf %s "$msg" | jq -r .value.content.branch) -# echo $msg_branch msg_text=$(printf %s "$msg" | jq -r .value.content.text) -# echo $msg_text | grep you forces *you* in URL msg_ytdlurl=$(echo $msg_text | egrep -o 'https?://[^ ]+' | grep you | cut -d '\' -f 1 | tail -n 1) -# echo $msg_ytdlurl # YOUTUBE-DL VIDEO @@ -94,5 +95,10 @@ do [[ $msg_key ]] && echo "$msg_key" > ~/.zen/miam/$timestamp/msg_key $MY_PATH/miam_miam.sh "$timestamp" + + # ANTI DOUBLE COPY END + echo "$timestamp" > ~/.zen/ipfs/.$ipfsnodeid/process.timestamp.ssb + ./ipfs_SWARM_refresh.sh + # ANTI DOUBLE COPY done < <(printf '%s\n' "$messages")