$VISITORCOINS G1
" ## WALLET VIERGE ########################################### if [[ $VISITORCOINS == "null" || ${ZEN} -lt 10 ]]; then - echo "!! LOW ZEN WALLET ZEN=${ZEN}" + DISPLAY="$DISPLAY +!! LOW ZEN WALLET ZEN=${ZEN}"
- echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect
- echo "LOW ZEN WARNING
- PLEASE CHARGE... only ${ZEN} ZEN
- " >> ~/.zen/tmp/${MOATS}/index.redirect
- (
- cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
- echo "BLURP null ZEN $PORT" && rm -Rf ~/.zen/tmp/${MOATS}
- ) &
- exit 0
+ DISPLAY="$DISPLAYLOW ZEN WARNING
+ PLEASE CHARGE... ${ZEN} ZEN"
fi
## WE SEND WALLET AMOUNT DISPLAY
(
- echo "$HTTPCORS ${ZCHK}:${QRCODE}
${DISPLAY}
SCAN WALLET" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
+ echo "$HTTPCORS ${QRCODE}:${ZCHK}:${DISPLAY}SCAN WALLET" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
echo "BLURP ${DISPLAY} $PORT" && rm -Rf ~/.zen/tmp/${MOATS}
) &
diff --git a/API/ZONE.sh b/API/ZONE.sh
index 0e44881d..a647ccbf 100755
--- a/API/ZONE.sh
+++ b/API/ZONE.sh
@@ -111,9 +111,9 @@ if [[ ! -s ~/.zen/tmp/${JSON} ]]; then
UMAPNS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${UMAP}.priv)
echo '{ "gridNumbers": [ {"lat": '${LAT}', "lon": '${LON}', "number": "(_'${LAT}'_'${LON}') = '${totnum}'", "ipns": "'${myIPFS}/ipns/${UMAPNS}/_index.html'" } ] }' \
- > ~/.zen/tmp/${MOATS}.http.grid
+ > ~/.zen/tmp/${MOATS}/http.grid
- cp ~/.zen/tmp/${MOATS}.http.grid ~/.zen/tmp/${JSON}
+ cp ~/.zen/tmp/${MOATS}/http.grid ~/.zen/tmp/${JSON}
cat ~/.zen/tmp/${JSON} >> ~/.zen/tmp/${MOATS}.http
cat ~/.zen/tmp/${MOATS}.http | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
@@ -127,44 +127,51 @@ if [[ ! -s ~/.zen/tmp/${JSON} ]]; then
##############################################
## SEARCH FOR UPLANET TW NUMBERS IN THAT ZONE
- echo '{ "gridNumbers": [' >> ~/.zen/tmp/${MOATS}.http.grid
+ echo '{ "gridNumbers": [' >> ~/.zen/tmp/${MOATS}/http.grid
for i in $(seq 0 9);
do
- ZLAT=$(echo "$LAT + ${DEG} * $i" | bc -l )
+
+ ZLAT=$(echo "$LAT + ${DEG} * $i" | bc -l)
[[ -z ${ZLAT} ]] && ZLAT=0
- # [[ ! $(echo $ZLAT | grep "\." ) ]] && ZLAT="${ZLAT}."
- for j in $(seq 0 9); do
- ZLON=$(echo "$LON + ${DEG} * $j" | bc -l )
- [[ -z ${ZLON} ]] && ZLON=0
- # [[ ! $(echo $ZLON | grep "\." ) ]] && ZLON="${ZLON}."
- echo " ## SEARCH UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*"
- swarmnum=$(ls -d ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
- nodenum=$(ls -d ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
- totnum=$(( swarmnum + nodenum ))
- [[ $totnum -gt 9 ]] && displaynum="X" || displaynum=$totnum
+ for j in $(seq 0 9); do
- [[ $displaynum != "0" ]] && echo '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${displaynum}'", "ipns": "'${ZONEINDEX}'" }
- ,' >> ~/.zen/tmp/${MOATS}.http.grid \
- && echo "${DEG} :" '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${totnum}'", "ipns": "'${ZONEINDEX}'" }'
+ ZLON=$(echo "$LON + ${DEG} * $j" | bc -l)
+ [[ -z ${ZLON} ]] && ZLON=0
+
+ echo " ## SEARCH UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*"
+ swarmnum=$(ls -d ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
+ nodenum=$(ls -d ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
+ totnum=$(( swarmnum + nodenum ))
+
+ [[ $totnum -gt 9 ]] && displaynum="X" || displaynum=$totnum
+
+ [[ $displaynum != "0" ]] && echo '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${displaynum}'", "ipns": "'${ZONEINDEX}'" }
+ ,' >> ~/.zen/tmp/${MOATS}/http.grid \
+ && echo "${DEG} :" '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${totnum}'", "ipns": "'${ZONEINDEX}'" }'
+
+ done
- done
done
- sed -i '$ d' ~/.zen/tmp/${MOATS}.http.grid ## REMOVE LAST ','
- echo ']}' >> ~/.zen/tmp/${MOATS}.http.grid
+ [[ ! $(cat ~/.zen/tmp/${MOATS}/http.grid | tail -n 1 | grep 'gridNumbers' ) ]] \
+ && sed -i '$ d' ~/.zen/tmp/${MOATS}/http.grid ## REMOVE LAST ','
+
+ echo ']}' >> ~/.zen/tmp/${MOATS}/http.grid
echo "## ADD TO CACHE ~/.zen/tmp/${JSON}"
- cp ~/.zen/tmp/${MOATS}.http.grid ~/.zen/tmp/${JSON}
+ cp ~/.zen/tmp/${MOATS}/http.grid ~/.zen/tmp/${JSON}
fi
+cat ~/.zen/tmp/${JSON} | jq -c
+
### SEND RESPONSE ON PORT
cat ~/.zen/tmp/${JSON} >> ~/.zen/tmp/${MOATS}.http
(
cat ~/.zen/tmp/${MOATS}.http | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
- rm ~/.zen/tmp/${MOATS}.http.grid 2>/dev/null
+ rm ~/.zen/tmp/${MOATS}/http.grid 2>/dev/null
rm ~/.zen/tmp/${MOATS}.http && echo "BLURP ${JSON}"
) &
## CLEANING
diff --git a/APY/addfile.sh b/APY/addfile.sh
new file mode 100755
index 00000000..76d0a9a4
--- /dev/null
+++ b/APY/addfile.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+# Usage: bash addfile.sh
+
+filename="$1"
+mime_type="$2"
+file_type="$3"
+
+echo "Processing file: $filename"
+echo "MIME type: $mime_type"
+echo "File type: $file_type"
+
+# Check file type and perform corresponding treatment
+case $file_type in
+ "video")
+ if [[ $mime_type == *"video"* ]]; then
+ # Video processing logic
+ echo "Video processing..."
+ # Add more processing steps as needed
+ else
+ echo "Invalid file type for video processing"
+ fi
+ ;;
+ "audio")
+ if [[ $mime_type == *"audio"* ]]; then
+ # Audio processing logic
+ echo "Audio processing..."
+ # Add more processing steps as needed
+ else
+ echo "Invalid file type for audio processing"
+ fi
+ ;;
+ "text")
+ if [[ $mime_type == *"text"* ]]; then
+ # Text processing logic
+ echo "Text processing..."
+ # Add more processing steps as needed
+ else
+ echo "Invalid file type for text processing"
+ fi
+ ;;
+ *)
+ echo "Unknown file type: $file_type"
+ ;;
+esac
+
+echo "File processing complete."
diff --git a/APY/upload_video.10101.py b/APY/upload_video.10101.py
new file mode 100755
index 00000000..ac6c78a5
--- /dev/null
+++ b/APY/upload_video.10101.py
@@ -0,0 +1,170 @@
+#!/usr/bin/python3
+from fastapi import FastAPI, File, UploadFile, Form, HTTPException
+from fastapi.responses import HTMLResponse, JSONResponse
+import subprocess
+import os
+import magic
+
+app = FastAPI()
+
+# HTML form for file upload
+html_form = """
+
+
+
+
+
+
+ File Upload and Processing
+
+
+
+
+
+ File Upload and Processing
+
+
+
+
+
+
+
+
+
+
+"""
+
+@app.get("/")
+async def read_root():
+ return HTMLResponse(content=html_form, status_code=200)
+
+def get_mime_type(file: UploadFile):
+ mime = magic.Magic()
+ mime_type = mime.from_buffer(file.file.read(1024))
+ return mime_type
+
+@app.post("/upload")
+async def create_upload_file(file: UploadFile = File(...), convert_to: str = Form(...)):
+ # Validate file size
+ max_file_size = 100 * 1024 * 1024 # 100MB
+ if file.file.__sizeof__() > max_file_size:
+ raise HTTPException(status_code=400, detail="File size exceeds the limit of 100MB")
+
+ # Check the file type
+ mime_type = get_mime_type(file)
+ print(f"Detected MIME type: {mime_type}")
+
+ # Save the uploaded file to a temporary location
+ with open(file.filename, "wb") as f:
+ f.write(file.file.read())
+
+ # Continue with the processing logic
+ # Run the post-treatment Bash script
+ logs = subprocess.run(["bash", "addfile.sh", file.filename, mime_type, convert_to], capture_output=True, text=True).stdout
+
+ # Optionally, you can remove the temporary file
+ os.remove(file.filename)
+
+ return JSONResponse(content={"filename": file.filename, "mime_type": mime_type, "convert_to": convert_to, "message": "File processed successfully.", "logs": logs})
+
+if __name__ == "__main__":
+ import uvicorn
+
+ uvicorn.run(app, host="0.0.0.0", port=10101)
diff --git a/ASTROBOT/G1Kodi.sh b/ASTROBOT/G1Kodi.sh
index b6dc4f71..8a262666 100755
--- a/ASTROBOT/G1Kodi.sh
+++ b/ASTROBOT/G1Kodi.sh
@@ -168,8 +168,26 @@ while read TITRE; do
TEXT="{{!!titre}} ({{!!year}})
{{!!sub}}
{{!!desc}}
Bande Annonce
- Envoyez un don. Recevez le lien vers ce film dans votre messagerie Cesium+
- ![](/ipfs/"${PV}")
"
+
+ Voir ce Film:
+ Installez Cesium+
+
+
+ 
+
+ 
+
+
+
+
+ Flashez, envoyez un don...
+
ce soir,
recevez le lien dans votre messagerie.
+
+
+
+
+
+ "
## MAKING TIDDLER
echo "## Creation json tiddler ~/.zen/game/players/${PLAYER}/G1Kodi/${TITLE}.dragdrop.json"
diff --git a/BOOSTRAP/OC_API.md b/BOOKS/OC_API.md
similarity index 100%
rename from BOOSTRAP/OC_API.md
rename to BOOKS/OC_API.md
diff --git a/BOOSTRAP/Readme.md b/BOOKS/Readme.md
similarity index 99%
rename from BOOSTRAP/Readme.md
rename to BOOKS/Readme.md
index ed8f275f..68017209 100644
--- a/BOOSTRAP/Readme.md
+++ b/BOOKS/Readme.md
@@ -123,7 +123,7 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEtg3SlRxtzsQnsBSeU83W0tvUyBTUvOU5lhjlbZVPCZ
* “keygen” https://git.p2p.legal/STI/Astroport.ONE/src/branch/master/tools/keygen
* “natools” https://git.p2p.legal/STI/Astroport.ONE/src/branch/master/tools/natools.py
* “jaklis” https://git.p2p.legal/axiom-team/jaklis
-* “ipfs” https://git.p2p.legal/STI/Astroport.ONE/src/branch/master/kubo_v0.20.0_linux.install.sh
+* “ipfs” https://git.p2p.legal/STI/Astroport.ONE/src/branch/master/install.kubo_v0.20.0_linux.sh
## ASTROPORT CREW GILET https://astroport.myspreadshop.fr/create?product=a68ad31e-d554-4c75-821d-97b00d6ad13f&view=2
diff --git a/BOOKS/TheNetworkState.pdf b/BOOKS/TheNetworkState.pdf
new file mode 100644
index 00000000..2dbda2a8
Binary files /dev/null and b/BOOKS/TheNetworkState.pdf differ
diff --git a/docker-compose.duniter.yml b/DOCKER/docker-compose.duniter.yml
similarity index 100%
rename from docker-compose.duniter.yml
rename to DOCKER/docker-compose.duniter.yml
diff --git a/docker-compose.duniter1.8.7.yml b/DOCKER/docker-compose.duniter1.8.7.yml
similarity index 100%
rename from docker-compose.duniter1.8.7.yml
rename to DOCKER/docker-compose.duniter1.8.7.yml
diff --git a/docker-compose.minetest.yml b/DOCKER/docker-compose.minetest.yml
similarity index 100%
rename from docker-compose.minetest.yml
rename to DOCKER/docker-compose.minetest.yml
diff --git a/docker-compose.nextcloud.yml b/DOCKER/docker-compose.nextcloud.yml
similarity index 100%
rename from docker-compose.nextcloud.yml
rename to DOCKER/docker-compose.nextcloud.yml
diff --git a/docker-compose.nginx-proxy-manager.yml b/DOCKER/docker-compose.nginx-proxy-manager.yml
similarity index 100%
rename from docker-compose.nginx-proxy-manager.yml
rename to DOCKER/docker-compose.nginx-proxy-manager.yml
diff --git a/README.md b/README.md
index 57f1977d..92cc9f0b 100644
--- a/README.md
+++ b/README.md
@@ -331,7 +331,9 @@ GET /?player=${PLAYER}&moa=json&tag=G1CopierYoutube
> CAN BE EXTENDED
## ➤ AMZQR : Create a QRCode with "amzqr"
-### ```/?amzqr=${URLENCODEDSTRING}&logo=${IMAGE}```
+```http
+GET /?amzqr=${URLENCODEDSTRING}&logo=${IMAGE}
+```
| Parameter | Type | Description |
| :-------- | :------- | :-------------------------------- |
@@ -341,7 +343,9 @@ GET /?player=${PLAYER}&moa=json&tag=G1CopierYoutube
check available "logo.png" in [./images](./images)
## ➤ UPLANET : Create Umap, AstroID & ZenCard for PLAYER (email)
-### ```/?uplanet=${PLAYER}&zlat=${LAT}&zlon=${LON}&g1pub=${PASS}```
+```http
+GET /?uplanet=${PLAYER}&zlat=${LAT}&zlon=${LON}&g1pub=${PASS}
+```
| Parameter | Type | Description |
| :-------- | :------- | :-------------------------------- |
@@ -473,12 +477,13 @@ http://localhost:12345 renvoi un json
| created | date de creation du document |
| hostname | nom de la station |
| myIP | adresse IP de la station |
-| ipfsnodeid | date de creation du document |
+| ipfsnodeid | Clef publique, balise de la station |
| astroport | Lien vers l'API de la station |
| g1station | Lien vers la carte PLAYER de la Station |
| g1swarm | Lien vers la carte des cartes des Stations de l'essaim |
-Afin de propager la carte chaque Stations lors de son raffraichissement de cache demande aux Boostrap de la récupérer
+Afin de propager la carte chaque station lors de son raffraichissement de cache
+ envoi aux Boostrap une requête pour upload (```/ipns/${IPFSNODEID}```)
```
STATION MAP UPSYNC : http://$nodeip:12345/?${GNODEID}=${IPFSNODEID}
```
diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh
index a49cc648..cb4f322c 100755
--- a/RUNTIME/PLAYER.refresh.sh
+++ b/RUNTIME/PLAYER.refresh.sh
@@ -176,8 +176,12 @@ for PLAYER in ${PLAYERONE[@]}; do
echo "LAT=${LAT}; LON=${LON}; UMAPNS=${UMAPNS}"
- ## TODATENS ################
- TODATENS=$(${MY_PATH}/../tools/keygen -t ipfs "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}")
+ ## UMAP TODATENS ################
+ ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/todate.ipfskey "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}"
+ ipfs key rm "_todate" 2>/dev/null
+ TODATENS=$(ipfs key import "_todate" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/todate.ipfskey)
+ ipfs key rm "_todate" 2>/dev/null
+
echo "GPS UMAP LINK UPDATE
${YESTERDATE} : ${myIPFS}${UMAPNS}
${TODATE} : ${myIPFS}/ipns/${TODATENS}"
diff --git a/RUNTIME/PLAYER.unplug.sh b/RUNTIME/PLAYER.unplug.sh
index c7c5da3e..d75fe782 100755
--- a/RUNTIME/PLAYER.unplug.sh
+++ b/RUNTIME/PLAYER.unplug.sh
@@ -6,7 +6,7 @@
################################################################################
MY_PATH="`dirname \"$0\"`" # relative
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
-. "$MY_PATH/my.sh"
+. "$MY_PATH/../tools/my.sh"
################################################################################
## UNPLUG A PLAYER FROM ASTROPORT STATION
############################################
@@ -61,7 +61,7 @@ mkdir -p ~/.zen/tmp/${MOATS}
[[ ! -z ${SECTORG1PUB} ]] \
&& echo "> PAY4SURE ZEN:${ALL} WALLET MOVE" \
- && ${MY_PATH}/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${ALL}" "${SECTORG1PUB}" "UNPLUG:${ALL}"
+ && ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${ALL}" "${SECTORG1PUB}" "UNPLUG:${ALL}"
## REMOVING PLAYER from ASTROPORT
ipfs key rm ${PLAYER}; ipfs key rm ${PLAYER}_feed; ipfs key rm ${G1PUB};
@@ -72,7 +72,7 @@ mkdir -p ~/.zen/tmp/${MOATS}
## SEND PLAYER LAST KNOW TW
TW=$(ipfs add -Hq ${INDEX} | tail -n 1)
-${MY_PATH}/../tools/mailjet.sh "${PLAYER}" "Hello ${PLAYER},
Your TW is unplugged from Astroport : TW ARCHIVE.
$(cat ~/.zen/game/players/${PLAYER}/secret.june)
May the force be with you.
" "BYE BYE MESSAGE"
+${MY_PATH}/../tools/mailjet.sh "${PLAYER}" "Ciao ${PLAYER},
Your TW is unplugged from Astroport : TW ARCHIVE.
$(cat ~/.zen/game/players/${PLAYER}/secret.june)
May the force be with you.
" "BYE BYE MESSAGE"
echo "PLAYER IPNS KEYS UNPLUGED"
echo "#######################"
diff --git a/RUNTIME/REGION.refresh.sh b/RUNTIME/REGION.refresh.sh
index 0ee6c396..e9bed14f 100755
--- a/RUNTIME/REGION.refresh.sh
+++ b/RUNTIME/REGION.refresh.sh
@@ -68,10 +68,10 @@ for REGION in ${REGIONS[@]}; do
# with bigger planetary swam will be closest "IA Station", or it could be choosen according to ZEN value...
STRAPS=($(cat ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | grep -Ev "#" | rev | cut -d '/' -f 1 | rev | grep -v '^[[:space:]]*$')) ## ${STRAPS[@]}
ACTINGNODE=${STRAPS[0]} ## FIST NODE IN STRAPS
- [[ "${ACTINGNODE}" != "${IPFSNODEID}" ]] \
- && echo ">> ACTINGNODE=${ACTINGNODE} is not ME - CONTINUE -" \
- && continue
-
+ if [[ "${ACTINGNODE}" != "${IPFSNODEID}" ]]; then
+ echo ">> ACTINGNODE=${ACTINGNODE} is not ME - CONTINUE -"
+ continue
+ fi
##############################################################
REGIONG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${REGION}" "${UPLANETNAME}${REGION}")
[[ ! ${REGIONG1PUB} ]] && echo "ERROR generating REGION WALLET" && exit 1
@@ -109,6 +109,10 @@ for REGION in ${REGIONS[@]}; do
done
NL=${#RSSNODE[@]}
+ echo "
+ ---
+ " >> ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL
+
## ADD SWARM SECTORS RSS WEEK
RSSWARM=($(ls ~/.zen/tmp/swarm/*/UPLANET/SECTORS/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*.week.rss.json 2>/dev/null))
for RSS in ${RSSWARM[@]}; do
@@ -144,15 +148,15 @@ for REGION in ${REGIONS[@]}; do
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
echo "Numbers of REGION WEEK RSS : ${NL} + ${NS} : "${TOTL}
- rm ~/.zen/tmp/${MOATS}/${REGION}/TODO
rm ~/.zen/tmp/${MOATS}/${REGION}/N_*
echo ${TOTL} > ~/.zen/tmp/${MOATS}/${REGION}/N_${TOTL}
RWEEKCID=$(ipfs add -q ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL 2>/dev/null)
if [[ ${RWEEKCID} ]]; then
- echo "" \
- > ~/.zen/tmp/${MOATS}/${REGION}/Journal._${REGLAT}_${REGLON}.redir.html
+ echo "" \
+ > ~/.zen/tmp/${MOATS}/${REGION}/Journal._${REGLAT}_${REGLON}.view.html
+
cp ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL \
~/.zen/tmp/${IPFSNODEID}/UPLANET/REGIONS/_${REGLAT}_${REGLON}/JOURNAL.md
fi
diff --git a/RUNTIME/RSS2UPlanetSECTORTW.sh b/RUNTIME/RSS2UPlanetSECTORTW.sh
index f17107bc..3feac280 100755
--- a/RUNTIME/RSS2UPlanetSECTORTW.sh
+++ b/RUNTIME/RSS2UPlanetSECTORTW.sh
@@ -39,6 +39,8 @@ ${RSS}
cat "${RSS}" | jq 'sort_by(.created) | reverse | .[]' | jq -r '.title' > ~/.zen/tmp/${MOATS}/${SECTOR}/tiddlers.list
##
gloops=0
+signatures=0
+
while read title; do
[[ ${floop} -gt 2 ]] && echo "0lder Tiddlers are similaR... BREAK" && break
@@ -54,7 +56,12 @@ while read title; do
[[ ! "${ISHERE}" ]] && echo "No Tiddler found in ${INDEX}"
- if [[ "${ISHERE}" != "${title}" ]]; then
+ TMPTAGS=$(cat ~/.zen/tmp/${MOATS}/TMP.json | jq -r .[].tags)
+ TMPEMAILS=($(echo "$TMPTAGS" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
+ TMPSIGN=${#TMPEMAILS[@]}
+ echo "INSIDE TIDDLER HAVE ${TMPSIGN} SIGNATURE(S)"
+
+ if [[ "${ISHERE}" != "${title}" || ${TMPSIGN} == 0 ]]; then
## NEW TIDDLER
echo "Importing Title: $title"
@@ -72,16 +79,17 @@ while read title; do
&& rm ${INDEX} \
&& mv ~/.zen/tmp/${MOATS}/${SECTOR}/${SECTOR}.html ${INDEX} \
&& ((gloops++)) \
- && echo "SECTOR (${gloops}) : ${title}"
+ && echo "SECTOR (${gloops}) : ${title}" \
+ && signatures=$((signatures + TMPSIGN))
[[ ! -s ${INDEX} ]] && echo "ERROR. TW did not ingest ~/.zen/tmp/${MOATS}/NEW.json" && exit 1
else
## SAME TIDDLER
- echo "TIDDLER WITH TITLE $title ALREADY EXISTS..."
+ echo "TIDDLER WITH TITLE $title and more than 1 signature ALREADY EXISTS..."
- cp -f ~/.zen/tmp/${MOATS}/TMP.json ~/.zen/tmp/${MOATS}/INSIDE.json
+ cat ~/.zen/tmp/${MOATS}/TMP.json | jq .[] > ~/.zen/tmp/${MOATS}/INSIDE.json
cat "${RSS}" | jq -rc ".[] | select(.title == \"$title\")" > ~/.zen/tmp/${MOATS}/NEW.json
if [[ ! $(diff ~/.zen/tmp/${MOATS}/NEW.json ~/.zen/tmp/${MOATS}/INSIDE.json) ]]; then
@@ -90,9 +98,15 @@ while read title; do
continue
fi
floop=1
-
+ echo
+ echo "=========== INSIDE.json"
+ cat ~/.zen/tmp/${MOATS}/INSIDE.json | jq -c
+ echo
+ echo "=========== NEW.json"
+ cat ~/.zen/tmp/${MOATS}/NEW.json | jq -c
+ echo
## TODO EXTEND CONTROL TO text & ipfs & _canonical_url
-## NEED SIGNATURES & TIDDLER SIMILARITY TO COME UP
+ ## NEED SIGNATURES & TIDDLER SIMILARITY TO COME UP
## CHECK FOR EMAIL SIGNATURES DIFFERENCE
NTAGS=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .tags)
@@ -128,7 +142,7 @@ while read title; do
# Print the results
echo "Common email addresses : ${COMMON[*]}"
echo "Email addresses unique in NEW Tiddler : ${NUNIQUE[*]}"
- echo "Email addresses unique in ACTUAL Tiddler : ${IUNIQUE[*]}"
+ echo "Email addresses unique in INSIDE Tiddler : ${IUNIQUE[*]}"
combined=("${IEMAILS[@]}" "${NEMAILS[@]}")
unique_combined=($(echo "${combined[@]}" | tr ' ' '\n' | sort -u))
@@ -168,7 +182,7 @@ To Refuse
Actual TiddlerEngage discussion about it...
LOW ZEN WARNING
- PLEASE CHARGE... only ${ZEN} ZEN - " >> ~/.zen/tmp/${MOATS}/index.redirect - ( - cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 - echo "BLURP null ZEN $PORT" && rm -Rf ~/.zen/tmp/${MOATS} - ) & - exit 0 + DISPLAY="$DISPLAYLOW ZEN WARNING
+ PLEASE CHARGE... ${ZEN} ZEN" fi ## WE SEND WALLET AMOUNT DISPLAY ( - echo "$HTTPCORS${ZCHK}:${QRCODE}
${DISPLAY}
SCAN WALLET" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
+ echo "$HTTPCORS ${QRCODE}:${ZCHK}:${DISPLAY}SCAN WALLET" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
echo "BLURP ${DISPLAY} $PORT" && rm -Rf ~/.zen/tmp/${MOATS}
) &
diff --git a/API/ZONE.sh b/API/ZONE.sh
index 0e44881d..a647ccbf 100755
--- a/API/ZONE.sh
+++ b/API/ZONE.sh
@@ -111,9 +111,9 @@ if [[ ! -s ~/.zen/tmp/${JSON} ]]; then
UMAPNS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${UMAP}.priv)
echo '{ "gridNumbers": [ {"lat": '${LAT}', "lon": '${LON}', "number": "(_'${LAT}'_'${LON}') = '${totnum}'", "ipns": "'${myIPFS}/ipns/${UMAPNS}/_index.html'" } ] }' \
- > ~/.zen/tmp/${MOATS}.http.grid
+ > ~/.zen/tmp/${MOATS}/http.grid
- cp ~/.zen/tmp/${MOATS}.http.grid ~/.zen/tmp/${JSON}
+ cp ~/.zen/tmp/${MOATS}/http.grid ~/.zen/tmp/${JSON}
cat ~/.zen/tmp/${JSON} >> ~/.zen/tmp/${MOATS}.http
cat ~/.zen/tmp/${MOATS}.http | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
@@ -127,44 +127,51 @@ if [[ ! -s ~/.zen/tmp/${JSON} ]]; then
##############################################
## SEARCH FOR UPLANET TW NUMBERS IN THAT ZONE
- echo '{ "gridNumbers": [' >> ~/.zen/tmp/${MOATS}.http.grid
+ echo '{ "gridNumbers": [' >> ~/.zen/tmp/${MOATS}/http.grid
for i in $(seq 0 9);
do
- ZLAT=$(echo "$LAT + ${DEG} * $i" | bc -l )
+
+ ZLAT=$(echo "$LAT + ${DEG} * $i" | bc -l)
[[ -z ${ZLAT} ]] && ZLAT=0
- # [[ ! $(echo $ZLAT | grep "\." ) ]] && ZLAT="${ZLAT}."
- for j in $(seq 0 9); do
- ZLON=$(echo "$LON + ${DEG} * $j" | bc -l )
- [[ -z ${ZLON} ]] && ZLON=0
- # [[ ! $(echo $ZLON | grep "\." ) ]] && ZLON="${ZLON}."
- echo " ## SEARCH UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*"
- swarmnum=$(ls -d ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
- nodenum=$(ls -d ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
- totnum=$(( swarmnum + nodenum ))
- [[ $totnum -gt 9 ]] && displaynum="X" || displaynum=$totnum
+ for j in $(seq 0 9); do
- [[ $displaynum != "0" ]] && echo '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${displaynum}'", "ipns": "'${ZONEINDEX}'" }
- ,' >> ~/.zen/tmp/${MOATS}.http.grid \
- && echo "${DEG} :" '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${totnum}'", "ipns": "'${ZONEINDEX}'" }'
+ ZLON=$(echo "$LON + ${DEG} * $j" | bc -l)
+ [[ -z ${ZLON} ]] && ZLON=0
+
+ echo " ## SEARCH UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*"
+ swarmnum=$(ls -d ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
+ nodenum=$(ls -d ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
+ totnum=$(( swarmnum + nodenum ))
+
+ [[ $totnum -gt 9 ]] && displaynum="X" || displaynum=$totnum
+
+ [[ $displaynum != "0" ]] && echo '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${displaynum}'", "ipns": "'${ZONEINDEX}'" }
+ ,' >> ~/.zen/tmp/${MOATS}/http.grid \
+ && echo "${DEG} :" '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${totnum}'", "ipns": "'${ZONEINDEX}'" }'
+
+ done
- done
done
- sed -i '$ d' ~/.zen/tmp/${MOATS}.http.grid ## REMOVE LAST ','
- echo ']}' >> ~/.zen/tmp/${MOATS}.http.grid
+ [[ ! $(cat ~/.zen/tmp/${MOATS}/http.grid | tail -n 1 | grep 'gridNumbers' ) ]] \
+ && sed -i '$ d' ~/.zen/tmp/${MOATS}/http.grid ## REMOVE LAST ','
+
+ echo ']}' >> ~/.zen/tmp/${MOATS}/http.grid
echo "## ADD TO CACHE ~/.zen/tmp/${JSON}"
- cp ~/.zen/tmp/${MOATS}.http.grid ~/.zen/tmp/${JSON}
+ cp ~/.zen/tmp/${MOATS}/http.grid ~/.zen/tmp/${JSON}
fi
+cat ~/.zen/tmp/${JSON} | jq -c
+
### SEND RESPONSE ON PORT
cat ~/.zen/tmp/${JSON} >> ~/.zen/tmp/${MOATS}.http
(
cat ~/.zen/tmp/${MOATS}.http | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
- rm ~/.zen/tmp/${MOATS}.http.grid 2>/dev/null
+ rm ~/.zen/tmp/${MOATS}/http.grid 2>/dev/null
rm ~/.zen/tmp/${MOATS}.http && echo "BLURP ${JSON}"
) &
## CLEANING
diff --git a/APY/addfile.sh b/APY/addfile.sh
new file mode 100755
index 00000000..76d0a9a4
--- /dev/null
+++ b/APY/addfile.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+# Usage: bash addfile.sh
+
+filename="$1"
+mime_type="$2"
+file_type="$3"
+
+echo "Processing file: $filename"
+echo "MIME type: $mime_type"
+echo "File type: $file_type"
+
+# Check file type and perform corresponding treatment
+case $file_type in
+ "video")
+ if [[ $mime_type == *"video"* ]]; then
+ # Video processing logic
+ echo "Video processing..."
+ # Add more processing steps as needed
+ else
+ echo "Invalid file type for video processing"
+ fi
+ ;;
+ "audio")
+ if [[ $mime_type == *"audio"* ]]; then
+ # Audio processing logic
+ echo "Audio processing..."
+ # Add more processing steps as needed
+ else
+ echo "Invalid file type for audio processing"
+ fi
+ ;;
+ "text")
+ if [[ $mime_type == *"text"* ]]; then
+ # Text processing logic
+ echo "Text processing..."
+ # Add more processing steps as needed
+ else
+ echo "Invalid file type for text processing"
+ fi
+ ;;
+ *)
+ echo "Unknown file type: $file_type"
+ ;;
+esac
+
+echo "File processing complete."
diff --git a/APY/upload_video.10101.py b/APY/upload_video.10101.py
new file mode 100755
index 00000000..ac6c78a5
--- /dev/null
+++ b/APY/upload_video.10101.py
@@ -0,0 +1,170 @@
+#!/usr/bin/python3
+from fastapi import FastAPI, File, UploadFile, Form, HTTPException
+from fastapi.responses import HTMLResponse, JSONResponse
+import subprocess
+import os
+import magic
+
+app = FastAPI()
+
+# HTML form for file upload
+html_form = """
+
+
+
+
+
+
+ File Upload and Processing
+
+
+
+
+
+ File Upload and Processing
+
+
+
+
+
+
+
+
+
+
+"""
+
+@app.get("/")
+async def read_root():
+ return HTMLResponse(content=html_form, status_code=200)
+
+def get_mime_type(file: UploadFile):
+ mime = magic.Magic()
+ mime_type = mime.from_buffer(file.file.read(1024))
+ return mime_type
+
+@app.post("/upload")
+async def create_upload_file(file: UploadFile = File(...), convert_to: str = Form(...)):
+ # Validate file size
+ max_file_size = 100 * 1024 * 1024 # 100MB
+ if file.file.__sizeof__() > max_file_size:
+ raise HTTPException(status_code=400, detail="File size exceeds the limit of 100MB")
+
+ # Check the file type
+ mime_type = get_mime_type(file)
+ print(f"Detected MIME type: {mime_type}")
+
+ # Save the uploaded file to a temporary location
+ with open(file.filename, "wb") as f:
+ f.write(file.file.read())
+
+ # Continue with the processing logic
+ # Run the post-treatment Bash script
+ logs = subprocess.run(["bash", "addfile.sh", file.filename, mime_type, convert_to], capture_output=True, text=True).stdout
+
+ # Optionally, you can remove the temporary file
+ os.remove(file.filename)
+
+ return JSONResponse(content={"filename": file.filename, "mime_type": mime_type, "convert_to": convert_to, "message": "File processed successfully.", "logs": logs})
+
+if __name__ == "__main__":
+ import uvicorn
+
+ uvicorn.run(app, host="0.0.0.0", port=10101)
diff --git a/ASTROBOT/G1Kodi.sh b/ASTROBOT/G1Kodi.sh
index b6dc4f71..8a262666 100755
--- a/ASTROBOT/G1Kodi.sh
+++ b/ASTROBOT/G1Kodi.sh
@@ -168,8 +168,26 @@ while read TITRE; do
TEXT="{{!!titre}} ({{!!year}})
{{!!sub}}
{{!!desc}}
Bande Annonce
- Envoyez un don. Recevez le lien vers ce film dans votre messagerie Cesium+
- "
+
+ Voir ce Film:
+ Installez Cesium+
+
+
+
+
+
+
+
+
+
+ Flashez, envoyez un don...
+
ce soir,
recevez le lien dans votre messagerie.
+
+
+
+
+
+ "
## MAKING TIDDLER
echo "## Creation json tiddler ~/.zen/game/players/${PLAYER}/G1Kodi/${TITLE}.dragdrop.json"
diff --git a/BOOSTRAP/OC_API.md b/BOOKS/OC_API.md
similarity index 100%
rename from BOOSTRAP/OC_API.md
rename to BOOKS/OC_API.md
diff --git a/BOOSTRAP/Readme.md b/BOOKS/Readme.md
similarity index 99%
rename from BOOSTRAP/Readme.md
rename to BOOKS/Readme.md
index ed8f275f..68017209 100644
--- a/BOOSTRAP/Readme.md
+++ b/BOOKS/Readme.md
@@ -123,7 +123,7 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEtg3SlRxtzsQnsBSeU83W0tvUyBTUvOU5lhjlbZVPCZ
* “keygen” https://git.p2p.legal/STI/Astroport.ONE/src/branch/master/tools/keygen
* “natools” https://git.p2p.legal/STI/Astroport.ONE/src/branch/master/tools/natools.py
* “jaklis” https://git.p2p.legal/axiom-team/jaklis
-* “ipfs” https://git.p2p.legal/STI/Astroport.ONE/src/branch/master/kubo_v0.20.0_linux.install.sh
+* “ipfs” https://git.p2p.legal/STI/Astroport.ONE/src/branch/master/install.kubo_v0.20.0_linux.sh
## ASTROPORT CREW GILET https://astroport.myspreadshop.fr/create?product=a68ad31e-d554-4c75-821d-97b00d6ad13f&view=2
diff --git a/BOOKS/TheNetworkState.pdf b/BOOKS/TheNetworkState.pdf
new file mode 100644
index 00000000..2dbda2a8
Binary files /dev/null and b/BOOKS/TheNetworkState.pdf differ
diff --git a/docker-compose.duniter.yml b/DOCKER/docker-compose.duniter.yml
similarity index 100%
rename from docker-compose.duniter.yml
rename to DOCKER/docker-compose.duniter.yml
diff --git a/docker-compose.duniter1.8.7.yml b/DOCKER/docker-compose.duniter1.8.7.yml
similarity index 100%
rename from docker-compose.duniter1.8.7.yml
rename to DOCKER/docker-compose.duniter1.8.7.yml
diff --git a/docker-compose.minetest.yml b/DOCKER/docker-compose.minetest.yml
similarity index 100%
rename from docker-compose.minetest.yml
rename to DOCKER/docker-compose.minetest.yml
diff --git a/docker-compose.nextcloud.yml b/DOCKER/docker-compose.nextcloud.yml
similarity index 100%
rename from docker-compose.nextcloud.yml
rename to DOCKER/docker-compose.nextcloud.yml
diff --git a/docker-compose.nginx-proxy-manager.yml b/DOCKER/docker-compose.nginx-proxy-manager.yml
similarity index 100%
rename from docker-compose.nginx-proxy-manager.yml
rename to DOCKER/docker-compose.nginx-proxy-manager.yml
diff --git a/README.md b/README.md
index 57f1977d..92cc9f0b 100644
--- a/README.md
+++ b/README.md
@@ -331,7 +331,9 @@ GET /?player=${PLAYER}&moa=json&tag=G1CopierYoutube
> CAN BE EXTENDED
## ➤ AMZQR : Create a QRCode with "amzqr"
-### ```/?amzqr=${URLENCODEDSTRING}&logo=${IMAGE}```
+```http
+GET /?amzqr=${URLENCODEDSTRING}&logo=${IMAGE}
+```
| Parameter | Type | Description |
| :-------- | :------- | :-------------------------------- |
@@ -341,7 +343,9 @@ GET /?player=${PLAYER}&moa=json&tag=G1CopierYoutube
check available "logo.png" in [./images](./images)
## ➤ UPLANET : Create Umap, AstroID & ZenCard for PLAYER (email)
-### ```/?uplanet=${PLAYER}&zlat=${LAT}&zlon=${LON}&g1pub=${PASS}```
+```http
+GET /?uplanet=${PLAYER}&zlat=${LAT}&zlon=${LON}&g1pub=${PASS}
+```
| Parameter | Type | Description |
| :-------- | :------- | :-------------------------------- |
@@ -473,12 +477,13 @@ http://localhost:12345 renvoi un json
| created | date de creation du document |
| hostname | nom de la station |
| myIP | adresse IP de la station |
-| ipfsnodeid | date de creation du document |
+| ipfsnodeid | Clef publique, balise de la station |
| astroport | Lien vers l'API de la station |
| g1station | Lien vers la carte PLAYER de la Station |
| g1swarm | Lien vers la carte des cartes des Stations de l'essaim |
-Afin de propager la carte chaque Stations lors de son raffraichissement de cache demande aux Boostrap de la récupérer
+Afin de propager la carte chaque station lors de son raffraichissement de cache
+ envoi aux Boostrap une requête pour upload (```/ipns/${IPFSNODEID}```)
```
STATION MAP UPSYNC : http://$nodeip:12345/?${GNODEID}=${IPFSNODEID}
```
diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh
index a49cc648..cb4f322c 100755
--- a/RUNTIME/PLAYER.refresh.sh
+++ b/RUNTIME/PLAYER.refresh.sh
@@ -176,8 +176,12 @@ for PLAYER in ${PLAYERONE[@]}; do
echo "LAT=${LAT}; LON=${LON}; UMAPNS=${UMAPNS}"
- ## TODATENS ################
- TODATENS=$(${MY_PATH}/../tools/keygen -t ipfs "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}")
+ ## UMAP TODATENS ################
+ ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/todate.ipfskey "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}"
+ ipfs key rm "_todate" 2>/dev/null
+ TODATENS=$(ipfs key import "_todate" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/todate.ipfskey)
+ ipfs key rm "_todate" 2>/dev/null
+
echo "GPS UMAP LINK UPDATE
${YESTERDATE} : ${myIPFS}${UMAPNS}
${TODATE} : ${myIPFS}/ipns/${TODATENS}"
diff --git a/RUNTIME/PLAYER.unplug.sh b/RUNTIME/PLAYER.unplug.sh
index c7c5da3e..d75fe782 100755
--- a/RUNTIME/PLAYER.unplug.sh
+++ b/RUNTIME/PLAYER.unplug.sh
@@ -6,7 +6,7 @@
################################################################################
MY_PATH="`dirname \"$0\"`" # relative
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
-. "$MY_PATH/my.sh"
+. "$MY_PATH/../tools/my.sh"
################################################################################
## UNPLUG A PLAYER FROM ASTROPORT STATION
############################################
@@ -61,7 +61,7 @@ mkdir -p ~/.zen/tmp/${MOATS}
[[ ! -z ${SECTORG1PUB} ]] \
&& echo "> PAY4SURE ZEN:${ALL} WALLET MOVE" \
- && ${MY_PATH}/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${ALL}" "${SECTORG1PUB}" "UNPLUG:${ALL}"
+ && ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${ALL}" "${SECTORG1PUB}" "UNPLUG:${ALL}"
## REMOVING PLAYER from ASTROPORT
ipfs key rm ${PLAYER}; ipfs key rm ${PLAYER}_feed; ipfs key rm ${G1PUB};
@@ -72,7 +72,7 @@ mkdir -p ~/.zen/tmp/${MOATS}
## SEND PLAYER LAST KNOW TW
TW=$(ipfs add -Hq ${INDEX} | tail -n 1)
-${MY_PATH}/../tools/mailjet.sh "${PLAYER}" "Hello ${PLAYER},
Your TW is unplugged from Astroport : TW ARCHIVE.
$(cat ~/.zen/game/players/${PLAYER}/secret.june)
May the force be with you.
" "BYE BYE MESSAGE"
+${MY_PATH}/../tools/mailjet.sh "${PLAYER}" "Ciao ${PLAYER},
Your TW is unplugged from Astroport : TW ARCHIVE.
$(cat ~/.zen/game/players/${PLAYER}/secret.june)
May the force be with you.
" "BYE BYE MESSAGE"
echo "PLAYER IPNS KEYS UNPLUGED"
echo "#######################"
diff --git a/RUNTIME/REGION.refresh.sh b/RUNTIME/REGION.refresh.sh
index 0ee6c396..e9bed14f 100755
--- a/RUNTIME/REGION.refresh.sh
+++ b/RUNTIME/REGION.refresh.sh
@@ -68,10 +68,10 @@ for REGION in ${REGIONS[@]}; do
# with bigger planetary swam will be closest "IA Station", or it could be choosen according to ZEN value...
STRAPS=($(cat ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | grep -Ev "#" | rev | cut -d '/' -f 1 | rev | grep -v '^[[:space:]]*$')) ## ${STRAPS[@]}
ACTINGNODE=${STRAPS[0]} ## FIST NODE IN STRAPS
- [[ "${ACTINGNODE}" != "${IPFSNODEID}" ]] \
- && echo ">> ACTINGNODE=${ACTINGNODE} is not ME - CONTINUE -" \
- && continue
-
+ if [[ "${ACTINGNODE}" != "${IPFSNODEID}" ]]; then
+ echo ">> ACTINGNODE=${ACTINGNODE} is not ME - CONTINUE -"
+ continue
+ fi
##############################################################
REGIONG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${REGION}" "${UPLANETNAME}${REGION}")
[[ ! ${REGIONG1PUB} ]] && echo "ERROR generating REGION WALLET" && exit 1
@@ -109,6 +109,10 @@ for REGION in ${REGIONS[@]}; do
done
NL=${#RSSNODE[@]}
+ echo "
+ ---
+ " >> ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL
+
## ADD SWARM SECTORS RSS WEEK
RSSWARM=($(ls ~/.zen/tmp/swarm/*/UPLANET/SECTORS/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*.week.rss.json 2>/dev/null))
for RSS in ${RSSWARM[@]}; do
@@ -144,15 +148,15 @@ for REGION in ${REGIONS[@]}; do
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
echo "Numbers of REGION WEEK RSS : ${NL} + ${NS} : "${TOTL}
- rm ~/.zen/tmp/${MOATS}/${REGION}/TODO
rm ~/.zen/tmp/${MOATS}/${REGION}/N_*
echo ${TOTL} > ~/.zen/tmp/${MOATS}/${REGION}/N_${TOTL}
RWEEKCID=$(ipfs add -q ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL 2>/dev/null)
if [[ ${RWEEKCID} ]]; then
- echo "" \
- > ~/.zen/tmp/${MOATS}/${REGION}/Journal._${REGLAT}_${REGLON}.redir.html
+ echo "" \
+ > ~/.zen/tmp/${MOATS}/${REGION}/Journal._${REGLAT}_${REGLON}.view.html
+
cp ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL \
~/.zen/tmp/${IPFSNODEID}/UPLANET/REGIONS/_${REGLAT}_${REGLON}/JOURNAL.md
fi
diff --git a/RUNTIME/RSS2UPlanetSECTORTW.sh b/RUNTIME/RSS2UPlanetSECTORTW.sh
index f17107bc..3feac280 100755
--- a/RUNTIME/RSS2UPlanetSECTORTW.sh
+++ b/RUNTIME/RSS2UPlanetSECTORTW.sh
@@ -39,6 +39,8 @@ ${RSS}
cat "${RSS}" | jq 'sort_by(.created) | reverse | .[]' | jq -r '.title' > ~/.zen/tmp/${MOATS}/${SECTOR}/tiddlers.list
##
gloops=0
+signatures=0
+
while read title; do
[[ ${floop} -gt 2 ]] && echo "0lder Tiddlers are similaR... BREAK" && break
@@ -54,7 +56,12 @@ while read title; do
[[ ! "${ISHERE}" ]] && echo "No Tiddler found in ${INDEX}"
- if [[ "${ISHERE}" != "${title}" ]]; then
+ TMPTAGS=$(cat ~/.zen/tmp/${MOATS}/TMP.json | jq -r .[].tags)
+ TMPEMAILS=($(echo "$TMPTAGS" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
+ TMPSIGN=${#TMPEMAILS[@]}
+ echo "INSIDE TIDDLER HAVE ${TMPSIGN} SIGNATURE(S)"
+
+ if [[ "${ISHERE}" != "${title}" || ${TMPSIGN} == 0 ]]; then
## NEW TIDDLER
echo "Importing Title: $title"
@@ -72,16 +79,17 @@ while read title; do
&& rm ${INDEX} \
&& mv ~/.zen/tmp/${MOATS}/${SECTOR}/${SECTOR}.html ${INDEX} \
&& ((gloops++)) \
- && echo "SECTOR (${gloops}) : ${title}"
+ && echo "SECTOR (${gloops}) : ${title}" \
+ && signatures=$((signatures + TMPSIGN))
[[ ! -s ${INDEX} ]] && echo "ERROR. TW did not ingest ~/.zen/tmp/${MOATS}/NEW.json" && exit 1
else
## SAME TIDDLER
- echo "TIDDLER WITH TITLE $title ALREADY EXISTS..."
+ echo "TIDDLER WITH TITLE $title and more than 1 signature ALREADY EXISTS..."
- cp -f ~/.zen/tmp/${MOATS}/TMP.json ~/.zen/tmp/${MOATS}/INSIDE.json
+ cat ~/.zen/tmp/${MOATS}/TMP.json | jq .[] > ~/.zen/tmp/${MOATS}/INSIDE.json
cat "${RSS}" | jq -rc ".[] | select(.title == \"$title\")" > ~/.zen/tmp/${MOATS}/NEW.json
if [[ ! $(diff ~/.zen/tmp/${MOATS}/NEW.json ~/.zen/tmp/${MOATS}/INSIDE.json) ]]; then
@@ -90,9 +98,15 @@ while read title; do
continue
fi
floop=1
-
+ echo
+ echo "=========== INSIDE.json"
+ cat ~/.zen/tmp/${MOATS}/INSIDE.json | jq -c
+ echo
+ echo "=========== NEW.json"
+ cat ~/.zen/tmp/${MOATS}/NEW.json | jq -c
+ echo
## TODO EXTEND CONTROL TO text & ipfs & _canonical_url
-## NEED SIGNATURES & TIDDLER SIMILARITY TO COME UP
+ ## NEED SIGNATURES & TIDDLER SIMILARITY TO COME UP
## CHECK FOR EMAIL SIGNATURES DIFFERENCE
NTAGS=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .tags)
@@ -128,7 +142,7 @@ while read title; do
# Print the results
echo "Common email addresses : ${COMMON[*]}"
echo "Email addresses unique in NEW Tiddler : ${NUNIQUE[*]}"
- echo "Email addresses unique in ACTUAL Tiddler : ${IUNIQUE[*]}"
+ echo "Email addresses unique in INSIDE Tiddler : ${IUNIQUE[*]}"
combined=("${IEMAILS[@]}" "${NEMAILS[@]}")
unique_combined=($(echo "${combined[@]}" | tr ' ' '\n' | sort -u))
@@ -168,7 +182,7 @@ To Refuse
Actual TiddlerEngage discussion about it...
SCAN WALLET" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
echo "BLURP ${DISPLAY} $PORT" && rm -Rf ~/.zen/tmp/${MOATS}
) &
diff --git a/API/ZONE.sh b/API/ZONE.sh
index 0e44881d..a647ccbf 100755
--- a/API/ZONE.sh
+++ b/API/ZONE.sh
@@ -111,9 +111,9 @@ if [[ ! -s ~/.zen/tmp/${JSON} ]]; then
UMAPNS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${UMAP}.priv)
echo '{ "gridNumbers": [ {"lat": '${LAT}', "lon": '${LON}', "number": "(_'${LAT}'_'${LON}') = '${totnum}'", "ipns": "'${myIPFS}/ipns/${UMAPNS}/_index.html'" } ] }' \
- > ~/.zen/tmp/${MOATS}.http.grid
+ > ~/.zen/tmp/${MOATS}/http.grid
- cp ~/.zen/tmp/${MOATS}.http.grid ~/.zen/tmp/${JSON}
+ cp ~/.zen/tmp/${MOATS}/http.grid ~/.zen/tmp/${JSON}
cat ~/.zen/tmp/${JSON} >> ~/.zen/tmp/${MOATS}.http
cat ~/.zen/tmp/${MOATS}.http | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
@@ -127,44 +127,51 @@ if [[ ! -s ~/.zen/tmp/${JSON} ]]; then
##############################################
## SEARCH FOR UPLANET TW NUMBERS IN THAT ZONE
- echo '{ "gridNumbers": [' >> ~/.zen/tmp/${MOATS}.http.grid
+ echo '{ "gridNumbers": [' >> ~/.zen/tmp/${MOATS}/http.grid
for i in $(seq 0 9);
do
- ZLAT=$(echo "$LAT + ${DEG} * $i" | bc -l )
+
+ ZLAT=$(echo "$LAT + ${DEG} * $i" | bc -l)
[[ -z ${ZLAT} ]] && ZLAT=0
- # [[ ! $(echo $ZLAT | grep "\." ) ]] && ZLAT="${ZLAT}."
- for j in $(seq 0 9); do
- ZLON=$(echo "$LON + ${DEG} * $j" | bc -l )
- [[ -z ${ZLON} ]] && ZLON=0
- # [[ ! $(echo $ZLON | grep "\." ) ]] && ZLON="${ZLON}."
- echo " ## SEARCH UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*"
- swarmnum=$(ls -d ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
- nodenum=$(ls -d ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
- totnum=$(( swarmnum + nodenum ))
- [[ $totnum -gt 9 ]] && displaynum="X" || displaynum=$totnum
+ for j in $(seq 0 9); do
- [[ $displaynum != "0" ]] && echo '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${displaynum}'", "ipns": "'${ZONEINDEX}'" }
- ,' >> ~/.zen/tmp/${MOATS}.http.grid \
- && echo "${DEG} :" '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${totnum}'", "ipns": "'${ZONEINDEX}'" }'
+ ZLON=$(echo "$LON + ${DEG} * $j" | bc -l)
+ [[ -z ${ZLON} ]] && ZLON=0
+
+ echo " ## SEARCH UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*"
+ swarmnum=$(ls -d ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
+ nodenum=$(ls -d ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
+ totnum=$(( swarmnum + nodenum ))
+
+ [[ $totnum -gt 9 ]] && displaynum="X" || displaynum=$totnum
+
+ [[ $displaynum != "0" ]] && echo '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${displaynum}'", "ipns": "'${ZONEINDEX}'" }
+ ,' >> ~/.zen/tmp/${MOATS}/http.grid \
+ && echo "${DEG} :" '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${totnum}'", "ipns": "'${ZONEINDEX}'" }'
+
+ done
- done
done
- sed -i '$ d' ~/.zen/tmp/${MOATS}.http.grid ## REMOVE LAST ','
- echo ']}' >> ~/.zen/tmp/${MOATS}.http.grid
+ [[ ! $(cat ~/.zen/tmp/${MOATS}/http.grid | tail -n 1 | grep 'gridNumbers' ) ]] \
+ && sed -i '$ d' ~/.zen/tmp/${MOATS}/http.grid ## REMOVE LAST ','
+
+ echo ']}' >> ~/.zen/tmp/${MOATS}/http.grid
echo "## ADD TO CACHE ~/.zen/tmp/${JSON}"
- cp ~/.zen/tmp/${MOATS}.http.grid ~/.zen/tmp/${JSON}
+ cp ~/.zen/tmp/${MOATS}/http.grid ~/.zen/tmp/${JSON}
fi
+cat ~/.zen/tmp/${JSON} | jq -c
+
### SEND RESPONSE ON PORT
cat ~/.zen/tmp/${JSON} >> ~/.zen/tmp/${MOATS}.http
(
cat ~/.zen/tmp/${MOATS}.http | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
- rm ~/.zen/tmp/${MOATS}.http.grid 2>/dev/null
+ rm ~/.zen/tmp/${MOATS}/http.grid 2>/dev/null
rm ~/.zen/tmp/${MOATS}.http && echo "BLURP ${JSON}"
) &
## CLEANING
diff --git a/APY/addfile.sh b/APY/addfile.sh
new file mode 100755
index 00000000..76d0a9a4
--- /dev/null
+++ b/APY/addfile.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+# Usage: bash addfile.sh
+
+filename="$1"
+mime_type="$2"
+file_type="$3"
+
+echo "Processing file: $filename"
+echo "MIME type: $mime_type"
+echo "File type: $file_type"
+
+# Check file type and perform corresponding treatment
+case $file_type in
+ "video")
+ if [[ $mime_type == *"video"* ]]; then
+ # Video processing logic
+ echo "Video processing..."
+ # Add more processing steps as needed
+ else
+ echo "Invalid file type for video processing"
+ fi
+ ;;
+ "audio")
+ if [[ $mime_type == *"audio"* ]]; then
+ # Audio processing logic
+ echo "Audio processing..."
+ # Add more processing steps as needed
+ else
+ echo "Invalid file type for audio processing"
+ fi
+ ;;
+ "text")
+ if [[ $mime_type == *"text"* ]]; then
+ # Text processing logic
+ echo "Text processing..."
+ # Add more processing steps as needed
+ else
+ echo "Invalid file type for text processing"
+ fi
+ ;;
+ *)
+ echo "Unknown file type: $file_type"
+ ;;
+esac
+
+echo "File processing complete."
diff --git a/APY/upload_video.10101.py b/APY/upload_video.10101.py
new file mode 100755
index 00000000..ac6c78a5
--- /dev/null
+++ b/APY/upload_video.10101.py
@@ -0,0 +1,170 @@
+#!/usr/bin/python3
+from fastapi import FastAPI, File, UploadFile, Form, HTTPException
+from fastapi.responses import HTMLResponse, JSONResponse
+import subprocess
+import os
+import magic
+
+app = FastAPI()
+
+# HTML form for file upload
+html_form = """
+
+
+
+
+
+
+ File Upload and Processing
+
+
+
+
+
+ File Upload and Processing
+
+
+
+
+
+
+
+
+
+
+"""
+
+@app.get("/")
+async def read_root():
+ return HTMLResponse(content=html_form, status_code=200)
+
+def get_mime_type(file: UploadFile):
+ mime = magic.Magic()
+ mime_type = mime.from_buffer(file.file.read(1024))
+ return mime_type
+
+@app.post("/upload")
+async def create_upload_file(file: UploadFile = File(...), convert_to: str = Form(...)):
+ # Validate file size
+ max_file_size = 100 * 1024 * 1024 # 100MB
+ if file.file.__sizeof__() > max_file_size:
+ raise HTTPException(status_code=400, detail="File size exceeds the limit of 100MB")
+
+ # Check the file type
+ mime_type = get_mime_type(file)
+ print(f"Detected MIME type: {mime_type}")
+
+ # Save the uploaded file to a temporary location
+ with open(file.filename, "wb") as f:
+ f.write(file.file.read())
+
+ # Continue with the processing logic
+ # Run the post-treatment Bash script
+ logs = subprocess.run(["bash", "addfile.sh", file.filename, mime_type, convert_to], capture_output=True, text=True).stdout
+
+ # Optionally, you can remove the temporary file
+ os.remove(file.filename)
+
+ return JSONResponse(content={"filename": file.filename, "mime_type": mime_type, "convert_to": convert_to, "message": "File processed successfully.", "logs": logs})
+
+if __name__ == "__main__":
+ import uvicorn
+
+ uvicorn.run(app, host="0.0.0.0", port=10101)
diff --git a/ASTROBOT/G1Kodi.sh b/ASTROBOT/G1Kodi.sh
index b6dc4f71..8a262666 100755
--- a/ASTROBOT/G1Kodi.sh
+++ b/ASTROBOT/G1Kodi.sh
@@ -168,8 +168,26 @@ while read TITRE; do
TEXT="{{!!titre}} ({{!!year}})
{{!!sub}}
{{!!desc}}
Bande Annonce
- Envoyez un don. Recevez le lien vers ce film dans votre messagerie Cesium+
- "
+
+ Voir ce Film:
+ Installez Cesium+
+
+
+
+
+
+
+
+
+
+ Flashez, envoyez un don...
+
ce soir,
recevez le lien dans votre messagerie.
+
+
+
+
+
+ "
## MAKING TIDDLER
echo "## Creation json tiddler ~/.zen/game/players/${PLAYER}/G1Kodi/${TITLE}.dragdrop.json"
diff --git a/BOOSTRAP/OC_API.md b/BOOKS/OC_API.md
similarity index 100%
rename from BOOSTRAP/OC_API.md
rename to BOOKS/OC_API.md
diff --git a/BOOSTRAP/Readme.md b/BOOKS/Readme.md
similarity index 99%
rename from BOOSTRAP/Readme.md
rename to BOOKS/Readme.md
index ed8f275f..68017209 100644
--- a/BOOSTRAP/Readme.md
+++ b/BOOKS/Readme.md
@@ -123,7 +123,7 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEtg3SlRxtzsQnsBSeU83W0tvUyBTUvOU5lhjlbZVPCZ
* “keygen” https://git.p2p.legal/STI/Astroport.ONE/src/branch/master/tools/keygen
* “natools” https://git.p2p.legal/STI/Astroport.ONE/src/branch/master/tools/natools.py
* “jaklis” https://git.p2p.legal/axiom-team/jaklis
-* “ipfs” https://git.p2p.legal/STI/Astroport.ONE/src/branch/master/kubo_v0.20.0_linux.install.sh
+* “ipfs” https://git.p2p.legal/STI/Astroport.ONE/src/branch/master/install.kubo_v0.20.0_linux.sh
## ASTROPORT CREW GILET https://astroport.myspreadshop.fr/create?product=a68ad31e-d554-4c75-821d-97b00d6ad13f&view=2
diff --git a/BOOKS/TheNetworkState.pdf b/BOOKS/TheNetworkState.pdf
new file mode 100644
index 00000000..2dbda2a8
Binary files /dev/null and b/BOOKS/TheNetworkState.pdf differ
diff --git a/docker-compose.duniter.yml b/DOCKER/docker-compose.duniter.yml
similarity index 100%
rename from docker-compose.duniter.yml
rename to DOCKER/docker-compose.duniter.yml
diff --git a/docker-compose.duniter1.8.7.yml b/DOCKER/docker-compose.duniter1.8.7.yml
similarity index 100%
rename from docker-compose.duniter1.8.7.yml
rename to DOCKER/docker-compose.duniter1.8.7.yml
diff --git a/docker-compose.minetest.yml b/DOCKER/docker-compose.minetest.yml
similarity index 100%
rename from docker-compose.minetest.yml
rename to DOCKER/docker-compose.minetest.yml
diff --git a/docker-compose.nextcloud.yml b/DOCKER/docker-compose.nextcloud.yml
similarity index 100%
rename from docker-compose.nextcloud.yml
rename to DOCKER/docker-compose.nextcloud.yml
diff --git a/docker-compose.nginx-proxy-manager.yml b/DOCKER/docker-compose.nginx-proxy-manager.yml
similarity index 100%
rename from docker-compose.nginx-proxy-manager.yml
rename to DOCKER/docker-compose.nginx-proxy-manager.yml
diff --git a/README.md b/README.md
index 57f1977d..92cc9f0b 100644
--- a/README.md
+++ b/README.md
@@ -331,7 +331,9 @@ GET /?player=${PLAYER}&moa=json&tag=G1CopierYoutube
> CAN BE EXTENDED
## ➤ AMZQR : Create a QRCode with "amzqr"
-### ```/?amzqr=${URLENCODEDSTRING}&logo=${IMAGE}```
+```http
+GET /?amzqr=${URLENCODEDSTRING}&logo=${IMAGE}
+```
| Parameter | Type | Description |
| :-------- | :------- | :-------------------------------- |
@@ -341,7 +343,9 @@ GET /?player=${PLAYER}&moa=json&tag=G1CopierYoutube
check available "logo.png" in [./images](./images)
## ➤ UPLANET : Create Umap, AstroID & ZenCard for PLAYER (email)
-### ```/?uplanet=${PLAYER}&zlat=${LAT}&zlon=${LON}&g1pub=${PASS}```
+```http
+GET /?uplanet=${PLAYER}&zlat=${LAT}&zlon=${LON}&g1pub=${PASS}
+```
| Parameter | Type | Description |
| :-------- | :------- | :-------------------------------- |
@@ -473,12 +477,13 @@ http://localhost:12345 renvoi un json
| created | date de creation du document |
| hostname | nom de la station |
| myIP | adresse IP de la station |
-| ipfsnodeid | date de creation du document |
+| ipfsnodeid | Clef publique, balise de la station |
| astroport | Lien vers l'API de la station |
| g1station | Lien vers la carte PLAYER de la Station |
| g1swarm | Lien vers la carte des cartes des Stations de l'essaim |
-Afin de propager la carte chaque Stations lors de son raffraichissement de cache demande aux Boostrap de la récupérer
+Afin de propager la carte chaque station lors de son raffraichissement de cache
+ envoi aux Boostrap une requête pour upload (```/ipns/${IPFSNODEID}```)
```
STATION MAP UPSYNC : http://$nodeip:12345/?${GNODEID}=${IPFSNODEID}
```
diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh
index a49cc648..cb4f322c 100755
--- a/RUNTIME/PLAYER.refresh.sh
+++ b/RUNTIME/PLAYER.refresh.sh
@@ -176,8 +176,12 @@ for PLAYER in ${PLAYERONE[@]}; do
echo "LAT=${LAT}; LON=${LON}; UMAPNS=${UMAPNS}"
- ## TODATENS ################
- TODATENS=$(${MY_PATH}/../tools/keygen -t ipfs "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}")
+ ## UMAP TODATENS ################
+ ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/todate.ipfskey "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}"
+ ipfs key rm "_todate" 2>/dev/null
+ TODATENS=$(ipfs key import "_todate" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/todate.ipfskey)
+ ipfs key rm "_todate" 2>/dev/null
+
echo "GPS UMAP LINK UPDATE
${YESTERDATE} : ${myIPFS}${UMAPNS}
${TODATE} : ${myIPFS}/ipns/${TODATENS}"
diff --git a/RUNTIME/PLAYER.unplug.sh b/RUNTIME/PLAYER.unplug.sh
index c7c5da3e..d75fe782 100755
--- a/RUNTIME/PLAYER.unplug.sh
+++ b/RUNTIME/PLAYER.unplug.sh
@@ -6,7 +6,7 @@
################################################################################
MY_PATH="`dirname \"$0\"`" # relative
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
-. "$MY_PATH/my.sh"
+. "$MY_PATH/../tools/my.sh"
################################################################################
## UNPLUG A PLAYER FROM ASTROPORT STATION
############################################
@@ -61,7 +61,7 @@ mkdir -p ~/.zen/tmp/${MOATS}
[[ ! -z ${SECTORG1PUB} ]] \
&& echo "> PAY4SURE ZEN:${ALL} WALLET MOVE" \
- && ${MY_PATH}/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${ALL}" "${SECTORG1PUB}" "UNPLUG:${ALL}"
+ && ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${ALL}" "${SECTORG1PUB}" "UNPLUG:${ALL}"
## REMOVING PLAYER from ASTROPORT
ipfs key rm ${PLAYER}; ipfs key rm ${PLAYER}_feed; ipfs key rm ${G1PUB};
@@ -72,7 +72,7 @@ mkdir -p ~/.zen/tmp/${MOATS}
## SEND PLAYER LAST KNOW TW
TW=$(ipfs add -Hq ${INDEX} | tail -n 1)
-${MY_PATH}/../tools/mailjet.sh "${PLAYER}" "Hello ${PLAYER},
Your TW is unplugged from Astroport : TW ARCHIVE.
$(cat ~/.zen/game/players/${PLAYER}/secret.june)
May the force be with you.
" "BYE BYE MESSAGE"
+${MY_PATH}/../tools/mailjet.sh "${PLAYER}" "Ciao ${PLAYER},
Your TW is unplugged from Astroport : TW ARCHIVE.
$(cat ~/.zen/game/players/${PLAYER}/secret.june)
May the force be with you.
" "BYE BYE MESSAGE"
echo "PLAYER IPNS KEYS UNPLUGED"
echo "#######################"
diff --git a/RUNTIME/REGION.refresh.sh b/RUNTIME/REGION.refresh.sh
index 0ee6c396..e9bed14f 100755
--- a/RUNTIME/REGION.refresh.sh
+++ b/RUNTIME/REGION.refresh.sh
@@ -68,10 +68,10 @@ for REGION in ${REGIONS[@]}; do
# with bigger planetary swam will be closest "IA Station", or it could be choosen according to ZEN value...
STRAPS=($(cat ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | grep -Ev "#" | rev | cut -d '/' -f 1 | rev | grep -v '^[[:space:]]*$')) ## ${STRAPS[@]}
ACTINGNODE=${STRAPS[0]} ## FIST NODE IN STRAPS
- [[ "${ACTINGNODE}" != "${IPFSNODEID}" ]] \
- && echo ">> ACTINGNODE=${ACTINGNODE} is not ME - CONTINUE -" \
- && continue
-
+ if [[ "${ACTINGNODE}" != "${IPFSNODEID}" ]]; then
+ echo ">> ACTINGNODE=${ACTINGNODE} is not ME - CONTINUE -"
+ continue
+ fi
##############################################################
REGIONG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${REGION}" "${UPLANETNAME}${REGION}")
[[ ! ${REGIONG1PUB} ]] && echo "ERROR generating REGION WALLET" && exit 1
@@ -109,6 +109,10 @@ for REGION in ${REGIONS[@]}; do
done
NL=${#RSSNODE[@]}
+ echo "
+ ---
+ " >> ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL
+
## ADD SWARM SECTORS RSS WEEK
RSSWARM=($(ls ~/.zen/tmp/swarm/*/UPLANET/SECTORS/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*.week.rss.json 2>/dev/null))
for RSS in ${RSSWARM[@]}; do
@@ -144,15 +148,15 @@ for REGION in ${REGIONS[@]}; do
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
echo "Numbers of REGION WEEK RSS : ${NL} + ${NS} : "${TOTL}
- rm ~/.zen/tmp/${MOATS}/${REGION}/TODO
rm ~/.zen/tmp/${MOATS}/${REGION}/N_*
echo ${TOTL} > ~/.zen/tmp/${MOATS}/${REGION}/N_${TOTL}
RWEEKCID=$(ipfs add -q ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL 2>/dev/null)
if [[ ${RWEEKCID} ]]; then
- echo "" \
- > ~/.zen/tmp/${MOATS}/${REGION}/Journal._${REGLAT}_${REGLON}.redir.html
+ echo "" \
+ > ~/.zen/tmp/${MOATS}/${REGION}/Journal._${REGLAT}_${REGLON}.view.html
+
cp ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL \
~/.zen/tmp/${IPFSNODEID}/UPLANET/REGIONS/_${REGLAT}_${REGLON}/JOURNAL.md
fi
diff --git a/RUNTIME/RSS2UPlanetSECTORTW.sh b/RUNTIME/RSS2UPlanetSECTORTW.sh
index f17107bc..3feac280 100755
--- a/RUNTIME/RSS2UPlanetSECTORTW.sh
+++ b/RUNTIME/RSS2UPlanetSECTORTW.sh
@@ -39,6 +39,8 @@ ${RSS}
cat "${RSS}" | jq 'sort_by(.created) | reverse | .[]' | jq -r '.title' > ~/.zen/tmp/${MOATS}/${SECTOR}/tiddlers.list
##
gloops=0
+signatures=0
+
while read title; do
[[ ${floop} -gt 2 ]] && echo "0lder Tiddlers are similaR... BREAK" && break
@@ -54,7 +56,12 @@ while read title; do
[[ ! "${ISHERE}" ]] && echo "No Tiddler found in ${INDEX}"
- if [[ "${ISHERE}" != "${title}" ]]; then
+ TMPTAGS=$(cat ~/.zen/tmp/${MOATS}/TMP.json | jq -r .[].tags)
+ TMPEMAILS=($(echo "$TMPTAGS" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
+ TMPSIGN=${#TMPEMAILS[@]}
+ echo "INSIDE TIDDLER HAVE ${TMPSIGN} SIGNATURE(S)"
+
+ if [[ "${ISHERE}" != "${title}" || ${TMPSIGN} == 0 ]]; then
## NEW TIDDLER
echo "Importing Title: $title"
@@ -72,16 +79,17 @@ while read title; do
&& rm ${INDEX} \
&& mv ~/.zen/tmp/${MOATS}/${SECTOR}/${SECTOR}.html ${INDEX} \
&& ((gloops++)) \
- && echo "SECTOR (${gloops}) : ${title}"
+ && echo "SECTOR (${gloops}) : ${title}" \
+ && signatures=$((signatures + TMPSIGN))
[[ ! -s ${INDEX} ]] && echo "ERROR. TW did not ingest ~/.zen/tmp/${MOATS}/NEW.json" && exit 1
else
## SAME TIDDLER
- echo "TIDDLER WITH TITLE $title ALREADY EXISTS..."
+ echo "TIDDLER WITH TITLE $title and more than 1 signature ALREADY EXISTS..."
- cp -f ~/.zen/tmp/${MOATS}/TMP.json ~/.zen/tmp/${MOATS}/INSIDE.json
+ cat ~/.zen/tmp/${MOATS}/TMP.json | jq .[] > ~/.zen/tmp/${MOATS}/INSIDE.json
cat "${RSS}" | jq -rc ".[] | select(.title == \"$title\")" > ~/.zen/tmp/${MOATS}/NEW.json
if [[ ! $(diff ~/.zen/tmp/${MOATS}/NEW.json ~/.zen/tmp/${MOATS}/INSIDE.json) ]]; then
@@ -90,9 +98,15 @@ while read title; do
continue
fi
floop=1
-
+ echo
+ echo "=========== INSIDE.json"
+ cat ~/.zen/tmp/${MOATS}/INSIDE.json | jq -c
+ echo
+ echo "=========== NEW.json"
+ cat ~/.zen/tmp/${MOATS}/NEW.json | jq -c
+ echo
## TODO EXTEND CONTROL TO text & ipfs & _canonical_url
-## NEED SIGNATURES & TIDDLER SIMILARITY TO COME UP
+ ## NEED SIGNATURES & TIDDLER SIMILARITY TO COME UP
## CHECK FOR EMAIL SIGNATURES DIFFERENCE
NTAGS=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .tags)
@@ -128,7 +142,7 @@ while read title; do
# Print the results
echo "Common email addresses : ${COMMON[*]}"
echo "Email addresses unique in NEW Tiddler : ${NUNIQUE[*]}"
- echo "Email addresses unique in ACTUAL Tiddler : ${IUNIQUE[*]}"
+ echo "Email addresses unique in INSIDE Tiddler : ${IUNIQUE[*]}"
combined=("${IEMAILS[@]}" "${NEMAILS[@]}")
unique_combined=($(echo "${combined[@]}" | tr ' ' '\n' | sort -u))
@@ -168,7 +182,7 @@ To Refuse
Actual TiddlerEngage discussion about it...
+
+
+
+
+
+
+
+"""
+
+@app.get("/")
+async def read_root():
+ return HTMLResponse(content=html_form, status_code=200)
+
+def get_mime_type(file: UploadFile):
+ mime = magic.Magic()
+ mime_type = mime.from_buffer(file.file.read(1024))
+ return mime_type
+
+@app.post("/upload")
+async def create_upload_file(file: UploadFile = File(...), convert_to: str = Form(...)):
+ # Validate file size
+ max_file_size = 100 * 1024 * 1024 # 100MB
+ if file.file.__sizeof__() > max_file_size:
+ raise HTTPException(status_code=400, detail="File size exceeds the limit of 100MB")
+
+ # Check the file type
+ mime_type = get_mime_type(file)
+ print(f"Detected MIME type: {mime_type}")
+
+ # Save the uploaded file to a temporary location
+ with open(file.filename, "wb") as f:
+ f.write(file.file.read())
+
+ # Continue with the processing logic
+ # Run the post-treatment Bash script
+ logs = subprocess.run(["bash", "addfile.sh", file.filename, mime_type, convert_to], capture_output=True, text=True).stdout
+
+ # Optionally, you can remove the temporary file
+ os.remove(file.filename)
+
+ return JSONResponse(content={"filename": file.filename, "mime_type": mime_type, "convert_to": convert_to, "message": "File processed successfully.", "logs": logs})
+
+if __name__ == "__main__":
+ import uvicorn
+
+ uvicorn.run(app, host="0.0.0.0", port=10101)
diff --git a/ASTROBOT/G1Kodi.sh b/ASTROBOT/G1Kodi.sh
index b6dc4f71..8a262666 100755
--- a/ASTROBOT/G1Kodi.sh
+++ b/ASTROBOT/G1Kodi.sh
@@ -168,8 +168,26 @@ while read TITRE; do
TEXT="File Upload and Processing
+ + + +{{!!titre}} ({{!!year}})
{{!!sub}}
{{!!desc}}Bande Annonce -
Envoyez un don. Recevez le lien vers ce film dans votre messagerie Cesium+
-+
Voir ce Film:
+Installez Cesium+
+|
+ |
+ |
+
+ Flashez, envoyez un don...+ce soir, recevez le lien dans votre messagerie. + |
+ |
+
Hello ${PLAYER},
Your TW is unplugged from Astroport : TW ARCHIVE.$(cat ~/.zen/game/players/${PLAYER}/secret.june)
May the force be with you.
" "BYE BYE MESSAGE" +${MY_PATH}/../tools/mailjet.sh "${PLAYER}" "Ciao ${PLAYER},
Your TW is unplugged from Astroport : TW ARCHIVE.$(cat ~/.zen/game/players/${PLAYER}/secret.june)