diff --git a/12345.sh b/12345.sh index a3e89df4..e95dc3db 100755 --- a/12345.sh +++ b/12345.sh @@ -258,16 +258,17 @@ sed -i "s~_HOSTNAME_~$(hostname)~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect mkdir -p ~/.zen/tmp/${IPFSNODEID}/${TYPE}/${NODEID}/${MOATS} - echo "TRYING ipfs --timeout 2s cat /ipfs/$DATAID > ~/.zen/tmp/${IPFSNODEID}/${TYPE}/${NODEID}/${MOATS}/data.json" - ipfs --timeout 2s cat /ipfs/$DATAID > ~/.zen/tmp/${IPFSNODEID}/${TYPE}/${NODEID}/${MOATS}/data.json + echo "TRYING ipfs --timeout 3s cat /ipfs/$DATAID > ~/.zen/tmp/${IPFSNODEID}/${TYPE}/${NODEID}/${MOATS}/data.json" + ipfs --timeout 3s cat /ipfs/$DATAID > ~/.zen/tmp/${IPFSNODEID}/${TYPE}/${NODEID}/${MOATS}/data.json if [[ ! -s ~/.zen/tmp/${IPFSNODEID}/${TYPE}/${NODEID}/${MOATS}/data.json ]]; then - echo ">>> curl -m 12 -so ~/.zen/tmp/${IPFSNODEID}/${TYPE}/${NODEID}/${MOATS}/data.json https://gateway.ipfs.io/ipfs/$DATAID" + echo "IPFS TIMEOUT >>> curl -m 12 -so ~/.zen/tmp/${IPFSNODEID}/${TYPE}/${NODEID}/${MOATS}/data.json https://gateway.ipfs.io/ipfs/$DATAID" curl -m 12 -so ~/.zen/tmp/${IPFSNODEID}/${TYPE}/${NODEID}/${MOATS}/data.json "https://gateway.ipfs.io/ipfs/$DATAID" fi if [[ ! -s ~/.zen/tmp/${IPFSNODEID}/${TYPE}/${NODEID}/${MOATS}/data.json ]]; then echo "$HTTPCORS ERROR - $DATAID TIMEOUT - TRY AGAIN" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & else - [[ $(~/.zen/tmp/${IPFSNODEID}/${TYPE}/${NODEID}/${MOATS}/data.json | jq) ]] && \ + [[ $(cat ~/.zen/tmp/${IPFSNODEID}/${TYPE}/${NODEID}/${MOATS}/data.json | jq) ]] && \ + ## IPFS ADD ipfs add ~/.zen/tmp/${IPFSNODEID}/${TYPE}/${NODEID}/${MOATS}/data.json fi @@ -278,6 +279,16 @@ sed -i "s~_HOSTNAME_~$(hostname)~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect cat ~/.zen/tmp/coucou/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & + ## REPONSE ON IPFSNODEID + ( + echo "¯\_༼༽_/¯ $IPFSNODEID $PLAYER SIGNALING" + ROUTING=$(ipfs add -rwq ~/.zen/tmp/${IPFSNODEID}/* | tail -n 1 ) + ipfs name publish --allow-offline /ipfs/$ROUTING + echo "DONE" + end=`date +%s` + echo ROUTING Execution time was `expr $end - $start` seconds. + ) & + end=`date +%s` echo $TYPE Execution time was `expr $end - $start` seconds. ) & diff --git a/ASTROBOT/G1CopierYoutube.sh b/ASTROBOT/G1CopierYoutube.sh index feebe42d..59d01ce7 100755 --- a/ASTROBOT/G1CopierYoutube.sh +++ b/ASTROBOT/G1CopierYoutube.sh @@ -114,7 +114,7 @@ while read YID; PLAYLIST=$(yt-dlp --print "%(playlist)s" "${ZYURL}" | sed -r 's/\<./\U&/g' | sed 's/ //g') EXTRATAG="$CHANNEL $PLAYLIST" ## PREPARE VIDEO HTML5 CODE - TEXT="

"${TITLE}"

" + TEXT="

"${TITLE}"

" echo "Creating Youtube ${YID} tiddler : G1CopierYoutube !" echo $TEXT diff --git a/templates/video_chain.html b/templates/video_chain.html index 62e368c7..2a7557fd 100644 --- a/templates/video_chain.html +++ b/templates/video_chain.html @@ -1,16 +1,16 @@ - _PSEUDO_ VIDEO BLOG - Astroport One - - - + _PLAYER_ VIDEO BLOG - Astroport One + + +
- Astroport "ONE" _PSEUDO_ + Astroport "ONE" _PLAYER_
diff --git a/templates/video_first.html b/templates/video_first.html index 8d4d4b56..e66fa525 100644 --- a/templates/video_first.html +++ b/templates/video_first.html @@ -1,16 +1,16 @@ - _PSEUDO_ VIDEO BLOG - Astroport One - - - + _PLAYER_ VIDEO BLOG - Astroport One + + +
- Astroport "ONE" _PSEUDO_ + Astroport "ONE" _PLAYER_
diff --git a/tools/new_file_in_astroport.sh b/tools/new_file_in_astroport.sh index f00f871e..16c28764 100755 --- a/tools/new_file_in_astroport.sh +++ b/tools/new_file_in_astroport.sh @@ -428,7 +428,7 @@ then MIME=$(file --mime-type "$HOME/astroport/${TYPE}/${REFERENCE}/${file}" | rev | cut -d ' ' -f 1 | rev) REAL=$MIME if [[ $(echo "$MIME" | grep 'video') ]]; then - TEXT="

"${TITLE}"

+ TEXT="

"${TITLE}"

<\$button class='tc-tiddlylink'> <\$list filter='[tag[${CAT}]]'> <\$action-navigate \$to=<> \$scroll=no/> diff --git a/tools/vlc_webcam.sh b/tools/vlc_webcam.sh index 63ab2f3b..d97123b0 100755 --- a/tools/vlc_webcam.sh +++ b/tools/vlc_webcam.sh @@ -68,10 +68,10 @@ ffmpeg -i ~/.zen/tmp/MyVid.mp4 -vcodec libx264 -loglevel quiet ~/.zen/tmp/output ## Create short gif rm -f ~/.zen/tmp/screen.gif -ffmpeg -ss 1.0 -t 4.0 -i ~/.zen/tmp/output.mp4 ~/.zen/tmp/screen.gif +ffmpeg -ss 1.0 -t 4.0 -loglevel quiet -i ~/.zen/tmp/output.mp4 ~/.zen/tmp/screen.gif # Conversion HLS -ffmpeg -i ~/.zen/tmp/output.mp4 -codec: copy -start_number 0 -hls_time 10 -hls_list_size 0 -f hls ~/.zen/tmp/output.m3u8 +ffmpeg -loglevel quiet -i ~/.zen/tmp/output.mp4 -codec: copy -start_number 0 -hls_time 10 -hls_list_size 0 -f hls ~/.zen/tmp/output.m3u8 ## ADDING TO IPFS [[ ! -s ~/.zen/tmp/output.mp4 ]] && espeak "Sorry no video file found" && exit 1 @@ -94,26 +94,19 @@ if [[ $OLDID ]]; then else sed s/_IPFSID_/$IPFSID/g ${MY_PATH}/../templates/video_first.html > ~/.zen/game/players/${PLAYER}/vlog/${MOATS}.index.html fi -sed -i s/_DATE_/$(date -u "+%Y-%m-%d#%H:%M:%S")/g ~/.zen/game/players/${PLAYER}/vlog/${MOATS}.index.html -## TODO : THIS IS NOT CHANGING _PSEUDO_ WHY? -sed "s~_PSEUDO_~$PLAYER~g" ~/.zen/game/players/${PLAYER}/vlog/${MOATS}.index.html > ~/.zen/game/players/${PLAYER}/vlog/index.html +sed -i "s~_DATE_~$(date -u "+%Y-%m-%d#%H:%M:%S")~g" ~/.zen/game/players/${PLAYER}/vlog/${MOATS}.index.html +sed -i "s~_PLAYER_~$PLAYER~g" ~/.zen/game/players/${PLAYER}/vlog/${MOATS}.index.html -# Copy style & js -cp -R ${MY_PATH}/../templates/styles ~/.zen/game/players/${PLAYER}/vlog/ -cp -R ${MY_PATH}/../templates/js ~/.zen/game/players/${PLAYER}/vlog/ +mv ~/.zen/game/players/${PLAYER}/vlog/${MOATS}.index.html ~/.zen/game/players/${PLAYER}/vlog/index.html IPFSROOT=$(ipfs add -rHq ~/.zen/game/players/${PLAYER}/vlog | tail -n 1) echo $IPFSROOT > ~/.zen/game/players/${PLAYER}/.vlog.index -# TEMPLATE EVOLUTION -sed 's/_PSEUDO_/$PSEUDO/g' ~/.zen/game/players/${PLAYER}/vlog/${MOATS}.index.html > ~/.zen/game/players/${PLAYER}/vlog/index.html -sed 's/_IPFSROOT_/$IPFSROOT/g' ~/.zen/game/players/${PLAYER}/vlog/${MOATS}.index.html > ~/.zen/game/players/${PLAYER}/vlog/index.html -IPFSROOT=$(ipfs add -rHq ~/.zen/game/players/${PLAYER}/vlog | tail -n 1) -echo "NEW VIDEO http://127.0.0.1:8080/ipfs/$IPFSROOT" -## OUVERTURE VLOG CHAIN -# xdg-open "http://127.0.0.1:8080/ipfs/$IPFSROOT" +echo "NEW VIDEO http://$myIP:8080/ipfs/$IPFSROOT" -## AJOUT VIDEO ASTROPORT +########################### +## AJOUT VIDEO ASTROPORT TW +########################### MEDIAID=$(date -u +"%Y%m%d%H%M%S%4N") mkdir -p ~/astroport/video/vlog/ MEDIAKEY="VLOG_${PLAYER}_${MEDIAID}" @@ -124,14 +117,14 @@ ANIMH=$(ipfs add -q ~/.zen/tmp/screen.gif) REAL=$(file --mime-type "$HOME/astroport/video/vlog/$PLAYER_$MEDIAID.mp4" | cut -d ':' -f 2 | cut -d ' ' -f 2) ## TW not displaying direct ipfs video link (only image, pdf, ...) so insert