From ddbf12acd901dab766a7086a2b8e00ee4f09dd87 Mon Sep 17 00:00:00 2001 From: fred Date: Sat, 7 Jan 2023 20:44:57 +0100 Subject: [PATCH] MP4 CONVERT... WAIT --- ASTROBOT/G1CopierYoutube.sh | 8 ++++---- ASTROBOT/PLAYER.refresh.sh | 6 ++++-- crypto_challenge.txt | 5 +++++ tools/make_video_gifanim_ipfs.sh | 4 ++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ASTROBOT/G1CopierYoutube.sh b/ASTROBOT/G1CopierYoutube.sh index e03b45cf..af8d8df9 100755 --- a/ASTROBOT/G1CopierYoutube.sh +++ b/ASTROBOT/G1CopierYoutube.sh @@ -92,9 +92,9 @@ while read LINE; ################################################################### ## Search for $YID.TW.json TIDDLER in local & MySwarm cache - echo "--- CACHE SEARCH FOR $YID ---" && TIDDLER=$(ls -t ~/.zen/game/players/*/G1CopierYoutube/$YID.TW.json 2>/dev/null | head -n 1) - [[ ! $TIDDLER ]] && TIDDLER=$(ls -t ~/.zen/tmp/$IPFSNODEID/G1CopierYoutube/*/$YID.TW.json 2>/dev/null | head -n 1) - [[ ! $TIDDLER ]] && TIDDLER=$(ls -t ~/.zen/tmp/swarm/*/G1CopierYoutube/*/$YID.TW.json 2>/dev/null | head -n 1) + echo "--- CACHE SEARCH FOR $YID ---" && TIDDLER=$(ls -t "$HOME/.zen/game/players/"*"/G1CopierYoutube/$YID.TW.json" 2>/dev/null | head -n 1) + [[ ! $TIDDLER ]] && TIDDLER=$(ls -t "$HOME/.zen/tmp/$IPFSNODEID/G1CopierYoutube/"*"/$YID.TW.json" 2>/dev/null | head -n 1) + [[ ! $TIDDLER ]] && TIDDLER=$(ls -t "$HOME/.zen/tmp/swarm/"*"/G1CopierYoutube/"*"/$YID.TW.json" 2>/dev/null | head -n 1) [[ $TIDDLER ]] && echo "Tiddler Found in CACHE : $TIDDLER" || echo "EMPTY." ################################################################### @@ -177,7 +177,7 @@ if [[ ! ${TIDDLER} ]]; then end=`date +%s` dur=`expr $end - $start` - echo "Creating Youtube ${YID} tiddler : G1CopierYoutube !" + echo "Creating Youtube \"${YID}\" tiddler : G1CopierYoutube !" echo $TEXT echo '[ diff --git a/ASTROBOT/PLAYER.refresh.sh b/ASTROBOT/PLAYER.refresh.sh index 97a579bd..b05fb95d 100755 --- a/ASTROBOT/PLAYER.refresh.sh +++ b/ASTROBOT/PLAYER.refresh.sh @@ -85,7 +85,7 @@ for PLAYER in ${PLAYERONE[@]}; do ############################################################# ## CHECK WHO IS ACTUAL OFFICIAL GATEWAY tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html --output ~/.zen/tmp/${MOATS} --render '.' 'MadeInZion.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion' - [[ ! -s ~/.zen/tmp/${MOATS}/MadeInZion.json ]] && echo "MadeInZion : BAD TW (☓‿‿☓) " && continue + [[ ! -s ~/.zen/tmp/${MOATS}/MadeInZion.json ]] && echo "${PLAYER} MadeInZion : BAD TW (☓‿‿☓) " && continue player=$(cat ~/.zen/tmp/${MOATS}/MadeInZion.json | jq -r .[].player) @@ -183,7 +183,9 @@ for PLAYER in ${PLAYERONE[@]}; do echo "(☉_☉ ) (☉_☉ ) (☉_☉ )" echo "IFRIENDHEAD :" ${IFRIENDHEAD} echo "(☉_☉ ) (☉_☉ ) (☉_☉ )" - # cp -f ~/.zen/game/players/${PLAYER}/ipfs/${FPLAYER}.rss.json ~/.zen/tmp/${IPFSNODEID}/rss/${PLAYER}/${FPLAYER}.rss.json + + # cp -f ~/.zen/game/players/${PLAYER}/ipfs/${FPLAYER}.rss.json ~/.zen/game/players/$PLAYER/FRIENDS/${FPLAYER}.rss.json + [[ -d ~/.zen/game/players/$PLAYER/FRIENDS ]] \ && cat ${MY_PATH}/../www/iframe.html | sed "s~_ME_~${myIPFS}/ipns/${ASTRONAUTENS}~g" | sed "s~_IFRIENDHEAD_~${IFRIENDHEAD}~g" > ~/.zen/game/players/$PLAYER/FRIENDS/index.html diff --git a/crypto_challenge.txt b/crypto_challenge.txt index ca64a53b..dd382a12 100644 --- a/crypto_challenge.txt +++ b/crypto_challenge.txt @@ -31,12 +31,17 @@ QmNMPQ46SX83CtDcCzMwUY4Z6yCVvwM9wgTGNvqSUzAC6w QmcmLV31qfDmmAwUXiMrJZfsPoEKVGNX9LKrVfuDJ8trSX ➢ Ğ1Flexyourte /ipns/k51qzi5uqu5dgmwympoar0pt719akiwhh3d9ire8ad66uaxxdprmu0w6ffy7cx +QmSWnvJLDjSFXGwExLsfCroXVUTFeEkb4jsWZxNhFVY45a ➢ Ğ1ForetJardin /ipns/k51qzi5uqu5djtz886qkuwcwao0zkbkfz6ct5j7k5hslzkvihk26eqx57fhane +QmdCiJpTd4fZZPNwVZbEs1PfqADjuzNdnGB834UDNShyXQ ➢ Ğ1Ğ1Ronds /ipns/k51qzi5uqu5dmdjma9ew6vqrbqp3hrzh3aen1c37ahq4tm9tt738cpd19r86e4 + ➢ Ğ1Kerterre /ipns/k51qzi5uqu5dgh0n8i418g154vhf9yhfegdmessww9eae7o11w2uaionso7zej + + ➢ Ğ1ReacteurBoisHuileEau /ipns/k51qzi5uqu5dkv77ezda27py7rdoi1jnnljpv2pdjt0z9s6si5ontp2gu6480p ➢ Ğ1Ressourcerie /ipns/k51qzi5uqu5dltlzvbhypviokoyy31gnc4zxdcrbs9bpawo9ed7sqyjlrrq203 ➢ Ğ1Solaire /ipns/k51qzi5uqu5dj0dgu97f8we2ra8h8ze4hcuw48pscfbxkfw6038zhh015q225v diff --git a/tools/make_video_gifanim_ipfs.sh b/tools/make_video_gifanim_ipfs.sh index 358d3e5f..43ee1872 100755 --- a/tools/make_video_gifanim_ipfs.sh +++ b/tools/make_video_gifanim_ipfs.sh @@ -15,8 +15,8 @@ MIME=$(file --mime-type -b "${path}${file}") ############# CONVERT NOT MP4 [[ ! $MIME == "video/mp4" ]] \ && echo "MP4 CONVERT... WAIT" \ - && ffmpeg -loglevel error -i "${path}${file}" -c:v libx264 -c:a aac "${path}4${file}" \ - && [[ -s "${path}4${file}" ]] && rm "${path}${file}" && mv "${path}4${file}" "${path}${file}.mp4" && file="${file}.mp4" && extension="mp4" && MIME=$(file --mime-type -b "${path}${file}") + && ffmpeg -loglevel error -i "${path}${file}" -c:v libx264 -c:a aac "${path}${file}.mp4" \ + && [[ -s "${path}${file}.mp4" ]] && rm "${path}${file}" && file="${file}.mp4" && extension="mp4" && MIME=$(file --mime-type -b "${path}${file}") FILE_RES=$(ffprobe -v error -select_streams v:0 -show_entries stream=width,height -of csv=s=x:p=0 "${path}${file}" | cut -d "x" -f 2) RES=${FILE_RES%?}0p