adapt fine tuning
This commit is contained in:
parent
7b94539e24
commit
b2834b0bc1
|
@ -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
|
${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 ]] \
|
[[ ! -s $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json ]] \
|
||||||
&& echo "NO PAYMENT HISTORY.......................... EXIT" \
|
&& echo "NO PAYMENT HISTORY.........................."
|
||||||
&& exit 1
|
|
||||||
##############################
|
##############################
|
||||||
##########################################################
|
##########################################################
|
||||||
############# CHECK FOR N1COMMANDs IN PAYMENT COMMENT
|
############# 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
|
> ~/.zen/tmp/${MOATS}/@tags.json 2>/dev/null ## Get tiddlers with not my email in it
|
||||||
|
|
||||||
[[ ! -s ~/.zen/tmp/${MOATS}/@tags.json ]] \
|
[[ ! -s ~/.zen/tmp/${MOATS}/@tags.json ]] \
|
||||||
&& echo "NO EXTRA @tags.json TIDDLERS TODAY" \
|
&& echo "NO EXTRA @tags.json TIDDLERS TODAY"
|
||||||
&& exit 0
|
|
||||||
|
|
||||||
# LOG
|
# LOG
|
||||||
cat ~/.zen/tmp/${MOATS}/@tags.json
|
cat ~/.zen/tmp/${MOATS}/@tags.json
|
||||||
|
@ -243,19 +241,19 @@ while read LINE; do
|
||||||
echo "---------------------------------- PalPAY for Tiddler"
|
echo "---------------------------------- PalPAY for Tiddler"
|
||||||
TCREATED=$(echo ${LINE} | jq -r .created)
|
TCREATED=$(echo ${LINE} | jq -r .created)
|
||||||
TTITLE=$(echo ${LINE} | jq -r .title)
|
TTITLE=$(echo ${LINE} | jq -r .title)
|
||||||
|
TTEXT=$(echo ${LINE} | jq -r '.text | match("/ipfs/[^\"\\s]+") | .string | first')
|
||||||
TTAGS=$(echo ${LINE} | jq -r .tags)
|
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"
|
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') ]] && TOPIN=$(echo ${LINE} | jq -r ._canonical_uri) ## Tiddler is exported to IPFS
|
||||||
[[ ! $(echo ${TOPIN} | grep '/ipfs') ]] \
|
[[ ! $(echo ${TOPIN} | grep '/ipfs') ]] && TOPIN=$(echo ${LINE} | jq -r '.text | match("/ipfs/[^\"\\s]+") | .string | first') ## Ket first /ipfs/ link from text field
|
||||||
&& echo "NOT COMPATIBLE ${TOPIN}" \
|
[[ ! $(echo ${TOPIN} | grep '/ipfs') ]] && echo "NOT COMPATIBLE ${TOPIN}" && TOPIN=""
|
||||||
&& TOPIN=""
|
|
||||||
|
|
||||||
echo "$TTITLE"
|
echo "$TTITLE"
|
||||||
|
|
||||||
## Count emails found
|
## Count extra emails found
|
||||||
emails=($(echo "$TTAGS" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
|
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[@]}
|
nb=${#emails[@]}
|
||||||
#~ zen=$(echo "scale=2; $nb / 10" | bc) ## / divide by 10 = 1 ZEN each
|
#~ 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}"
|
echo "export ASTROPORT=${ASTROPORT} ASTROTW=${ASTROTW} ASTROG1=${ASTROG1} ASTROMAIL=${EMAIL} ASTROFEED=${FEEDNS}"
|
||||||
[[ ${ASTROTW} == "" ]] && ASTROTW=${ASTRONAUTENS}
|
[[ ${ASTROTW} == "" ]] && ASTROTW=${ASTRONAUTENS}
|
||||||
|
|
||||||
|
echo "TOPIN=${TOPIN}"
|
||||||
if [[ ${TOPIN} && ${ASTROG1} && ${ASTROG1} != ${G1PUB} ]]; then
|
if [[ ${TOPIN} && ${ASTROG1} && ${ASTROG1} != ${G1PUB} ]]; then
|
||||||
|
|
||||||
##############################
|
##############################
|
||||||
|
@ -293,7 +292,7 @@ while read LINE; do
|
||||||
echo "<html><body>
|
echo "<html><body>
|
||||||
<h1>BRO. </h1>
|
<h1>BRO. </h1>
|
||||||
<br>
|
<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>(✜‿‿✜)
|
<br><b>${TTITLE}</b><br>(✜‿‿✜)
|
||||||
... Join <a href='https://qo-op.com'>UPlanet</a> link your TW5 !
|
... Join <a href='https://qo-op.com'>UPlanet</a> link your TW5 !
|
||||||
</body></html>" > ~/.zen/tmp/palpay.bro
|
</body></html>" > ~/.zen/tmp/palpay.bro
|
||||||
|
|
|
@ -34,8 +34,7 @@ CURRENT=$(readlink ~/.zen/game/players/.current | rev | cut -d '/' -f 1 | rev)
|
||||||
|
|
||||||
echo "RENEWING LOCAL UPLANET REPOSITORY (ADMIN=${CURRENT})
|
echo "RENEWING LOCAL UPLANET REPOSITORY (ADMIN=${CURRENT})
|
||||||
~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_*.??_*.??"
|
~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_*.??_*.??"
|
||||||
echo "CLEANING IPFSNODEID TW CACHE ~/.zen/tmp/${IPFSNODEID}/TW/"
|
|
||||||
rm -Rf ~/.zen/tmp/${IPFSNODEID}/TW/
|
|
||||||
|
|
||||||
## RUNING FOR ALL LOCAL PLAYERS
|
## RUNING FOR ALL LOCAL PLAYERS
|
||||||
for PLAYER in ${PLAYERONE[@]}; do
|
for PLAYER in ${PLAYERONE[@]}; do
|
||||||
|
@ -102,6 +101,7 @@ for PLAYER in ${PLAYERONE[@]}; do
|
||||||
mkdir -p ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/
|
mkdir -p ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/
|
||||||
|
|
||||||
################### GET LATEST TW
|
################### GET LATEST TW
|
||||||
|
rm -f ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html
|
||||||
echo "GETTING TW..."
|
echo "GETTING TW..."
|
||||||
####################################################################################################
|
####################################################################################################
|
||||||
ipfs --timeout 480s get --progress=false -o ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html /ipns/${ASTRONAUTENS}
|
ipfs --timeout 480s get --progress=false -o ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html /ipns/${ASTRONAUTENS}
|
||||||
|
|
|
@ -1,17 +1,31 @@
|
||||||
#!/bin/bash
|
#!/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 \
|
tiddlywiki --load $TW \
|
||||||
--deletetiddlers "${TITLE}" \
|
--deletetiddlers "$TITLE" \
|
||||||
--output ~/.zen/tmp --render "$:/core/save/all" "${MOATS}.html" "text/plain"
|
--output ~/.zen/tmp --render "$:/core/save/all" "${MOATS}.html" "text/plain"
|
||||||
|
|
||||||
[[ -s ~/.zen/tmp/${MOATS}.html ]] \
|
# Check if deletion was successful
|
||||||
&& cp ~/.zen/tmp/${MOATS}.html ${TW} \
|
if [[ -s ~/.zen/tmp/${MOATS}.html ]]; then
|
||||||
&& rm ~/.zen/tmp/${MOATS}.html \
|
echo "Tiddler deleted successfully."
|
||||||
|| { echo "ERROR - CANNOT IMPORT ${TIDDLER} in ${TW} - ERROR" && exit 1 }
|
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
|
exit 0
|
||||||
|
|
|
@ -1,18 +1,38 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Generate a unique timestamp
|
||||||
MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
|
MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
|
||||||
|
|
||||||
|
# Check if TiddlyWiki file exists
|
||||||
TW="$1"
|
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"
|
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} \
|
# Add created and modified fields to the Tiddler JSON file
|
||||||
--import ${TIDDLER} 'application/json' \
|
echo "Adding created and modified fields to ${TIDDLER}..."
|
||||||
--output ~/.zen/tmp \
|
jq '.[] + {created: $MOATS, modified: $MOATS}' --arg MOATS "$MOATS" "$TIDDLER" > "${TIDDLER}.tmp"
|
||||||
--render "$:/core/save/all" "${MOATS}.html" "text/plain"
|
|
||||||
|
|
||||||
[[ -s ~/.zen/tmp/${MOATS}.html ]] \
|
# Run TiddlyWiki import command
|
||||||
&& cp ~/.zen/tmp/${MOATS}.html ${TW} \
|
echo "Running TiddlyWiki import..."
|
||||||
&& rm ~/.zen/tmp/${MOATS}.html \
|
tiddlywiki --load "${TW}" \
|
||||||
|| { echo "ERROR - CANNOT IMPORT ${TIDDLER} in ${TW} - ERROR" && exit 1 }
|
--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."
|
||||||
|
|
Loading…
Reference in New Issue