From b4686b48b65942588ff6f84adaed594a9f40b5f1 Mon Sep 17 00:00:00 2001 From: fred Date: Mon, 26 Dec 2022 22:05:32 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=A5BOX=20Edition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ASTROBOT/G1CopierYoutube.sh | 15 +++++++++------ templates/twdefault.html | 22 +++++++++++----------- tools/VISA.new.sh | 2 +- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/ASTROBOT/G1CopierYoutube.sh b/ASTROBOT/G1CopierYoutube.sh index f0ab59e2c..6bd6df447 100755 --- a/ASTROBOT/G1CopierYoutube.sh +++ b/ASTROBOT/G1CopierYoutube.sh @@ -148,16 +148,16 @@ if [[ ! ${TIDDLER} ]]; then [[ ! -f "$HOME/.zen/tmp/yt-dlp/$ZFILE" ]] && echo "No FILE -- CONTINUE --" && continue echo - ## LIMIT TO 12 MAXIMUM COPY PER DAY PER PLAYER - boucle=$((boucle+1)) - espeak "Video Number $boucle" > /dev/null 1>&2 - #################################################### echo "FOUND : ~/.zen/tmp/yt-dlp/$ZFILE" FILE_BSIZE=$(du -b "$HOME/.zen/tmp/yt-dlp/$ZFILE" | 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)" + ## LIMIT TO 12 MAXIMUM COPY PER DAY PER PLAYER + boucle=$((boucle+1)) + espeak "Video Number $boucle FILE SIZE = $FILE_SIZE" > /dev/null 1>&2 + #~ ## PREPARE FOR new_file_in_astroport.sh #~ mkdir -p "$HOME/Astroport/youtube/$YID" #~ REVSOURCE="$(echo "$ZYURL" | awk -F/ '{print $3}' | rev)_" @@ -221,13 +221,13 @@ if [[ ! ${TIDDLER} ]]; then ] ' > "$HOME/.zen/tmp/$IPFSNODEID/G1CopierYoutube/$PLAYER/$YID.TW.json" + else ################################################################### # TIDDLER WAS IN CACHE ################################################################### ## TODO : ADD EMAIL TO TAG ( TIMESTAMP & ADD SIGNATURE over existing ones) - [[ "${TIDDLER}" != "$HOME/.zen/tmp/$IPFSNODEID/G1CopierYoutube/$PLAYER/$YID.TW.json" ]] \ - && cp "${TIDDLER}" "$HOME/.zen/tmp/$IPFSNODEID/G1CopierYoutube/$PLAYER/$YID.TW.json" + cp "${TIDDLER}" "$HOME/.zen/game/$PLAYER/G1CopierYoutube/" fi @@ -249,6 +249,9 @@ fi # --deletetiddlers '[tag[CopierYoutube]]' ### REFRESH CHANNEL COPY if [[ -s ~/.zen/tmp/$IPFSNODEID/newindex.html ]]; then + ## COPY JSON TIDDLER TO PLAYER + cp "$HOME/.zen/tmp/$IPFSNODEID/G1CopierYoutube/$PLAYER/$YID.TW.json" "$HOME/.zen/game/$PLAYER/G1CopierYoutube/" + ln -s "$HOME/.zen/game/$PLAYER/G1CopierYoutube/$YID.TW.json" "$HOME/.zen/game/$PLAYER/G1CopierYoutube/$ZFILE.json" [[ $(diff ~/.zen/tmp/$IPFSNODEID/newindex.html ${INDEX} ) ]] && cp ~/.zen/tmp/$IPFSNODEID/newindex.html ${INDEX} && echo "===> Mise à jour ${INDEX}" else echo "Problem with tiddlywiki command. Missing ~/.zen/tmp/$IPFSNODEID/newindex.html" diff --git a/templates/twdefault.html b/templates/twdefault.html index 012c66a83..59ee926de 100644 --- a/templates/twdefault.html +++ b/templates/twdefault.html @@ -47,7 +47,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." /> -_PLAYER_ — TW — Astroport.ONE +_PLAYER_ — ♥BOX — Astroport.ONE @@ -141,6 +141,10 @@ Error message and password prompt

This TiddlyWiki contains the following tiddlers:

@@ -430,6 +430,8 @@ Error message and password prompt diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh index 0cf40adce..1e780e6c7 100755 --- a/tools/VISA.new.sh +++ b/tools/VISA.new.sh @@ -100,7 +100,7 @@ if [[ $SALT != "" && PEPPER != "" ]]; then fi ################################################################################ -TWMODEL="/ipfs/bafybeiel2pidycxek6jxjwat5wt4estn2fm4phhvhmlmmhq7dcltbp7nsi" +TWMODEL="/ipfs/bafybeibljznrdd6krwtwr4ot5vqovbz2ivnwojh74bqiu4oapeejx54ima" # ipfs cat $TWMODEL > templates/twdefault.html ##################################################### # NEW PLAYER ############### ################################################################################