Video Multimedia TW
This commit is contained in:
parent
8be2a24928
commit
2b0bd817cb
19
12345.sh
19
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}
|
mkdir -p ~/.zen/tmp/${IPFSNODEID}/${TYPE}/${NODEID}/${MOATS}
|
||||||
|
|
||||||
echo "TRYING 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 2s 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
|
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"
|
curl -m 12 -so ~/.zen/tmp/${IPFSNODEID}/${TYPE}/${NODEID}/${MOATS}/data.json "https://gateway.ipfs.io/ipfs/$DATAID"
|
||||||
fi
|
fi
|
||||||
if [[ ! -s ~/.zen/tmp/${IPFSNODEID}/${TYPE}/${NODEID}/${MOATS}/data.json ]]; then
|
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 &
|
echo "$HTTPCORS ERROR - $DATAID TIMEOUT - TRY AGAIN" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
|
||||||
else
|
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
|
ipfs add ~/.zen/tmp/${IPFSNODEID}/${TYPE}/${NODEID}/${MOATS}/data.json
|
||||||
fi
|
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 &
|
cat ~/.zen/tmp/coucou/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
|
||||||
|
|
||||||
|
## REPONSE ON IPFSNODEID
|
||||||
|
(
|
||||||
|
echo "¯\_༼<O͡〰o>༽_/¯ $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`
|
end=`date +%s`
|
||||||
echo $TYPE Execution time was `expr $end - $start` seconds.
|
echo $TYPE Execution time was `expr $end - $start` seconds.
|
||||||
) &
|
) &
|
||||||
|
|
|
@ -114,7 +114,7 @@ while read YID;
|
||||||
PLAYLIST=$(yt-dlp --print "%(playlist)s" "${ZYURL}" | sed -r 's/\<./\U&/g' | sed 's/ //g')
|
PLAYLIST=$(yt-dlp --print "%(playlist)s" "${ZYURL}" | sed -r 's/\<./\U&/g' | sed 's/ //g')
|
||||||
EXTRATAG="$CHANNEL $PLAYLIST"
|
EXTRATAG="$CHANNEL $PLAYLIST"
|
||||||
## PREPARE VIDEO HTML5 CODE
|
## PREPARE VIDEO HTML5 CODE
|
||||||
TEXT="<video controls width=360><source src='/ipfs/"${ILINK}"' type='"${MIME}"'></video><h1><a href='"${ZYURL}"'>"${TITLE}"</a></h1>"
|
TEXT="<video controls preload='none' width=100%><source src='/ipfs/"${ILINK}"' type='"${MIME}"'></video><h1><a href='"${ZYURL}"'>"${TITLE}"</a></h1>"
|
||||||
|
|
||||||
echo "Creating Youtube ${YID} tiddler : G1CopierYoutube !"
|
echo "Creating Youtube ${YID} tiddler : G1CopierYoutube !"
|
||||||
echo $TEXT
|
echo $TEXT
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title>_PSEUDO_ VIDEO BLOG - Astroport One</title>
|
<title>_PLAYER_ VIDEO BLOG - Astroport One</title>
|
||||||
<link rel="stylesheet" href="/ipfs/_IPFSROOT_/styles/decoration.css" type="text/css" />
|
<link rel="stylesheet" href="/ipfs/QmaCh8mywWfxkXF3JziFzqZS6yZFo3eNS5fSfnzJqdSQvX/decoration.css" type="text/css" />
|
||||||
<link rel="stylesheet" href="/ipfs/_IPFSROOT_/styles/layout.css" type="text/css" />
|
<link rel="stylesheet" href="/ipfs/QmaCh8mywWfxkXF3JziFzqZS6yZFo3eNS5fSfnzJqdSQvX/layout.css" type="text/css" />
|
||||||
<link rel="icon" type="image/png" href="/ipfs/_IPFSROOT_/styles/logo.png" />
|
<link rel="icon" type="image/png" href="/ipfs/QmaCh8mywWfxkXF3JziFzqZS6yZFo3eNS5fSfnzJqdSQvX/logo.png" />
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
<header>
|
<header>
|
||||||
<h6>
|
<h6>
|
||||||
<a href="https://qo-op.com">Astroport "<span>ONE</span>"</a> _PSEUDO_
|
<a href="http://qo-op.com:1234">Astroport "<span>ONE</span>"</a> _PLAYER_
|
||||||
</h6>
|
</h6>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title>_PSEUDO_ VIDEO BLOG - Astroport One</title>
|
<title>_PLAYER_ VIDEO BLOG - Astroport One</title>
|
||||||
<link rel="stylesheet" href="/ipfs/_IPFSROOT_/styles/decoration.css" type="text/css" />
|
<link rel="stylesheet" href="/ipfs/QmaCh8mywWfxkXF3JziFzqZS6yZFo3eNS5fSfnzJqdSQvX/decoration.css" type="text/css" />
|
||||||
<link rel="stylesheet" href="/ipfs/_IPFSROOT_/styles/layout.css" type="text/css" />
|
<link rel="stylesheet" href="/ipfs/QmaCh8mywWfxkXF3JziFzqZS6yZFo3eNS5fSfnzJqdSQvX/layout.css" type="text/css" />
|
||||||
<link rel="icon" type="image/png" href="/ipfs/_IPFSROOT_/styles/logo.png" />
|
<link rel="icon" type="image/png" href="/ipfs/QmaCh8mywWfxkXF3JziFzqZS6yZFo3eNS5fSfnzJqdSQvX/logo.png" />
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
<header>
|
<header>
|
||||||
<h6>
|
<h6>
|
||||||
<a href="https://qo-op.com">Astroport "<span>ONE</span>"</a> _PSEUDO_
|
<a href="http://qo-op.com:1234">Astroport "<span>ONE</span>"</a> _PLAYER_
|
||||||
</h6>
|
</h6>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
|
|
|
@ -428,7 +428,7 @@ then
|
||||||
MIME=$(file --mime-type "$HOME/astroport/${TYPE}/${REFERENCE}/${file}" | rev | cut -d ' ' -f 1 | rev)
|
MIME=$(file --mime-type "$HOME/astroport/${TYPE}/${REFERENCE}/${file}" | rev | cut -d ' ' -f 1 | rev)
|
||||||
REAL=$MIME
|
REAL=$MIME
|
||||||
if [[ $(echo "$MIME" | grep 'video') ]]; then
|
if [[ $(echo "$MIME" | grep 'video') ]]; then
|
||||||
TEXT="<video controls width=360><source src='/ipfs/"${IPFSID}"' type='"${MIME}"'></video><h1>"${TITLE}"</h1>
|
TEXT="<video controls preload='none' width=100%><source src='/ipfs/"${IPFSID}"' type='"${MIME}"'></video><h1>"${TITLE}"</h1>
|
||||||
<\$button class='tc-tiddlylink'>
|
<\$button class='tc-tiddlylink'>
|
||||||
<\$list filter='[tag[${CAT}]]'>
|
<\$list filter='[tag[${CAT}]]'>
|
||||||
<\$action-navigate \$to=<<currentTiddler>> \$scroll=no/>
|
<\$action-navigate \$to=<<currentTiddler>> \$scroll=no/>
|
||||||
|
|
|
@ -68,10 +68,10 @@ ffmpeg -i ~/.zen/tmp/MyVid.mp4 -vcodec libx264 -loglevel quiet ~/.zen/tmp/output
|
||||||
|
|
||||||
## Create short gif
|
## Create short gif
|
||||||
rm -f ~/.zen/tmp/screen.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
|
# 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
|
## ADDING TO IPFS
|
||||||
[[ ! -s ~/.zen/tmp/output.mp4 ]] && espeak "Sorry no video file found" && exit 1
|
[[ ! -s ~/.zen/tmp/output.mp4 ]] && espeak "Sorry no video file found" && exit 1
|
||||||
|
@ -94,26 +94,19 @@ if [[ $OLDID ]]; then
|
||||||
else
|
else
|
||||||
sed s/_IPFSID_/$IPFSID/g ${MY_PATH}/../templates/video_first.html > ~/.zen/game/players/${PLAYER}/vlog/${MOATS}.index.html
|
sed s/_IPFSID_/$IPFSID/g ${MY_PATH}/../templates/video_first.html > ~/.zen/game/players/${PLAYER}/vlog/${MOATS}.index.html
|
||||||
fi
|
fi
|
||||||
sed -i s/_DATE_/$(date -u "+%Y-%m-%d#%H:%M:%S")/g ~/.zen/game/players/${PLAYER}/vlog/${MOATS}.index.html
|
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 -i "s~_PLAYER_~$PLAYER~g" ~/.zen/game/players/${PLAYER}/vlog/${MOATS}.index.html
|
||||||
sed "s~_PSEUDO_~$PLAYER~g" ~/.zen/game/players/${PLAYER}/vlog/${MOATS}.index.html > ~/.zen/game/players/${PLAYER}/vlog/index.html
|
|
||||||
|
|
||||||
# Copy style & js
|
mv ~/.zen/game/players/${PLAYER}/vlog/${MOATS}.index.html ~/.zen/game/players/${PLAYER}/vlog/index.html
|
||||||
cp -R ${MY_PATH}/../templates/styles ~/.zen/game/players/${PLAYER}/vlog/
|
|
||||||
cp -R ${MY_PATH}/../templates/js ~/.zen/game/players/${PLAYER}/vlog/
|
|
||||||
|
|
||||||
IPFSROOT=$(ipfs add -rHq ~/.zen/game/players/${PLAYER}/vlog | tail -n 1)
|
IPFSROOT=$(ipfs add -rHq ~/.zen/game/players/${PLAYER}/vlog | tail -n 1)
|
||||||
echo $IPFSROOT > ~/.zen/game/players/${PLAYER}/.vlog.index
|
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"
|
echo "NEW VIDEO http://$myIP:8080/ipfs/$IPFSROOT"
|
||||||
## OUVERTURE VLOG CHAIN
|
|
||||||
# xdg-open "http://127.0.0.1:8080/ipfs/$IPFSROOT"
|
|
||||||
|
|
||||||
## AJOUT VIDEO ASTROPORT
|
###########################
|
||||||
|
## AJOUT VIDEO ASTROPORT TW
|
||||||
|
###########################
|
||||||
MEDIAID=$(date -u +"%Y%m%d%H%M%S%4N")
|
MEDIAID=$(date -u +"%Y%m%d%H%M%S%4N")
|
||||||
mkdir -p ~/astroport/video/vlog/
|
mkdir -p ~/astroport/video/vlog/
|
||||||
MEDIAKEY="VLOG_${PLAYER}_${MEDIAID}"
|
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)
|
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 <video> html tag
|
## TW not displaying direct ipfs video link (only image, pdf, ...) so insert <video> html tag
|
||||||
TEXT="<video controls width=360 preload='none' poster='/ipfs/"${ANIMH}"'><source src='/ipfs/"${IPFSID}"/output.mp4' type='"${REAL}"'></video><h1><a href='/ipfs/"${IPFSROOT}"'>"${PSEUDO}" / VLOG / </a></h1><br>
|
TEXT="<video controls preload='none' poster='/ipfs/"${ANIMH}"'><source src='/ipfs/"${IPFSID}"/output.mp4' type='"${REAL}"'></video><h1><a href='/ipfs/"${IPFSROOT}"'>"${MEDIAID}" / VLOG / </a></h1><br>
|
||||||
<\$button class='tc-tiddlylink'><\$list filter='[tag[G1Vlog]]'><\$action-navigate \$to=<<currentTiddler>> \$scroll=no/></\$list>Afficher tous les G1Vlog</\$button>"
|
<\$button class='tc-tiddlylink'><\$list filter='[tag[G1Vlog]]'><\$action-navigate \$to=<<currentTiddler>> \$scroll=no/></\$list>Afficher tous les G1Vlog</\$button>"
|
||||||
|
|
||||||
echo "## Creation json tiddler"
|
echo "## Creation json tiddler"
|
||||||
echo '[
|
echo '[
|
||||||
{
|
{
|
||||||
"text": "'${TEXT}'",
|
"text": "'${TEXT}'",
|
||||||
"title": "'VLOG ${MEDIAID}'",
|
"title": "'VLOG_${MEDIAID}'",
|
||||||
"type": "'text/vnd.tiddlywiki'",
|
"type": "'text/vnd.tiddlywiki'",
|
||||||
"mediakey": "'${MEDIAKEY}'",
|
"mediakey": "'${MEDIAKEY}'",
|
||||||
"mime": "'${REAL}'",
|
"mime": "'${REAL}'",
|
||||||
|
@ -185,7 +178,7 @@ else
|
||||||
echo "Une erreur est survenue lors de l'ajout du tiddler VLOG à votre TW"
|
echo "Une erreur est survenue lors de l'ajout du tiddler VLOG à votre TW"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "$PSEUDO TW VLOG : http://$myIP:8080/ipns/$ASTRONAUTENS/#:[tag[vlog]]"
|
echo "$PSEUDO TW VLOG : http://$myIP:8080/ipns/$ASTRONAUTENS/#VLOG_${MEDIAID}"
|
||||||
|
|
||||||
# ~/.zen/astrXbian/zen/new_file_in_astroport.sh "$HOME/astroport/video/${MEDIAID}/" "output.mp4" "$G1PUB"
|
# ~/.zen/astrXbian/zen/new_file_in_astroport.sh "$HOME/astroport/video/${MEDIAID}/" "output.mp4" "$G1PUB"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue