From ebb5cc117e1af2bc0421448d8aad0e106bdc43a7 Mon Sep 17 00:00:00 2001 From: fred Date: Sat, 10 Dec 2022 18:33:41 +0100 Subject: [PATCH] hop --- ASTROBOT/G1CopierYoutube.sh | 19 ++++++++++--------- ASTROBOT/G1Voeu.sh | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ASTROBOT/G1CopierYoutube.sh b/ASTROBOT/G1CopierYoutube.sh index 8883450f..25ad91ca 100755 --- a/ASTROBOT/G1CopierYoutube.sh +++ b/ASTROBOT/G1CopierYoutube.sh @@ -26,12 +26,18 @@ INDEX="$1" WISHKEY="$2" ## IPNS KEY NAME - G1PUB - PLAYER - WISHKEY... [[ ! $WISHKEY ]] && echo "ERROR - Please provide IPFS publish key" && exit 1 +PLAYER=$WISHKEY + TWNS=$(ipfs key list -l | grep -w $WISHKEY | cut -d ' ' -f1) [[ ! $TWNS ]] && echo "ERROR - Clef IPNS $WISHKEY introuvable!" && exit 1 # Extract tag=tube from TW MOATS=$(date -u +"%Y%m%d%H%M%S%4N") -mkdir -p ~/.zen/tmp/$IPFSNODEID + +################################################################### +## CREATE APP NODE PLAYER PUBLICATION DIRECTORY +################################################################### +mkdir -p $HOME/.zen/tmp/$IPFSNODEID/G1CopierYoutube/$PLAYER/ ################################################################### ## tag[CopierYoutube] EXTRACT ~/.zen/tmp/CopierYoutube.json FROM TW @@ -58,7 +64,7 @@ for YURL in $(cat ~/.zen/tmp/CopierYoutube.json | jq -r '.[].text' | grep 'http' done # FINISH YURL loop -## SORT UNIQ CACHE +## SORT UNIQ ~/.zen/tmp/$IPFSNODEID/yt-dlp.cache.$WISHKEY cat ~/.zen/tmp/$IPFSNODEID/yt-dlp.cache.$WISHKEY | sort | uniq > ~/.zen/tmp/yt-dlp.cache cp ~/.zen/tmp/yt-dlp.cache ~/.zen/tmp/$IPFSNODEID/yt-dlp.cache.$WISHKEY @@ -78,18 +84,13 @@ while read LINE; ## Search for $YID.TW.json TIDDLER in local & MySwarm cache MATCH=$(ls -t ~/.zen/tmp/$IPFSNODEID/G1CopierYoutube/*/$YID.TW.json 2>/dev/null | head -n 1) [[ $MATCH ]] \ - && TIDDLER="$MATCH" \ + && echo "Local Found Tiddler" && TIDDLER="$MATCH" \ || MATCH=$(ls -t ~/.zen/tmp/swarm/*/G1CopierYoutube/*/$YID.TW.json 2>/dev/null | head -n 1) [[ $MATCH ]] \ - && TIDDLER="$MATCH" + && echo "Swarm Found Tiddler" && TIDDLER="$MATCH" ################################################################### -################################################################### -## CREATE APP PUBLICATION -################################################################### -mkdir -p $HOME/.zen/tmp/$IPFSNODEID/G1CopierYoutube/$PLAYER/ - if [[ ! ${TIDDLER} ]]; then ################################################################### diff --git a/ASTROBOT/G1Voeu.sh b/ASTROBOT/G1Voeu.sh index 823ce48d..3fb38e1f 100755 --- a/ASTROBOT/G1Voeu.sh +++ b/ASTROBOT/G1Voeu.sh @@ -178,7 +178,7 @@ convert -gravity northwest -pointsize 50 -fill black -draw "text 30,300 \"$PEPPE " # NEW IVEU TIDDLER - echo "## Creation json tiddler : Qr${PEPPER} /ipfs/${IVOEU}" + echo "## Creation json tiddler : G1${PEPPER} /ipfs/${IVOEU}" echo '[ { "created": "'${MOATS}'",