more is better but less is best
This commit is contained in:
parent
48df6ceb7a
commit
d397e94ec2
|
@ -184,7 +184,7 @@ while read LINE;
|
||||||
echo "COPYING MP3 (!-q)"
|
echo "COPYING MP3 (!-q)"
|
||||||
/usr/local/bin/yt-dlp -x --no-mtime --audio-format mp3 --embed-thumbnail --add-metadata \
|
/usr/local/bin/yt-dlp -x --no-mtime --audio-format mp3 --embed-thumbnail --add-metadata \
|
||||||
$BROWSER \
|
$BROWSER \
|
||||||
--download-archive ${HOME}/.zen/.yt-dlp.list \
|
--download-archive ${HOME}/.zen/.yt-dlp.mp3.list \
|
||||||
-o "${HOME}/.zen/tmp/yt-dlp/$TITLE.%(ext)s" "${ZYURL}"
|
-o "${HOME}/.zen/tmp/yt-dlp/$TITLE.%(ext)s" "${ZYURL}"
|
||||||
|
|
||||||
ZFILE="$TITLE.mp3"
|
ZFILE="$TITLE.mp3"
|
||||||
|
@ -239,7 +239,7 @@ while read LINE;
|
||||||
{{!!filesize}} - {{!!duration}} sec. - vtratio(dur) = {{!!vtratio}} ({{!!dur}})
|
{{!!filesize}} - {{!!duration}} sec. - vtratio(dur) = {{!!vtratio}} ({{!!dur}})
|
||||||
<br>
|
<br>
|
||||||
<h1><a target='_blank' href='"${ZYURL}"'>Web2.0 Tube</a></h1>"
|
<h1><a target='_blank' href='"${ZYURL}"'>Web2.0 Tube</a></h1>"
|
||||||
FOLDER="/MP4"
|
|
||||||
else
|
else
|
||||||
TEXT="<audio controls>
|
TEXT="<audio controls>
|
||||||
<source src='/ipfs/"${ILINK}"' type='"${MIME}"'>
|
<source src='/ipfs/"${ILINK}"' type='"${MIME}"'>
|
||||||
|
@ -249,7 +249,7 @@ while read LINE;
|
||||||
{{!!filesize}} - {{!!duration}} sec. - vtratio(dur) = {{!!vtratio}} ({{!!dur}})
|
{{!!filesize}} - {{!!duration}} sec. - vtratio(dur) = {{!!vtratio}} ({{!!dur}})
|
||||||
<br>
|
<br>
|
||||||
<h1><a target='_blank' href='"${ZYURL}"'>Web2.0 Tube</a></h1>"
|
<h1><a target='_blank' href='"${ZYURL}"'>Web2.0 Tube</a></h1>"
|
||||||
FOLDER="/MP3"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
end=`date +%s`
|
end=`date +%s`
|
||||||
|
@ -274,7 +274,7 @@ while read LINE;
|
||||||
"giftime": "'${PROBETIME}'",
|
"giftime": "'${PROBETIME}'",
|
||||||
"gifanime": "'/ipfs/${ANIMH}'",
|
"gifanime": "'/ipfs/${ANIMH}'",
|
||||||
"modified": "'${MOATS}'",
|
"modified": "'${MOATS}'",
|
||||||
"title": "'${FOLDER}/${ZFILE}'",
|
"title": "'${ZFILE}'",
|
||||||
"type": "'text/vnd.tiddlywiki'",
|
"type": "'text/vnd.tiddlywiki'",
|
||||||
"vtratio": "'${VTRATIO}'",
|
"vtratio": "'${VTRATIO}'",
|
||||||
"text": "'$TEXT'",
|
"text": "'$TEXT'",
|
||||||
|
|
|
@ -31,6 +31,7 @@ if [[ -d ~/.zen/tmp/${IPFSNODEID} ]]; then
|
||||||
|
|
||||||
## COPY STATION yt-dlp.list
|
## COPY STATION yt-dlp.list
|
||||||
cp $HOME/.zen/.yt-dlp.list ~/.zen/tmp/${IPFSNODEID}/yt-dlp.list
|
cp $HOME/.zen/.yt-dlp.list ~/.zen/tmp/${IPFSNODEID}/yt-dlp.list
|
||||||
|
cp $HOME/.zen/.yt-dlp.mp3.list ~/.zen/tmp/${IPFSNODEID}/yt-dlp.mp3.list
|
||||||
|
|
||||||
## COPY COINS VALUE OF THE DAY
|
## COPY COINS VALUE OF THE DAY
|
||||||
rm -Rf ~/.zen/tmp/${IPFSNODEID}/COINS/
|
rm -Rf ~/.zen/tmp/${IPFSNODEID}/COINS/
|
||||||
|
|
|
@ -489,7 +489,7 @@ for PLAYER in ${PLAYERONE[@]}; do
|
||||||
#### UPlanetZINE/day${days}/index.${lang}.html
|
#### UPlanetZINE/day${days}/index.${lang}.html
|
||||||
TODAYZINE="${MY_PATH}/../templates/UPlanetZINE/day${days}/index.${lang}.html"
|
TODAYZINE="${MY_PATH}/../templates/UPlanetZINE/day${days}/index.${lang}.html"
|
||||||
[[ ! -s ${TODAYZINE} ]] && TODAYZINE="${MY_PATH}/../templates/UPlanetZINE/day${days}/index.html"
|
[[ ! -s ${TODAYZINE} ]] && TODAYZINE="${MY_PATH}/../templates/UPlanetZINE/day${days}/index.html"
|
||||||
[[ -s ${TODAYZINE} ]] \
|
[[ -s ${TODAYZINE} && ${days} -gt 0 ]] \
|
||||||
&& echo "SENDING TODAYZINE DAY ${days} + mailjet TW import " \
|
&& echo "SENDING TODAYZINE DAY ${days} + mailjet TW import " \
|
||||||
&& ${MY_PATH}/../tools/mailjet.sh "${PLAYER}" ${TODAYZINE} "ZINE #${days}" "${HOME}/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html" \
|
&& ${MY_PATH}/../tools/mailjet.sh "${PLAYER}" ${TODAYZINE} "ZINE #${days}" "${HOME}/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html" \
|
||||||
|| echo "NO ZINE FOR DAY ${days}"
|
|| echo "NO ZINE FOR DAY ${days}"
|
||||||
|
|
|
@ -55,11 +55,15 @@ if [[ -s ~/.zen/tmp/${MOATS}/${SECTOR}.g1history.json ]]; then
|
||||||
todate=$(echo "$intercom" | rev | cut -d ':' -f 2 | rev)
|
todate=$(echo "$intercom" | rev | cut -d ':' -f 2 | rev)
|
||||||
echo "SYNC ~/.zen/tmp/${MOATS}/${UMAP} <=> $ipfs_pop"
|
echo "SYNC ~/.zen/tmp/${MOATS}/${UMAP} <=> $ipfs_pop"
|
||||||
|
|
||||||
## TODO: SECURITY PATCH : check payment emitter is from BOOSTRAP
|
|
||||||
if [[ $ipfs_pop ]]; then
|
if [[ $ipfs_pop ]]; then
|
||||||
echo "FOUND $todate MEMORY SLOT"
|
echo "FOUND $todate MEMORY SLOT"
|
||||||
g1pub=$(jq -r '.[] | select(.comment | test("UPLANET:'"${UMAP}"'")) | .pubkey' ~/.zen/tmp/${MOATS}/${SECTOR}.g1history.json | tail -n 1)
|
g1pub=$(jq -r '.[] | select(.comment | test("UPLANET:'"${UMAP}"'")) | .pubkey' ~/.zen/tmp/${MOATS}/${SECTOR}.g1history.json | tail -n 1)
|
||||||
echo "INFO :: $g1pub Memory updater"
|
echo "INFO :: $g1pub Memory updater"
|
||||||
|
|
||||||
|
## ADD SECURITY : check payment emitter is a "BOOSTRAP" (TODO)
|
||||||
|
nodeid=$(${MY_PATH}/../tools/g1_to_ipfs.py $g1pub)
|
||||||
|
|
||||||
|
|
||||||
ipfs --timeout 360s get --progress="false" -o ~/.zen/tmp/${MOATS}/${UMAP} $ipfs_pop \
|
ipfs --timeout 360s get --progress="false" -o ~/.zen/tmp/${MOATS}/${UMAP} $ipfs_pop \
|
||||||
&& ipfs pin rm $ipfs_pop \
|
&& ipfs pin rm $ipfs_pop \
|
||||||
|| echo "$ipfs_pop ERROR ... "
|
|| echo "$ipfs_pop ERROR ... "
|
||||||
|
@ -67,6 +71,12 @@ if [[ -s ~/.zen/tmp/${MOATS}/${SECTOR}.g1history.json ]]; then
|
||||||
echo "WARNING cannot revover any memory !!"
|
echo "WARNING cannot revover any memory !!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
## REMOVE PREVIOUS PIN (in case last one was not mine)
|
||||||
|
antecom=$(jq -r '.[] | select(.comment | test("UPLANET:'"${UMAP}"'")) | .comment' ~/.zen/tmp/${MOATS}/${SECTOR}.g1history.json | tail -n 2 | head -n 1)
|
||||||
|
ipfs_b=$(echo "$antecom" | rev | cut -d ':' -f 1 | rev)
|
||||||
|
[[ ! -z ${ipfs_b} ]] && ipfs pin rm ${ipfs_b}
|
||||||
|
|
||||||
|
|
||||||
else
|
else
|
||||||
echo "FATAL ERROR cannot access to SECTORG1PUB history"
|
echo "FATAL ERROR cannot access to SECTORG1PUB history"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
Loading…
Reference in New Issue