adapt fine tuning

2024-04-22 19:17:32 +02:00 · 2024-04-22 19:17:32 +02:00 · b2834b0bc1
parent 7b94539e24
commit b2834b0bc1
4 changed files with 68 additions and 35 deletions
--- a/RUNTIME/G1PalPay.sh
+++ b/RUNTIME/G1PalPay.sh
@ -58,8 +58,7 @@ echo "(✜‿‿✜) G1PalPay : CHECK LAST 15 TX comment"
 ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey history -n 15 -j > $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json

 [[ ! -s $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json ]] \
-&& echo "NO PAYMENT HISTORY.......................... EXIT" \
-&& exit 1
+&& echo "NO PAYMENT HISTORY.........................."
 ##############################
 ##########################################################
 ############# CHECK FOR N1COMMANDs IN PAYMENT COMMENT
@ -226,8 +225,7 @@ cat ~/.zen/tmp/${MOATS}/today.${PLAYER}.tiddlers.json \
         > ~/.zen/tmp/${MOATS}/@tags.json 2>/dev/null ## Get tiddlers with not my email in it

 [[ ! -s ~/.zen/tmp/${MOATS}/@tags.json ]] \
-    && echo "NO EXTRA @tags.json TIDDLERS TODAY" \
-    && exit 0
+    && echo "NO EXTRA @tags.json TIDDLERS TODAY"

 # LOG
 cat ~/.zen/tmp/${MOATS}/@tags.json
@ -243,19 +241,19 @@ while read LINE; do
    echo "---------------------------------- PalPAY for Tiddler"
    TCREATED=$(echo ${LINE} | jq -r .created)
    TTITLE=$(echo ${LINE} | jq -r .title)
+    TTEXT=$(echo ${LINE} | jq -r '.text | match("/ipfs/[^\"\\s]+") | .string | first')
    TTAGS=$(echo ${LINE} | jq -r .tags)

-    ## PREPARE PINNING -
+    ## Extract "/ipfs/CID" from Tiddler - to pin TOPIN -
    TOPIN=$(echo ${LINE} | jq -r .ipfs) ## Tiddler produced by "Astroport Desktop"
-    [[ -z ${TOPIN} ]] && TOPIN=$(echo ${LINE} | jq -r ._canonical_uri) ## Tiddler is exported to IPFS
-    [[ ! $(echo ${TOPIN} | grep '/ipfs') ]] \
-        && echo "NOT COMPATIBLE ${TOPIN}" \
-        && TOPIN=""
+    [[ ! $(echo ${TOPIN} | grep '/ipfs') ]] && TOPIN=$(echo ${LINE} | jq -r ._canonical_uri) ## Tiddler is exported to IPFS
+    [[ ! $(echo ${TOPIN} | grep '/ipfs') ]] && TOPIN=$(echo ${LINE} | jq -r '.text | match("/ipfs/[^\"\\s]+") | .string | first') ## Ket first /ipfs/ link from text field
+    [[ ! $(echo ${TOPIN} | grep '/ipfs') ]] && echo "NOT COMPATIBLE ${TOPIN}" && TOPIN=""

    echo "$TTITLE"

-    ## Count emails found
-    emails=($(echo "$TTAGS" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
+    ## Count extra emails found
+    emails=($(echo "$TTAGS" | sed "s~${PLAYER}~ ~g" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
    nb=${#emails[@]}
    #~ zen=$(echo "scale=2; $nb / 10" | bc) ## / divide by 10 = 1 ZEN each

@ -271,6 +269,7 @@ while read LINE; do
    echo "export ASTROPORT=${ASTROPORT} ASTROTW=${ASTROTW} ASTROG1=${ASTROG1} ASTROMAIL=${EMAIL} ASTROFEED=${FEEDNS}"
    [[ ${ASTROTW} == "" ]] && ASTROTW=${ASTRONAUTENS}

+    echo "TOPIN=${TOPIN}"
    if [[ ${TOPIN} && ${ASTROG1} && ${ASTROG1} != ${G1PUB} ]]; then

        ##############################
@ -293,7 +292,7 @@ while read LINE; do
        echo "<html><body>
        <h1>BRO. </h1>
        <br>
-        <a href='${myIPFSGW}'/ipns/${ASTROTW}>${PLAYER}</a> has a shared Tiddler with you.
+        ${PLAYER} <a href='${myIPFSGW}'/ipns/${ASTROTW}#${TTITLE}>Tiddler</a>
        <br><b>${TTITLE}</b><br>(✜‿‿✜)
        ... Join <a href='https://qo-op.com'>UPlanet</a> link your TW5 !
        </body></html>" > ~/.zen/tmp/palpay.bro
--- a/RUNTIME/PLAYER.refresh.sh
+++ b/RUNTIME/PLAYER.refresh.sh
@ -34,8 +34,7 @@ CURRENT=$(readlink ~/.zen/game/players/.current | rev | cut -d '/' -f 1 | rev)

 echo "RENEWING LOCAL UPLANET REPOSITORY (ADMIN=${CURRENT})
 ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_*.??_*.??"
-echo "CLEANING IPFSNODEID TW CACHE ~/.zen/tmp/${IPFSNODEID}/TW/"
-rm -Rf ~/.zen/tmp/${IPFSNODEID}/TW/
+

 ## RUNING FOR ALL LOCAL PLAYERS
 for PLAYER in ${PLAYERONE[@]}; do
@ -102,6 +101,7 @@ for PLAYER in ${PLAYERONE[@]}; do
    mkdir -p ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/

    ################### GET LATEST TW
+    rm -f ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html
    echo "GETTING TW..."
    ####################################################################################################
    ipfs --timeout 480s get --progress=false -o ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html /ipns/${ASTRONAUTENS}
--- a/RUNTIME/TW/delete_tiddler.sh
+++ b/RUNTIME/TW/delete_tiddler.sh
@ -1,17 +1,31 @@
 #!/bin/bash
-MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
-TW="$1"
-[[ ! -s $TW ]] && echo "no TW found $TW" && exit 1
-TITLE="$2"
-[[ -s $TITLE || $TITTLE == "" ]] && echo "need a $TITTLE" && exit 1

+# Generate a unique timestamp
+MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
+
+# Check if TiddlyWiki file exists
+TW="$1"
+[[ ! -s $TW ]] && echo "No TiddlyWiki found at: $TW" && exit 1
+
+# Check if Tiddler title is provided
+TITLE="$2"
+[[ -z $TITLE ]] && echo "Need a Tiddler title" && exit 1
+
+# Delete the specified Tiddler from the TiddlyWiki
+echo "Deleting Tiddler: $TITLE"
 tiddlywiki --load $TW \
-   --deletetiddlers "${TITLE}" \
+   --deletetiddlers "$TITLE" \
   --output ~/.zen/tmp --render "$:/core/save/all" "${MOATS}.html" "text/plain"

-[[ -s ~/.zen/tmp/${MOATS}.html ]] \
-    && cp ~/.zen/tmp/${MOATS}.html ${TW} \
-    && rm ~/.zen/tmp/${MOATS}.html \
-    || { echo "ERROR - CANNOT IMPORT ${TIDDLER} in ${TW} - ERROR" && exit 1 }
+# Check if deletion was successful
+if [[ -s ~/.zen/tmp/${MOATS}.html ]]; then
+    echo "Tiddler deleted successfully."
+    cp ~/.zen/tmp/${MOATS}.html ${TW}
+    rm ~/.zen/tmp/${MOATS}.html
+    echo "Updated TiddlyWiki: ${TW}"
+else
+    echo "ERROR: Cannot delete $TITLE from $TW"
+    exit 1
+fi

 exit 0
--- a/RUNTIME/TW/import_tiddler.sh
+++ b/RUNTIME/TW/import_tiddler.sh
@ -1,18 +1,38 @@
 #!/bin/bash
+
+# Generate a unique timestamp
 MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
+
+# Check if TiddlyWiki file exists
 TW="$1"
-[[ ! -s $TW ]] && echo "no TW found $TW" && exit 1
+[[ ! -s $TW ]] && echo "No TiddlyWiki found at: $TW" && exit 1
+
+# Check if Tiddler JSON file exists
 TIDDLER="$2"
-[[ ! -s $TIDDLER || $TIDDLER == "" ]] && echo "need a $TIDDLER json file" && exit 1
+[[ ! -s $TIDDLER || $TIDDLER == "" ]] && echo "Need a Tiddler JSON file" && exit 1

-tiddlywiki --load ${TW} \
-    --import ${TIDDLER} 'application/json' \
-    --output ~/.zen/tmp \
-    --render "$:/core/save/all" "${MOATS}.html" "text/plain"
+# Add created and modified fields to the Tiddler JSON file
+echo "Adding created and modified fields to ${TIDDLER}..."
+jq '.[] + {created: $MOATS, modified: $MOATS}' --arg MOATS "$MOATS" "$TIDDLER" > "${TIDDLER}.tmp"

-[[ -s ~/.zen/tmp/${MOATS}.html ]] \
-    && cp ~/.zen/tmp/${MOATS}.html ${TW} \
-    && rm ~/.zen/tmp/${MOATS}.html \
-    || { echo "ERROR - CANNOT IMPORT ${TIDDLER} in ${TW} - ERROR" && exit 1 }
+# Run TiddlyWiki import command
+echo "Running TiddlyWiki import..."
+tiddlywiki --load "${TW}" \
+    --import "${TIDDLER}.tmp" 'application/json' \
+    --output /tmp \
+    --render '$:/core/save/all' "${MOATS}.html" 'text/plain'

-exit 0
+# Check if import was successful
+if [[ -s /tmp/${MOATS}.html ]]; then
+    echo "Import successful."
+    cp /tmp/${MOATS}.html ${TW}
+    rm /tmp/${MOATS}.html
+    rm "${TIDDLER}.tmp"
+    echo "Updated TiddlyWiki: ${TW}"
+    echo "Temporary file: /tmp/${MOATS}.html"
+else
+    echo "ERROR: Unable to import ${TIDDLER} into ${TW}"
+    exit 1
+fi
+
+echo "Done."