From 3d4028854042171079bbe8a17669afc665fee993 Mon Sep 17 00:00:00 2001 From: fred Date: Fri, 14 Jul 2023 15:45:07 +0200 Subject: [PATCH] issuer = EMAIL --- ASTROBOT/G1CopierYoutube.sh | 1 + ASTROBOT/G1Kodi.sh | 7 ++- ASTROBOT/N1Kodi.sh | 93 ++++++++++++++++++++++-------- RUNTIME/VOEUX.refresh.sh | 6 +- tools/Connect_PLAYER_To_Gchange.sh | 4 -- tools/new_file_in_astroport.sh | 1 + 6 files changed, 80 insertions(+), 32 deletions(-) diff --git a/ASTROBOT/G1CopierYoutube.sh b/ASTROBOT/G1CopierYoutube.sh index 4a14db5e..cbee937d 100755 --- a/ASTROBOT/G1CopierYoutube.sh +++ b/ASTROBOT/G1CopierYoutube.sh @@ -234,6 +234,7 @@ if [[ ! ${TIDDLER} ]]; then "ipfs": "'/ipfs/${ILINK}'", "youtubeid": "'${YID}'", "zurl": "'${ZYURL}'", + "issuer": "'${PLAYER}'", "tags": "'ipfs G1CopierYoutube ${PLAYER} ${EXTRATAG} ${MIME} $(echo ${ZFILE} | sed 's~_~ ~g' | sed 's~\.~ ~g')'" } ] diff --git a/ASTROBOT/G1Kodi.sh b/ASTROBOT/G1Kodi.sh index e950a77b..54f742be 100755 --- a/ASTROBOT/G1Kodi.sh +++ b/ASTROBOT/G1Kodi.sh @@ -136,7 +136,11 @@ while read TITRE; do echo "## Creation json tiddler" echo '[ { - "text": "'${DESC}'", + "text": "{{!!titre}} +{{!!sub}} + +{{!!desc}} +", "title": "'Kodi_${TITLE}'", "created": "'${MOATS}'", "year": "'${YEAR}'", @@ -151,6 +155,7 @@ while read TITRE; do "ipfs_one": "''", "titre": "'${TITRE}'", "modified": "'${MOATS}'", + "issuer": "'${PLAYER}'", "tags": "'${TAGS}'" } ] diff --git a/ASTROBOT/N1Kodi.sh b/ASTROBOT/N1Kodi.sh index b1d30d30..7380f72b 100755 --- a/ASTROBOT/N1Kodi.sh +++ b/ASTROBOT/N1Kodi.sh @@ -16,17 +16,20 @@ ME="${0##*/}" echo "$ME RUNNING" ######################################################################## +echo "NO READY YET" +exit 0 ######################################################################## -INDEX="$1" -[[ ! ${INDEX} ]] && INDEX="$HOME/.zen/game/players/.current/ipfs/moa/index.html" -[[ ! -s ${INDEX} ]] && echo "ERROR - Please provide path to source TW index.html" && exit 1 -[[ ! -s ${INDEX} ]] && echo "ERROR - Fichier TW absent. ${INDEX}" && exit 1 -ORIGININDEX=${INDEX} +N1PATH="$1" +[[ ! -s ${N1PATH} ]] && echo "ERROR - Please provide path to source N1PATH" && exit 1 +[[ ! -s ${N1PATH} ]] && echo "ERROR - Fichier TW absent. ${N1PATH}" && exit 1 PLAYER="$2" -[[ ! ${PLAYER} ]] && PLAYER="$(cat ~/.zen/game/players/.current/.player 2>/dev/null)" [[ ! ${PLAYER} ]] && echo "ERROR - Please provide PLAYER" && exit 1 +[[ ! -s ${N1PATH}/_${PLAYER}.tiddlers.json ]] \ + && echo "MISSING ${N1PATH}/_${PLAYER}.tiddlers.json - EXIT -" \ + && exit 1 + ASTRONAUTENS=$(ipfs key list -l | grep -w ${PLAYER} | cut -d ' ' -f1) [[ ! ${ASTRONAUTENS} ]] && echo "ERROR - Clef IPNS ${PLAYER} introuvable!" && exit 1 @@ -37,35 +40,75 @@ G1PUB=$(cat ~/.zen/game/players/${PLAYER}/.g1pub) MOATS="$3" [[ ! ${MOATS} ]] && MOATS=$(date -u +"%Y%m%d%H%M%S%4N") -echo "${PLAYER} ${INDEX} ${ASTRONAUTENS} ${G1PUB} " +echo "${PLAYER} ${N1PATH} ${ASTRONAUTENS} ${G1PUB} " #~ ################################################################### #~ ## CREATE APP NODE PLAYER PUBLICATION DIRECTORY #~ ################################################################### mkdir -p $HOME/.zen/tmp/${MOATS} && echo $HOME/.zen/tmp/${MOATS} -mkdir -p $HOME/.zen/game/players/${PLAYER}/G1Kodi/ -echo "EXPORT Kodi Wish for ${PLAYER}" -rm -f ~/.zen/game/players/${PLAYER}/G1Kodi/Kodi.json -tiddlywiki --load ${INDEX} \ - --output ~/.zen/game/players/${PLAYER}/G1Kodi \ - --render '.' 'Kodi.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Kodi' - -[[ $(cat ~/.zen/game/players/${PLAYER}/G1Kodi/Kodi.json ) == "[]" ]] \ - && echo "AUCUN VOEU G1KODI - EXIT -" \ - && rm -Rf $HOME/.zen/game/players/${PLAYER}/G1Kodi \ - && exit 0 - -WISH=$(cat ~/.zen/game/players/${PLAYER}/G1Kodi/Kodi.json | jq -r '.[].wish') -WISHNS=$(cat ~/.zen/game/players/${PLAYER}/G1Kodi/Kodi.json | jq -r '.[].wishns') -echo "G1KODI: $WISH ${myIPFS}$WISHNS" -#~ ################################################################### +echo ' + + + RSS ASTROPORT + Astroport Kodi RSS feed + https://www.copylaradio.com + 2020 Astroport.com FOSS + Mon, 6 Sep 2020 00:01:00 +0000 + Sun, 6 Sep 2020 16:20:00 +0000 + 1800 +' > ~/.zen/tmp/${MOATS}/movie.rss find ~/.zen/game/players/${PLAYER}/FRIENDS -mindepth 1 -maxdepth 1 -type d | rev | cut -f 1 -d '/' | rev > ~/.zen/tmp/${MOATS}/twfriends +## SCAN ALL "_APLAYER.tiddlers.json" +for FILE in $(ls ${N1PATH}/*.tiddlers.json); do + APLAYER=$(echo "$FILE" | rev | cut -d '.' -f 3- | cut -d '_' -f 1 | rev ) + [[ ${APLAYER} == ${PLAYER} ]] && echo "My Movie List" && continue +## EXTRACT all titles to do JQ LOOP + cat ${FILE} | jq -r .[].title > ~/.zen/tmp/${MOATS}/${APLAYER}.movie.id + + while read TITLE; do + + ## GET AG1PUB FROM FRIEND TW +## BUG !!! + TITRE=$(cat ${FILE} | jq -r .[].titre) + SUB=$(cat ${FILE} | jq -r .[].sub) + IPFSONE=$(cat ${FILE} | jq -r .[].ipfs_one) + echo "${IPFSONE}" | base16 -d > ~/.zen/tmp/${MOATS}/source.one.enc + + ~/.zen/Astroport.ONE/tools/natools.py decrypt -f pubsec \ + -k ~/.zen/game/players/${PLAYER}/secret.dunikey \ + -i ~/.zen/tmp/${MOATS}/source.one.enc -o $HOME/.zen/tmp/${MOATS}/source.one + + SOURCE=$(cat ${FILE} | jq -r .[].source) + IPFS_ME=$(cat ${FILE} | jq -r .[].ipfs_${player}) + + echo ' + + '${TITRE}' + '${SUB}' + http://ipfs.localhost:8080/ipfs/QmQwYpoHX6Fw26nd3KFfLj71Uv34riT4F5X2RFy2rmHekW + Sun, 6 Sep 2022 16:20:00 +0000 + ' >> ~/.zen/tmp/${MOATS}/movie.rss + + done < ~/.zen/tmp/${MOATS}/${APLAYER}.movie.id + + +done + +## EXTRACT and DECODE ipfs_AG1PUB from FRIENDS json's + + +echo ' + + +' >> ~/.zen/tmp/${MOATS}/movie.rss + +## UPDATE LOCAL KODI WITH +## ./userdata/mediasources.xml +## ./userdata/sources.xml exit 0 -## ./userdata/mediasources.xml -## ./userdata/sources.xml diff --git a/RUNTIME/VOEUX.refresh.sh b/RUNTIME/VOEUX.refresh.sh index e6d86c51..3fc50a4f 100755 --- a/RUNTIME/VOEUX.refresh.sh +++ b/RUNTIME/VOEUX.refresh.sh @@ -149,7 +149,9 @@ do && echo && ((floop++)) && continue [[ $(cat ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/_${APLAYER}.tiddlers.json) == "[]" ]] \ - && echo "EMPTY ${WISHNAME} - CONTINUE -" && echo && ((floop++)) && continue + && echo "EMPTY ${WISHNAME} - CONTINUE -" && echo && ((floop++)) \ + && rm ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/_${APLAYER}.tiddlers.json \ + && continue echo "## TIDDLERS FOUND ;) MIAM >>> (◕‿‿◕) <<<" echo ">>> G1FRIEND § $myIPFS${IPNS_VOEUNS}/_${APLAYER}.tiddlers.json ${WISHNAME}" @@ -224,7 +226,7 @@ do if [[ -s $MY_PATH/../ASTROBOT/N1${WISHNAME}.sh ]]; then echo "........................ Astrobot N1${WISHNAME}.sh post-treatment found !" echo "________________________________ Running it *****" - ${MY_PATH}/../ASTROBOT/N1${WISHNAME}.sh "$INDEX" "${PLAYER}" "$MOATS" + ${MY_PATH}/../ASTROBOT/N1${WISHNAME}.sh "~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}" "${PLAYER}" "$MOATS" echo "________________________________ Finished ******" else echo "......................... N1${WISHNAME} REGULAR Ŋ1 RSS JSON" diff --git a/tools/Connect_PLAYER_To_Gchange.sh b/tools/Connect_PLAYER_To_Gchange.sh index 77a54d38..79a130cf 100755 --- a/tools/Connect_PLAYER_To_Gchange.sh +++ b/tools/Connect_PLAYER_To_Gchange.sh @@ -320,10 +320,6 @@ do fi - ## ACTIVER RECUP ANNONCES... -# SCRAPING DONNE LE BON COIN - DIFFICILE - UTILISER COOKIE NAVIGATEUR -# https://www.leboncoin.fr/recherche?text=donne&locations=Toulouse__43.59743304757555_1.4471155185604894_10000_5000&owner_type=private&sort=time&donation=1 - ## Get Ŋ2 LEVEL echo "(°▃▃°) (°▃▃°) (°▃▃°) Ŋ2 scraping ~/.zen/game/players/${PLAYER}/FRIENDS/${liking_me}/friend_of_friend.json" for nid in $(cat ~/.zen/game/players/${PLAYER}/FRIENDS/${liking_me}/${liking_me}.Gstars.json | jq -r '.likes[].issuer'); diff --git a/tools/new_file_in_astroport.sh b/tools/new_file_in_astroport.sh index d7cd0c03..f6e7a8dd 100755 --- a/tools/new_file_in_astroport.sh +++ b/tools/new_file_in_astroport.sh @@ -334,6 +334,7 @@ then "ipns": "'/ipns/${IPNS}'", "tmdb": "'${REFERENCE}'", "modified": "'${MOATS}'", + "issuer": "'${PLAYER}'", "tags": "'${TAGS}'" ' > ~/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json [[ ${CANON} != "" ]] && echo ',