From 157f49149ace72a169fd75ce6716d114469120c1 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 24 Jan 2024 14:00:55 +0100 Subject: [PATCH] REGION have JOURNAL file and Ask.AI link --- RUNTIME/REGION.refresh.sh | 28 +++++++++++++++++++++------- tools/RSS2WEEKnewsfile.sh | 26 ++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 7 deletions(-) create mode 100755 tools/RSS2WEEKnewsfile.sh diff --git a/RUNTIME/REGION.refresh.sh b/RUNTIME/REGION.refresh.sh index 5323ae55..514d1ff2 100755 --- a/RUNTIME/REGION.refresh.sh +++ b/RUNTIME/REGION.refresh.sh @@ -80,18 +80,23 @@ for REGION in ${REGIONS[@]}; do # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> mkdir -p ~/.zen/tmp/${MOATS}/${REGION}/RSS rm -f ~/.zen/tmp/${MOATS}/${REGION}/RSS/_${REGLAT}_${REGLON}.week.rss.json + rm -f ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL ## START WITH LOCAL SECTORS RSS WEEK RSSNODE=($(ls ~/.zen/tmp/${IPFSNODEID}/SECTORS/_${REGLAT}*_${REGLON}*.week.rss.json 2>/dev/null)) for RSS in ${RSSNODE[@]}; do - [[ $(cat ${RSS}) != "[]" ]] && cp ${RSS} ~/.zen/tmp/${MOATS}/${REGION}/RSS/ + [[ $(cat ${RSS}) != "[]" ]] \ + && cp ${RSS} ~/.zen/tmp/${MOATS}/${REGION}/RSS/ \ + && ${MY_PATH}/../tools/RSS2WEEKnewsfile.sh ${RSS} >> ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL + done NL=${#RSSNODE[@]} ## ADD SWARM SECTORS RSS WEEK RSSWARM=($(ls ~/.zen/tmp/swarm/*/SECTORS/_${REGLAT}*_${REGLON}*.week.rss.json 2>/dev/null)) for RSS in ${RSSWARM[@]}; do - [[ $(cat ${RSS}) != "[]" ]] && cp ${RSS} ~/.zen/tmp/${MOATS}/${REGION}/RSS/ + [[ $(cat ${RSS}) != "[]" ]] && cp ${RSS} ~/.zen/tmp/${MOATS}/${REGION}/RSS/ \ + && ${MY_PATH}/../tools/RSS2WEEKnewsfile.sh ${RSS} >> ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL done NS=${#RSSWARM[@]} @@ -101,16 +106,21 @@ for REGION in ${REGIONS[@]}; do ## REMOVE SECTORS PARTS rm -f ~/.zen/tmp/${MOATS}/${REGION}/RSS/*.week.rss.json - ## TODO MAKE PAGE FROM JSON # BETTER FOR AIAPI - ## MAKE FINAL _${REGLAT}_${REGLON}.week.rss.json mv ~/.zen/tmp/${MOATS}/${REGION}/RSS/.all.json \ ~/.zen/tmp/${MOATS}/${REGION}/RSS/_${REGLAT}_${REGLON}.week.rss.json ## PREPARING AiApi link mkdir -p ~/.zen/tmp/${IPFSNODEID}/REGIONS - RWEEKCID=$(ipfs add -q ~/.zen/tmp/${MOATS}/${REGION}/RSS/_${REGLAT}_${REGLON}.week.rss.json) - echo ${RWEEKCID} > ~/.zen/tmp/${IPFSNODEID}/REGIONS/_${REGLAT}_${REGLON}.week.cid + RWEEKCID=$(ipfs add -q ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL) + + + rm ~/.zen/tmp/${IPFSNODEID}/REGIONS/_${REGLAT}_${REGLON}.week.cid 2>/dev/null ## TODO REMOVE + + ## DEMO : PREPARE Ask.IA link - PROD will be launched during RUNTIME. + echo "" \ + > ~/.zen/tmp/${MOATS}/${REGION}/Ask.IA._${REGLAT}_${REGLON}.redir.html + TOTL=$((${NL}+${NS})) # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -118,8 +128,12 @@ for REGION in ${REGIONS[@]}; do echo "SHOW TROPHY" > ~/.zen/tmp/${MOATS}/${REGION}/TODO +rm ~/.zen/tmp/${MOATS}/${REGION}/RWEEKCID 2>/dev/null ## TODO REMOVE + echo ${TOTL} > ~/.zen/tmp/${MOATS}/${REGION}/N - echo ${RWEEKCID} > ~/.zen/tmp/${MOATS}/${REGION}/RWEEKCID + + echo "" \ + > ~/.zen/tmp/${MOATS}/${REGION}/Journal._${REGLAT}_${REGLON}.redir.html IPFSPOP=$(ipfs add -rwq ~/.zen/tmp/${MOATS}/${REGION}/* | tail -n 1) ipfs name publish -k ${REGIONG1PUB} /ipfs/${IPFSPOP} diff --git a/tools/RSS2WEEKnewsfile.sh b/tools/RSS2WEEKnewsfile.sh new file mode 100755 index 00000000..1b1b93cc --- /dev/null +++ b/tools/RSS2WEEKnewsfile.sh @@ -0,0 +1,26 @@ +#!/bin/bash +######################################################################## +# Version: 0.1 +# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/) +######################################################################## +# GET TIDDLERS JSON LIST - from week.rss.json made by SECTOR. refresh.sh +# Filter by Tid type and format markdown output file +# CALLED BY "REGION.refresh.sh" +######################################################################## +MY_PATH="`dirname \"$0\"`" # relative +MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized +ME="${0##*/}" + +RSS=$1 ## filepath to RSS week file to extract Tiddlers + +[[ ! -s ${RSS} ]] && echo "BAD RSS INPUT ${RSS}" && exit 1 + +#~ echo "======= RSS 2 WEEKnewsfile ======= +#~ Analysing ${RSS} +#~ ==================================================================" +cat ${RSS} | jq -r '.[] | if .ipfs then "\n# [\(."title")](\(."ipfs"))\n\n\(.tags)\n \(.duree)" + elif .ipfs_one then "\n# \(."title")\n\n\(.tags)\n\(.desc)\n\(.g1pub)" + elif ._external_url then "\n# [\(."title")](\(._external_url))\n\n\(.tags)\n\(.mime) \(.type)" + else "\n# \(."title")\n\n\(.tags)\n\(.text)" end' + +exit 0