From 75ffc4244bb20b63fe4e5237b20206ab22e80bff Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Tue, 6 Apr 2021 19:36:43 +0200
Subject: [PATCH] youtube wordpress channel corrections

---
 ajouter_video.sh             |  5 +++--
 www/xbian/AASTRXBIAN         |  1 -
 www/xbian/FASTRXBIAN         |  3 ---
 www/xbian/Readme.md          | 18 ------------------
 zen/new_file_in_astroport.sh |  9 ++++-----
 zen/wordpress_channel.sh     |  7 ++++++-
 6 files changed, 13 insertions(+), 30 deletions(-)
 delete mode 100644 www/xbian/AASTRXBIAN
 delete mode 100644 www/xbian/FASTRXBIAN
 delete mode 100644 www/xbian/Readme.md

diff --git a/ajouter_video.sh b/ajouter_video.sh
index 542c058..5a0ae17 100755
--- a/ajouter_video.sh
+++ b/ajouter_video.sh
@@ -135,8 +135,9 @@ FILE_PATH="$HOME/astroport/youtube/$YID"
 mkdir -p ${FILE_PATH} && mv -f ${YTEMP}/* ${FILE_PATH}/
 # rename FILE_NAME to YNAME (URL clean)
 mv "${FILE_PATH}/${FILE_NAME}" "${FILE_PATH}/${YNAME}" && FILE_NAME="${YNAME}"
-# rename video.json
-mv "${FILE_PATH}/*.json" "${FILE_PATH}/video.json"
+# get & rename video.json
+jsonfile=$(ls ${FILE_PATH}/*.json)
+mv "${jsonfile}" "${FILE_PATH}/video.json"
 
 GROUPES="_IPNSKEY_" # USE GROUPS TO RECORD IPNS MEDIAKEY
 
diff --git a/www/xbian/AASTRXBIAN b/www/xbian/AASTRXBIAN
deleted file mode 100644
index b090853..0000000
--- a/www/xbian/AASTRXBIAN
+++ /dev/null
@@ -1 +0,0 @@
-CAT;TITLE;URLS
diff --git a/www/xbian/FASTRXBIAN b/www/xbian/FASTRXBIAN
deleted file mode 100644
index a89a6a2..0000000
--- a/www/xbian/FASTRXBIAN
+++ /dev/null
@@ -1,3 +0,0 @@
-CAT;TITLE;URLS
-films;Frequencies;http://127.0.0.1:8181/ipfs/QmcXMAHbFH3gDwmxJRX7uh753oCbXAEajwQsAWFkvqbRY3/Frequencies.mp4
-
diff --git a/www/xbian/Readme.md b/www/xbian/Readme.md
deleted file mode 100644
index ed49c30..0000000
--- a/www/xbian/Readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-DEPRECATED - TO REMOVE
-
-Maintenant les fichiers index sont accessibles par la passerelle IPFS
-
----
-
-Ce répertoire contient les INDEX des liens de streaming utilisés par le plugin Vstream, site "ASTROPORT"
-
-Il est rendu accessible au travers de nginx http://localhost:10021/ tel que configuré dans ~/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py
-
-- AASTRXBIAN : contient les Animes placés dans ~/astroport/animes
-- FASTRXBIAN : contient les Films placés dans ~/astroport/films
-
-... A venir ... peut-être 
-
-- SASTRXBIAN : contient les Séries
-- DASTRXBIAN : contient les Documentaires
-- CASTRXBIAN : contient des Clips
diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh
index dc32ba3..39d0989 100755
--- a/zen/new_file_in_astroport.sh
+++ b/zen/new_file_in_astroport.sh
@@ -184,13 +184,13 @@ echo "$IPFSID" > /tmp/.ipfsid
 ########################################################################
 ################ ask autoPIN to one shuffle A_boostrap_nodes
 ########################################################################
-PINnode=$(cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep -Ev "#" | shuf)
+PINnode=$(cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep -Ev "#" | shuf | tail -n 1)
 echo "ASK AUTOPIN to $PINnode"
 ## CREATE $PINnode IPFS communication directory
 [[ ! -d ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode} ]] && mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode}
 ## ENCRYPT .ipfsid & .ipfs.filelink
-$MY_PATH/tools/natools.py encrypt -p $PINnode -i /tmp/.ipfs.filelink -o ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode}/.ipfs.filelink.encrypt
-$MY_PATH/tools/natools.py encrypt -p $PINnode -i /tmp/.ipfsid -o ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode}/.ipfsid.encrypt
+$MY_PATH/tools/natools.py encrypt -p $PINnode -i /tmp/.ipfs.filelink -o "~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode}/.ipfs.filelink.encrypt"
+$MY_PATH/tools/natools.py encrypt -p $PINnode -i /tmp/.ipfsid -o "~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode}/.ipfsid.encrypt"
 ## Init zen, views counters & visitor
 echo "0" ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode}/.zen
 echo "0" ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode}/.views.counter
@@ -210,8 +210,7 @@ rm /tmp/.ipfsid
 ########################################################################
 
 ########################################################################
-## ADD "ajouter_video.txt" and "video.json"
-SELF IPNS publish data
+## ADD "ajouter_video.txt" and "video.json" will be SELF IPNS publish data
 [[ -f ~/astroport/${TYPE}/${REFERENCE}/ajouter_video.txt ]] && cp -f ~/astroport/${TYPE}/${REFERENCE}/ajouter_video.txt ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/ 
 [[ -f ~/astroport/${TYPE}/${REFERENCE}/video.json ]] && cp -f ~/astroport/${TYPE}/${REFERENCE}/video.json ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/
 ########################################################################
diff --git a/zen/wordpress_channel.sh b/zen/wordpress_channel.sh
index 00f542e..8ade3a1 100755
--- a/zen/wordpress_channel.sh
+++ b/zen/wordpress_channel.sh
@@ -44,9 +44,14 @@ do
 			## GET ipns link + title + xzuid
 			title=$(cat ~/.zen/ipfs_swarm/.$ipfnodesource/KEY/$mediakey/$g1pubsource/.title | sed "s/_/ /g")
 			xzuid=$(cat ~/.zen/ipfs_swarm/.$ipfnodesource/_xbian.zuid)
+			tags=$(cat ~/.zen/ipfs_swarm/.$ipfnodesource/KEY/$mediakey/$g1pubsource/video.json | jq -c .tags | sed 's/[][]//g' | sed "s/\"//g" )
 			
 			mynodename=$(cat ~/.zen/ipfs_swarm/.$IPFSNODEID/G1SSB/_nodename)
 			genres="$(cat ~/.zen/ipfs_swarm/.$ipfnodesource/KEY/$mediakey/$g1pubsource/ajouter_video.txt | cut -d ';' -f 6 | sed 's/|/,/g' | awk '{print tolower($0)}')"
+			tags="$tags,$genres"
+			
+			description=$(cat ~/.zen/ipfs_swarm/.$ipfnodesource/KEY/$mediakey/$g1pubsource/video.json | jq -cr .description)
+			description=$(echo "${description//$'\n'/<br>}") # replace new line with <br>
 
 			## USE .ipns.link
 			# ipnsid=$(cat ~/.zen/ipfs_swarm/.$ipfnodesource/KEY/$mediakey/$g1pubsource/.ipns.link)
@@ -58,7 +63,7 @@ do
 			# 1=DIY, Habiter=2, Guerir=3, Divertir=4, Déplacer=5, Energie=6, Cultiver=7
 			cd /var/www/wordpress/
 			# isWPuser=$(wp user list | grep "$xzuid")
-			wp post create --post_author="$xzuid" --post_content="<p><a href=\"https://$mynodename$(cat /tmp/filelink_$mediakey.txt | jq -Rr @uri)\" target=\"_blank\" rel=\"noreferrer noopener\">$title</a></p>" --post_title="$title" --post_excerpt="$g1pubsource" --post_category="105" --tags_input="$genres" --porcelain
+			wp post create --post_author="$xzuid" --post_content="<h1><a href=\"https://$mynodename$(cat /tmp/filelink_$mediakey.txt | jq -Rr @uri)\" target=\"_blank\" rel=\"noreferrer noopener\">$title</a></h1><p>$description</p>" --post_title="$title" --post_excerpt="$description" --post_category="105" --tags_input="$tags" --porcelain
 
 			# REPLY IN ~/.zen/ipfs/.$ipfnodesource/astroport/wordpress/$mediakey/done
 			responsedir="$(echo "$wpcall" | sed 's/ipfs_swarm/ipfs/g')"