From b174e15995f34855a8bb2c3ab7d19626cf28a5dd Mon Sep 17 00:00:00 2001 From: fred Date: Mon, 11 Sep 2023 01:45:42 +0200 Subject: [PATCH] debug & UPLANET RSS UMAP --- ASTROBOT/G1CopierYoutube.sh | 8 +- RUNTIME/PLAYER.refresh.sh | 2 +- RUNTIME/UPLANET.refresh.sh | 147 ++++++++++++++++++++++ tools/search_for_this_email_in_players.sh | 2 +- 4 files changed, 155 insertions(+), 4 deletions(-) create mode 100755 RUNTIME/UPLANET.refresh.sh diff --git a/ASTROBOT/G1CopierYoutube.sh b/ASTROBOT/G1CopierYoutube.sh index 0949d811..e01d83d1 100755 --- a/ASTROBOT/G1CopierYoutube.sh +++ b/ASTROBOT/G1CopierYoutube.sh @@ -59,7 +59,7 @@ for YURL in $(cat ~/.zen/game/players/${PLAYER}/G1CopierYoutube/CopierYoutube.js echo "Extracting video playlist into yt-dlp.cache.${PLAYER}" ### yt-dlp.command - CMD=$(cat ~/.zen/game/players/${PLAYER}/G1CopierYoutube/yt-dlp.command 2>/dev/null | grep "$YURL" | tail -n 1) + CMD=$(cat ~/.zen/game/players/${PLAYER}/G1CopierYoutube/yt-dlp.command 2>/dev/null | grep -- "$YURL" | tail -n 1) if [[ ! $CMD ]]; then echo "${PLAYER}&$YURL:$MOATS" >> ~/.zen/game/players/${PLAYER}/G1CopierYoutube/yt-dlp.command echo "NOUVEAU CANAL ${PLAYER}&$YURL:$MOATS" @@ -146,13 +146,17 @@ if [[ ! ${TIDDLER} ]]; then [[ -s "${HOME}/.zen/tmp/yt-dlp/$TITLE.mkv" ]] && ffmpeg -loglevel quiet -i "${HOME}/.zen/tmp/yt-dlp/$TITLE.mkv" -c:v libx264 -c:a aac "${HOME}/.zen/tmp/yt-dlp/$TITLE.mp4" # TRY TO CONVERT MKV TO MP4 if [[ ! -s "${HOME}/.zen/tmp/yt-dlp/${ZFILE}" ]]; then - echo "No FILE -- TRYING TO RESTORE CACHE FROM TW --" + echo "No FILE -- TRYING TO RESTORE CACHE FROM TW -- ${ZFILE}" tiddlywiki --load ${INDEX} \ --output ~/.zen/game/players/${PLAYER}/G1CopierYoutube \ --render '.' "$YID.TW.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' "${ZFILE}" if [[ -s ~/.zen/game/players/${PLAYER}/G1CopierYoutube/$YID.TW.json ]]; then rm "${HOME}/.zen/game/players/${PLAYER}/G1CopierYoutube/${ZFILE}.json" 2>/dev/null ln -s "${HOME}/.zen/game/players/${PLAYER}/G1CopierYoutube/$YID.TW.json" "${HOME}/.zen/game/players/${PLAYER}/G1CopierYoutube/${ZFILE}.json" + else + ## REMOVE FILE FROM .yt-dlp.list - RETRY NEXT TIME + grep -v -- "$YID" ${HOME}/.zen/.yt-dlp.list > /tmp/.yt-dlp.list + mv /tmp/.yt-dlp.list ${HOME}/.zen/.yt-dlp.list fi continue fi diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh index 4f65a42c..ae4dfa27 100755 --- a/RUNTIME/PLAYER.refresh.sh +++ b/RUNTIME/PLAYER.refresh.sh @@ -275,6 +275,6 @@ for PLAYER in ${PLAYERONE[@]}; do done echo "PLAYER.refresh DONE." -${MY_PATH}/../tools/MAP.refresh.sh +${MY_PATH}/MAP.refresh.sh exit 0 diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh new file mode 100755 index 00000000..863aa3c5 --- /dev/null +++ b/RUNTIME/UPLANET.refresh.sh @@ -0,0 +1,147 @@ +#!/bin/bash +################################################################################ +# Author: Fred (support@qo-op.com) +# Version: 0.2 +# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/) +################################################################################ +MY_PATH="`dirname \"$0\"`" # relative +MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized +. "$MY_PATH/../tools/my.sh" +################################################################################ +## SEEK FOR UPLANET KEYS +# GET & UPDATE IPNS +############################################ +echo "## RUNNING UPLANET.refresh" +[[ ${IPFSNODEID} == "" ]] && echo "IPFSNODEID is empty - EXIT -" && exit 1 + +MOATS=$(date -u +"%Y%m%d%H%M%S%4N") +mkdir ~/.zen/tmp/${MOATS} + +################################################################# +## IPFSNODEID ASTRONAUTES SIGNALING ## 12345 port +############################ + ## RUNING FOR ALL UMAP FOUND IN STATION MAP CACHE : "_LAT_LON" + + ## SEARCH UMAP + UMAPS=($(ls -t ~/.zen/tmp/${IPFSNODEID}/UPLANET/ 2>/dev/null)) + echo "FOUND : ${UMAPS[@]}" + + for UMAP in ${UMAPS[@]}; do + + echo ">>> REFRESHING ${UMAP}" + LAT=$(echo ${UMAP} | cut -d '_' -f 2) + LON=$(echo ${UMAP} | cut -d '_' -f 3) + ############################################################## + WALLET=$(${MY_PATH}/../tools/keygen -t duniter "$LAT" "$LON") + [[ ! ${WALLET} ]] && echo "ERROR generating WALLET" && exit 1 + echo "ACTUAL UMAP WALLET : ${WALLET}" + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/WALLET.priv "$LAT" "$LON" + ipfs key rm ${WALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT + UMAPNS=$(ipfs key import ${WALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/WALLET.priv) + + ## GET ONLINE UMAPNS + mkdir ~/.zen/tmp/${MOATS}/${UMAP} + ipfs get -o ~/.zen/tmp/${MOATS}/${UMAP}/ /ipns/${UMAPNS}/ + + [[ ! -d ~/.zen/tmp/${MOATS}/${UMAP}/${UMAP} ]] \ + && echo "UMAP IS BAD FORMAT - PLEASE CORRECT -" \ + && exit 1 + + + ############################################################## + # North Umap + NLAT=$(echo "$LAT + 0.01" | bc) + NLON="$LON" + NWALLET=$(${MY_PATH}/../tools/keygen -t duniter "$NLAT" "$NLON") + [[ ! ${NWALLET} ]] && echo "ERROR generating NWALLET" && exit 1 + echo "NORTH UMAP NWALLET : ${NWALLET}" + ipfs key rm ${NWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/NWALLET.priv "$NLAT" "$NLON" + NUMAPNS=$(ipfs key import ${NWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/NWALLET.priv) + + ############################################################## + # South Umap + SLAT=$(echo "$LAT - 0.01" | bc) + SLON="$LON" + SWALLET=$(${MY_PATH}/../tools/keygen -t duniter "$SLAT" "$SLON") + [[ ! ${SWALLET} ]] && echo "ERROR generating SWALLET" && exit 1 + echo "SOUTH UMAP SWALLET : ${SWALLET}" + ipfs key rm ${SWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/SWALLET.priv "$SLAT" "$SLON" + SUMAPNS=$(ipfs key import ${SWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/SWALLET.priv) + ipfs key rm ${SWALLET} + + ############################################################## + # West Umap + WLAT="$LAT" + WLON=$(echo "$LON - 0.01" | bc) + WWALLET=$(${MY_PATH}/../tools/keygen -t duniter "$WLAT" "$WLON") + [[ ! ${WWALLET} ]] && echo "ERROR generating WWALLET" && exit 1 + echo "WEST UMAP WWALLET : ${WWALLET}" + ipfs key rm ${WWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/WWALLET.priv "$WLAT" "$WLON" + WUMAPNS=$(ipfs key import ${WWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/WWALLET.priv) + ipfs key rm ${WWALLET} + + ############################################################## + # East Umap + ELAT="$LAT" + ELON=$(echo "$LON + 0.01" | bc) + EWALLET=$(${MY_PATH}/../tools/keygen -t duniter "$ELAT" "$ELON") + [[ ! ${EWALLET} ]] && echo "ERROR generating EWALLET" && exit 1 + echo "EAST UMAP EWALLET : ${EWALLET}" + ipfs key rm ${EWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/EWALLET.priv "$ELAT" "$ELON" + EUMAPNS=$(ipfs key import ${EWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/EWALLET.priv) + ipfs key rm ${EWALLET} + + ############################################################## + # South West Umap + SWLAT=$(echo "$LAT - 0.01" | bc) + SWLON=$(echo "$LON - 0.01" | bc) + SWWALLET=$(${MY_PATH}/../tools/keygen -t duniter "$SWLAT" "$SWLON") + [[ ! ${SWWALLET} ]] && echo "ERROR generating SWWALLET" && exit 1 + echo "SOUTH WEST UMAP SWWALLET : ${SWWALLET}" + ipfs key rm ${SWWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/SWWALLET.priv "$SWLAT" "$SWLON" + SWUMAPNS=$(ipfs key import ${SWWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/SWWALLET.priv) + ipfs key rm ${SWWALLET} + + ############################################################## + # North West Umap + NWLAT=$(echo "$LAT + 0.01" | bc) + NWLON=$(echo "$LON - 0.01" | bc) + NWWALLET=$(${MY_PATH}/../tools/keygen -t duniter "$NWLAT" "$NWLON") + [[ ! ${NWWALLET} ]] && echo "ERROR generating NWWALLET" && exit 1 + echo "NORTH WEST UMAP NWWALLET : ${NWWALLET}" + ipfs key rm ${NWWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/NWWALLET.priv "$NWLAT" "$NWLON" + SWUMAPNS=$(ipfs key import ${NWWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/NWWALLET.priv) + ipfs key rm ${NWWALLET} + + ############################################################## + # North East Umap + NELAT=$(echo "$LAT + 0.01" | bc) + NELON=$(echo "$LON + 0.01" | bc) + NEWALLET=$(${MY_PATH}/../tools/keygen -t duniter "$NELAT" "$NELON") + [[ ! ${NEWALLET} ]] && echo "ERROR generating NEWALLET" && exit 1 + echo "NORTH EAST UMAP NEWALLET : ${NEWALLET}" + ipfs key rm ${NEWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/NEWALLET.priv "$NELAT" "$NELON" + SWUMAPNS=$(ipfs key import ${NEWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/NEWALLET.priv) + ipfs key rm ${NEWALLET} + + ############################################################## + # South East Umap + SELAT=$(echo "$LAT - 0.01" | bc) + SELON=$(echo "$LON + 0.01" | bc) + SEWALLET=$(${MY_PATH}/../tools/keygen -t duniter "$SELAT" "$SELON") + [[ ! ${SEWALLET} ]] && echo "ERROR generating SEWALLET" && exit 1 + echo "SOUTH EAST UMAP SEWALLET : ${SEWALLET}" + ipfs key rm ${SEWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/SEWALLET.priv "$SELAT" "$SELON" + SWUMAPNS=$(ipfs key import ${SEWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/SEWALLET.priv) + ipfs key rm ${SEWALLET} + + done + diff --git a/tools/search_for_this_email_in_players.sh b/tools/search_for_this_email_in_players.sh index c2bdc682..c06045bd 100755 --- a/tools/search_for_this_email_in_players.sh +++ b/tools/search_for_this_email_in_players.sh @@ -25,7 +25,7 @@ if [[ "${EMAIL}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then [[ ! $INDEX ]] && INDEX=$(ls $HOME/.zen/tmp/swarm/*/TW/${EMAIL}/index.html 2>/dev/null) ## SWARM [[ ! $INDEX ]] && exit 1 ## TODO ? SEARCH WITH DNSLINK - echo "TW=${INDEX}" + echo "export TW=${INDEX}" ## EXTRACT DATA FROM TW mkdir -p ~/.zen/tmp/${MOATS}