diff --git a/start.sh b/start.sh index e24fc244..522d6e0f 100755 --- a/start.sh +++ b/start.sh @@ -144,7 +144,7 @@ select fav in "${choices[@]}"; do "AJOUTER VLOG") echo "Lancement Webcam..." - ${MY_PATH}/tools/vlc_webcam.sh + ${MY_PATH}/tools/vlc_webcam.sh "$PLAYER" ;; "CREER UN VOEU") diff --git a/tools/new_file_in_astroport.sh b/tools/new_file_in_astroport.sh index 1286f3a7..213330dc 100755 --- a/tools/new_file_in_astroport.sh +++ b/tools/new_file_in_astroport.sh @@ -133,6 +133,12 @@ IPFS=$(ipfs add -wq "${path}${file}") IPFSREPFILEID=$(echo $IPFS | cut -d ' ' -f 2) IPFSID=$(echo $IPFS | cut -d ' ' -f 1) [[ $IPFSREPFILEID == "" ]] && echo "ipfs add ERROR" && exit 1 + + echo "FOUND : ${path}${file}" + FILE_BSIZE=$(du -b "${path}${file}" | awk '{print $1}') + FILE_SIZE=$(echo "${FILE_BSIZE}" | awk '{ split( "B KB MB GB TB PB" , v ); s=1; while( $1>1024 ){ $1/=1024; s++ } printf "%.2f %s", $1, v[s] }') + echo "FILE SIZE = $FILE_SIZE ($FILE_BSIZE octets)" + echo "-----------------------------------------------------------------" echo "IPFS $file DIRECTORY: ipfs ls /ipfs/$IPFSREPFILEID" echo "-----------------------------------------------------------------" @@ -442,6 +448,7 @@ then "type": "'${MIME}'", "mime": "'${REAL}'", "cat": "'${CAT}'", + "size": "'${FILE_BSIZE}'", "screenshot": "'${SCREENDIR}/screen.png'", "ipfsroot": "'${IPFSREPFILEID}'", "file": "'${file}'", diff --git a/tools/vlc_webcam.sh b/tools/vlc_webcam.sh index 765e61d4..3ebaf484 100755 --- a/tools/vlc_webcam.sh +++ b/tools/vlc_webcam.sh @@ -7,7 +7,24 @@ MY_PATH="`dirname \"$0\"`" # relative MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized ME="${0##*/}" -TS=$(date -u +%s%N | cut -b1-13) + +PLAYER="$1" + +[[ $PLAYER == "" ]] && PLAYER=$(cat ~/.zen/game/players/.current/.player 2>/dev/null) +[[ $PLAYER == "" ]] && espeak "ERROR PLAYER - EXIT" && exit 1 +PSEUDO=$(cat ~/.zen/game/players/$PLAYER/.pseudo 2>/dev/null) +[[ $G1PUB == "" ]] && G1PUB=$(cat ~/.zen/game/players/$PLAYER/.g1pub 2>/dev/null) +[[ $G1PUB == "" ]] && espeak "ERROR G1PUB - EXIT" && exit 1 + +ASTRONAUTENS=$(ipfs key list -l | grep -w $PLAYER | cut -d ' ' -f1) + +[[ ! $ASTRONAUTENS ]] && echo "$PLAYER CLEF IPNS INTROUVABLE - EXIT -" && exit 1 + +MOATS=$(date -u +"%Y%m%d%H%M%S%4N") +IPFSNODEID=$(cat ~/.ipfs/config | jq -r .Identity.PeerID) +myIP=$(hostname -I | awk '{print $1}' | head -n 1) + +mkdir -p ~/.zen/tmp/${IPFSNODEID}/vlog/${ASTRONAUTENS} screencapture(){ vlc \ @@ -25,16 +42,9 @@ fi mkdir -p ~/.zen/tmp/ -#echo "Voulez-vous enregistrer le bureau? ENTER sinon" -#read desktop -#[[ $desktop != "" ]] && screencapture -PLAYER=$(cat ~/.zen/game/players/.${PLAYER}/.player 2>/dev/null) || ( espeak "no player. EXIT" && exit 1 ) -PSEUDO=$(cat ~/.zen/game/players/.${PLAYER}/.pseudo 2>/dev/null) || ( espeak "no pseudo. EXIT" && exit 1 ) -G1PUB=$(cat ~/.zen/game/players/.${PLAYER}/.g1pub 2>/dev/null) || ( espeak "no g1 pub" && exit 1 ) - espeak "$PSEUDO" sleep 1 -espeak "Starting Video record. Press ENTER to stop." +espeak "Start Video recording. Press ENTER to stop !" # Find "input-slave" :: pactl list short sources # RECTIME=12 @@ -64,9 +74,14 @@ ffmpeg -ss 1.0 -t 4.0 -i ~/.zen/tmp/output.mp4 ~/.zen/tmp/screen.gif ffmpeg -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 IPFSID=$(ipfs add -wrHq ~/.zen/tmp/output.mp4 | tail -n 1) echo "NEW VIDEO FILE /ipfs/$IPFSID/output.mp4" +echo "FOUND : ~/.zen/tmp/output.mp4" + FILE_BSIZE=$(du -b "$HOME/.zen/tmp/output.mp4" | awk '{print $1}') + FILE_SIZE=$(echo "${FILE_BSIZE}" | awk '{ split( "B KB MB GB TB PB" , v ); s=1; while( $1>1024 ){ $1/=1024; s++ } printf "%.2f %s", $1, v[s] }') + espeak "FILE SIZE = $FILE_SIZE" espeak "OK" mkdir -p ~/.zen/game/players/.${PLAYER}/vlog @@ -74,13 +89,13 @@ mkdir -p ~/.zen/game/players/.${PLAYER}/vlog ## Creating new video chain index.html OLDID=$(cat ~/.zen/game/players/.${PLAYER}/.vlog.index 2>/dev/null) if [[ $OLDID ]]; then - sed s/_OLDID_/$OLDID/g ${MY_PATH}/../templates/video_chain.html > /tmp/index.html - sed -i s/_IPFSID_/$IPFSID/g /tmp/index.html + sed s/_OLDID_/$OLDID/g ${MY_PATH}/../templates/video_chain.html > ~/.zen/tmp/${IPFSNODEID}/vlog/${ASTRONAUTENS}/${MOATS}.index.html + sed -i s/_IPFSID_/$IPFSID/g ~/.zen/tmp/${IPFSNODEID}/vlog/${ASTRONAUTENS}/${MOATS}.index.html else - sed s/_IPFSID_/$IPFSID/g ${MY_PATH}/../templates/video_first.html > /tmp/index.html + sed s/_IPFSID_/$IPFSID/g ${MY_PATH}/../templates/video_first.html > ~/.zen/tmp/${IPFSNODEID}/vlog/${ASTRONAUTENS}/${MOATS}.index.html fi -sed -i s/_DATE_/$(date -u "+%Y-%m-%d#%H:%M:%S")/g /tmp/index.html -sed "s~_PSEUDO_~$PLAYER~g" /tmp/index.html > ~/.zen/game/players/.${PLAYER}/vlog/index.html +sed -i s/_DATE_/$(date -u "+%Y-%m-%d#%H:%M:%S")/g ~/.zen/tmp/${IPFSNODEID}/vlog/${ASTRONAUTENS}/${MOATS}.index.html +sed "s~_PSEUDO_~$PLAYER~g" ~/.zen/tmp/${IPFSNODEID}/vlog/${ASTRONAUTENS}/${MOATS}.index.html > ~/.zen/game/players/.${PLAYER}/vlog/index.html # Copy style & js cp -R ${MY_PATH}/../templates/styles ~/.zen/game/players/.${PLAYER}/vlog/ @@ -89,8 +104,8 @@ cp -R ${MY_PATH}/../templates/js ~/.zen/game/players/.${PLAYER}/vlog/ 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' /tmp/index.html > ~/.zen/game/players/.${PLAYER}/vlog/index.html -sed 's/_IPFSROOT_/$IPFSROOT/g' /tmp/index.html > ~/.zen/game/players/.${PLAYER}/vlog/index.html +sed 's/_PSEUDO_/$PSEUDO/g' ~/.zen/tmp/${IPFSNODEID}/vlog/${ASTRONAUTENS}/${MOATS}.index.html > ~/.zen/game/players/.${PLAYER}/vlog/index.html +sed 's/_IPFSROOT_/$IPFSROOT/g' ~/.zen/tmp/${IPFSNODEID}/vlog/${ASTRONAUTENS}/${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" @@ -108,7 +123,7 @@ 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