Merge branch 'upstream/master'

vtratio(dur)
dynamic VTRATIO
2022-12-20 18:42:52 +00:00 · 2022-12-19 22:10:47 +01:00 · 2022-12-19 19:37:35 +01:00 · 2022-12-19 19:30:41 +01:00 · 2022-12-19 19:26:23 +01:00 · 2022-12-19 19:19:56 +01:00
7 changed files with 54 additions and 36 deletions
--- a/12345.sh
+++ b/12345.sh
@ -18,7 +18,7 @@ IPFSNODEID=$(cat ~/.ipfs/config | jq -r .Identity.PeerID)
 myIP=$(hostname -I | awk '{print $1}' | head -n 1)
 isLAN=$(route -n |awk '$1 == "0.0.0.0" {print $2}' | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/")

-myDOMAINName=$(hostname -d 2>/dev/null) && [ -z "$myDOMAINName" ] && myDOMAINName=$(domainname 2>/dev/null)
+myDOMAINName=$(hostname -d 2>/dev/null) && [ -z "$myDOMAINName" ] && myDOMAINName=$(domainname 2>/dev/null) && [[ "$myDOMAINName" == "(none)" ]] && myDOMAINName="localhost"
 myHOSTName=$(hostname |sed 's/\.'${myDOMAINName}'$//')
 [ -n "$myDOMAINName" ] && myHOSTName="${myHOSTName}.${myDOMAINName}" || myDOMAINName=${myHOSTName#*.}
 [ -z "$myDOMAINName" ] && myDOMAINName=localhost
@ -183,6 +183,9 @@ while true; do
        APPNAME=$(urldecode ${arr[4]} | xargs)
        WHAT=$(urldecode ${arr[5]} | xargs)

+        OBJ=$(urldecode ${arr[6]} | xargs)
+        VAL=$(urldecode ${arr[7]} | xargs)
+
 ########## CHECK GET PARAM NAMES
 ###################################################################################################
    [[ ${arr[0]} == "" || ${arr[1]} == "" ]] && (echo "$HTTPCORS ERROR - MISSING DATA" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && continue
@ -251,7 +254,22 @@ while true; do
 ########################################
 ## APPNAME SELECTION  ########################
 ########################################
-        # MESSAGING
+
+##############################################
+# PAY
+##############################################
+        if [[ $APPNAME == "pay" ]]; then
+            echo "$APPNAME : $WHAT $OBJ $VAL"
+            echo "$HTTPCORS $(${MY_PATH}/tools/jaklis/jaklis.py -k ~/.zen/tmp/coucou/${MOATS}.secret.key -a ${WHAT} -p ${VAL} -c 'Bro')" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
+            end=`date +%s`
+            echo "(G_G ) PAYING Execution time was "`expr $end - $start` seconds.
+            continue
+        fi
+
+
+##############################################
+# MESSAGING
+##############################################
        if [[ $APPNAME == "messaging" || $APPNAME == "email" ]]; then

            ( ## & SUB PROCESS
@ -447,6 +465,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
            continue
        fi

+
 ##############################################
 # GETIPNS
 ##############################################
--- a/ASTROBOT/G1CopierYoutube.sh
+++ b/ASTROBOT/G1CopierYoutube.sh
@ -187,7 +187,9 @@ if [[ ! ${TIDDLER} ]]; then
        PLAYLIST=$(yt-dlp --cookies-from-browser $BROWSER --print "%(playlist)s" "${ZYURL}" | sed -r 's/\<./\U&/g' | sed 's/ //g')
        EXTRATAG="$CHANNEL $PLAYLIST"
        ## PREPARE VIDEO HTML5 CODE
-        TEXT="<video controls width=100% poster='/ipfs/"${ANIMH}"'><source src='/ipfs/"${ILINK}"' type='"${MIME}"'></video><br>{{!!duree}} - {{!!filesize}} - {{!!dur}} sec. (${$VTRATIO})<br><h1><a href='"${ZYURL}"'>"${TITLE}"</a></h1>"
+        TEXT="<video controls width=100% poster='/ipfs/"${ANIMH}"'><source src='/ipfs/"${ILINK}"' type='"${MIME}"'></video>
+        <br>{{!!filesize}} - {{!!duration}} sec. - vtratio(dur) =  {{!!vtratio}} ({{!!dur}})<br>
+        <h1><a href='"${ZYURL}"'>"${TITLE}"</a></h1>"

        end=`date +%s`
        dur=`expr $end - $start`
@ -206,10 +208,11 @@ if [[ ! ${TIDDLER} ]]; then
    "modified": "'${MOATS}'",
    "title": "'$ZFILE'",
    "type": "'text/vnd.tiddlywiki'",
-    "vtratio": "'${$VTRATIO}'",
+    "vtratio": "'${VTRATIO}'",
    "text": "'$TEXT'",
    "mime": "'${MIME}'",
    "size": "'${FILE_BSIZE}'",
+    "filesize": "'${FILE_SIZE}'",
    "sec": "'${SEC}'",
    "dur": "'${dur}'",
    "ipfs": "'/ipfs/${ILINK}'",
--- a/ajouter_media.sh
+++ b/ajouter_media.sh
@ -792,12 +792,12 @@ esac
 ########################################################################
 # Screen capture
 ########################################################################
-if [[ $(echo $DISPLAY | cut -d ':' -f 1) == "" ]]; then
-    espeak "beware taking screen shot in 3 seconds"
-    sleep 3
-    espeak "smile"
-    import -window root ~/.zen/tmp/screen.png
-fi
+#~ if [[ $(echo $DISPLAY | cut -d ':' -f 1) == "" ]]; then
+    #~ espeak "beware taking screen shot in 3 seconds"
+    #~ sleep 3
+    #~ espeak "smile"
+    #~ import -window root ~/.zen/tmp/screen.png
+#~ fi

 ###################################
 ### MOVING FILE TO ~/astroport ####
--- a/install.sh
+++ b/install.sh
@ -270,25 +270,21 @@ echo "#############################################"
 echo Execution time was `expr $end - $start` seconds.
 echo "#############################################"
 echo "%%%%%%%%%%%%%%%%%%%%"
-echo "VOUS AVEZ DEJA UN COMPTE SUR GCHANGE ?"
+echo "SI VOUS AVEZ DEJA UN COMPTE SUR GCHANGE ?"
 echo "          Saisissez vos identifiants"
 echo "%%%%%%%%%%%%%%%%%%%%"
-echo
-echo "Sinon Tapez 2 fois sur ENTRER."
-read SALT
-[[ $SALT ]] && echo "Entrez votre mot de passe : "
-read PEPPER
-[[ $SALT && ! $PEPPER ]] && SALT=""
-
-    ~/.zen/Astroport.ONE/tools/VISA.new.sh "$SALT" "$PEPPER"
-
 echo "#############################################"

 if  [[ $XDG_SESSION_TYPE == 'x11' ]]; then
 ##########################################################
-echo "EXPERIMENTAL ### INIT KODI PAR IPFS ## "
+    ## ON BOARDING PLAYER
+    ~/.zen/Astroport.ONE/start.sh &
+    xdg-open "http://astroport.localhost:1234"
+
+echo "EXPERIMENTAL ### RECOPIEZ VOS VSTREAM KODI DANS IPFS ## "
 read KODI
    if [[ $KODI ]]; then
+
    mkdir -p ~/.zen/tmp/kodi
    echo "PATIENTEZ..."
    ipfs get -o ~/.zen/tmp/kodi/ /ipfs/Qmc763hnsuTqSTDBNagmzca4fSzmcTp9kHoeosaPKC8QvK
@ -303,6 +299,8 @@ read KODI
    cd $MY_PATH

    fi
+
+
 fi

 else
--- a/templates/register.html
+++ b/templates/register.html
@ -2,7 +2,7 @@
 <html>
 <head>
    <meta charset="utf-8">
-    <title>[Astroport] TW :: Station _HOSTNAME_ (_IPFSNODEID_) </title>
+    <title>[Astroport] :: Station _HOSTNAME_ :: _IPFSNODEID_ </title>
    <link rel="icon" type="image/png" href="http://127.0.0.1:8080/ipfs/QmaCh8mywWfxkXF3JziFzqZS6yZFo3eNS5fSfnzJqdSQvX/logo.png" />
   <link rel="stylesheet" href="http://127.0.0.1:8080/ipfs/QmaCh8mywWfxkXF3JziFzqZS6yZFo3eNS5fSfnzJqdSQvX/decoration.css" type="text/css" />
    <link rel="stylesheet" href="http://127.0.0.1:8080/ipfs/QmaCh8mywWfxkXF3JziFzqZS6yZFo3eNS5fSfnzJqdSQvX/layout.css" type="text/css" />
@ -41,13 +41,12 @@ html {
 <b>--- Welkom - Mirë se vini -  Willkommen - Welkomma - Welcome - Marhaban - Bari galoust - Xos gelmissiniz - Welkum -  Ongi etorri- Swagata - Ansuf yiswen - ščyra zaprašajem - Kyo tzo pa eit - Ani kié - Dobro došli - Dagemer mat - Dobre doshŭl - Benvinguts - Ulihebisdi - Huān yíng - Karibu - Eoso eoseyo - Benvenuti - Bel bonjou - Bienvini - Dobrodošli - Velkommen - Bienvenido -  Bonvenon - Tere tulemast - Gabitê - Vælkomin -  Tervetuloa - Welkom - Wìllkòmme - Binvignut - Fàilte - Benvido - Croeso - Planvenguda - Mikouabô - Kalos irthate - -Eguahé porá - Baroukh habaim - ... ----</b><br>
 <h1>Astroport</h1>

-<h2>Internet Reboot !<br>Inscrivez-vous<br>
 <form id="formlink" action = "http://127.0.0.1:1234" method = "GET" enctype="application/x-www-form-urlencoded">
    <br>
-     <b>Activez votre BunkerBOX</b></br></br>
+     <b>Activez votre BunkedBOX</b></br></br>
        Phrase 1 : <input name=salt value=''></br>
        Phrase 2 : <input name=pepper value=''></br></br>
-        URL : <input name=g1pub value=''></br>
+        <b>COPIEZ VOS VIDEOS YOUTUBE FAVORITES</b><input type="hidden" name=g1pub value='https://www.youtube.com/playlist?list=LL'></br>
        Email : <input name=email value=''></br></br>
        <input type='submit' value='(☼‿‿☼)'>
 </form>
@ -60,9 +59,9 @@ html {
 <article>
    <div class="row justify-center">
            <h1 class="video-title">
-                <a href="https://git.p2p.legal/qo-op/Astroport.ONE" target="code">'ASTROŊAUTE' : Astroport.ONE - BunkerBOX edition -</a>. <br>
-                <a target="code" href="http://opencollective.com/monnaie-libre/projects/bunker-box">Copiez, conservez, partagez, diffusez vos chaines multimédia et json dans IPFS, entre amis!<br>
-                Prenez possession de votre TW. Rendez in-censurable, in-arrêtable la liberté d'expression.</a>
+                <a href="https://git.p2p.legal/qo-op/Astroport.ONE" target="code">CODE : Astroport.ONE - BunkedBOX edition -</a><br>
+                <a target="code" href="http://opencollective.com/monnaie-libre/projects/bunker-box">Recopiez les vidéos que vous aimez dans les capsules multimédia de votre TW, dans IPFS et les partager entre amis!
+                Devenez propriétaire d'INTERNET. Rendez in-censurable, in-arrêtable la liberté d'expression. LE PROJET!</a>
        </h1>
    </div>
 </article>
@ -108,7 +107,7 @@ Take possession of your TW. Make freedom of expression uncensurable, unstoppable

 <center>
    <h6>
-        <a href="http://madeinzion.org"> Made In Zion _\/_ </a> powered by <a href="http://astroport.com"><span>"</span>Astroport<span>"</span></a>
+        <a href="http://madeinzion.org">Made In Zion funded project _\/_ </a> powered by <a href="http://astroport.com"><span>"</span>Astroport<span>"</span></a>
    </h6>
 </center>
 </main>
--- a/tools/TW.cache.sh
+++ b/tools/TW.cache.sh
@ -13,13 +13,13 @@ IPFSNODEID=$(ipfs id -f='<id>\n') || ( echo "${ME} : IPFSNODEID MISSING" && exit
 TUBE=$(head -n 2 ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | tail -n 1 | cut -d ' ' -f 3)

            ## GETTING LAST TW via IPFS
-            echo "${ME} : IPFS : ipfs --timeout 12s cat  /ipns/${ASTRONAUTENS}"\
-            && ipfs --timeout 12s cat  /ipns/${ASTRONAUTENS} > ~/.zen/tmp/coucou/${MOATS}.astroindex.html
+            echo "${ME} : IPFS : ipfs --timeout 60s cat  /ipns/${ASTRONAUTENS}"\
+            && ipfs --timeout 60s cat  /ipns/${ASTRONAUTENS} > ~/.zen/tmp/coucou/${MOATS}.astroindex.html

             ## GETTING LAST TW via HTTP
            [[ ! -s ~/.zen/tmp/coucou/${MOATS}.astroindex.html ]] \
            && echo "${ME} : WWW : $TUBE/ipns/${ASTRONAUTENS}" \
-            && curl -m 12 -so ~/.zen/tmp/coucou/${MOATS}.astroindex.html "$TUBE/ipns/${ASTRONAUTENS}" \
+            && curl -m 60 -so ~/.zen/tmp/coucou/${MOATS}.astroindex.html "$TUBE/ipns/${ASTRONAUTENS}" \
            || curl -m 1 -so ~/.zen/tmp/${MOATS}.html "$TUBE/ipns/${ASTRONAUTENS}" ## Ask caching

        ### GOT TW !!
--- a/tools/new_file_in_astroport.sh
+++ b/tools/new_file_in_astroport.sh
@ -289,9 +289,8 @@ then
    if [[ $(echo "$MIME" | grep 'video') ]]; then

        TEXT="<video controls width=100% poster='/ipfs/"${ANIMH}"'><source src='/ipfs/"${IPFSID}"' type='"${MIME}"'></video>
-        <br>{{!!duree}} - {{!!filesize}} - {{!!dur}} sec. (${$VTRATIO})<br>
-        "$H1"
-        <h2>"$DESCRIPTION"</h2>"
+        <br>{{!!filesize}} - {{!!duration}} sec. - vtratio(dur) =  {{!!vtratio}} ({{!!dur}})<br>
+        "$H1"<h2>"$DESCRIPTION"</h2>"

        TidType="text/vnd.tiddlywiki" ## MAYBE REAL ONCE TW CAN SHOW ATTACHED IPFS VIDEO (TODO: TESTINGS)
        TAGS="G1${CAT} ${PLAYER} ${FILETAG} $SAISON $GENRE ipfs ${HASHTAG} $YEAR $MIME"
@ -320,7 +319,7 @@ then
    "duree": "'${DUREE}'",
    "duration": "'${DURATION}'",
    "giftime": "'${PROBETIME}'",
-    "vtratio": "'${$VTRATIO}'",
+    "vtratio": "'${VTRATIO}'",
    "gifanime": "'/ipfs/${ANIMH}'",
    "type": "'${TidType}'",
    "mime": "'${MIME}'",
Author	SHA1	Message	Date
Yann Autissier	7d9e432050	Merge branch 'upstream/master'	2022-12-20 18:42:52 +00:00
fred	7505eccd7c	vtratio(dur)	2022-12-19 22:10:47 +01:00
fred	e38414688f	dynamic VTRATIO	2022-12-19 19:37:35 +01:00
fred	057f9ae2f9	${$ !!!	2022-12-19 19:30:41 +01:00
fred	c024141c2a	$VTRATIO	2022-12-19 19:26:23 +01:00
fred	35ed8aedde	60 second timeout	2022-12-19 19:19:56 +01:00
fred	7012630e16	VTRATIO debug	2022-12-19 19:15:33 +01:00
fred	d744beb884	API 1234 PLAYER ONBOARDING + AppName=pay /?salt=${SALT}&pepper=${PEPPER}&pay=$MONTANT&to=$G1PUB	2022-12-19 18:26:03 +01:00