From b7cf186d631765f17b76203b395d499588a7e327 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Wed, 30 Jun 2021 23:51:51 +0200
Subject: [PATCH] Affiche MEDIAPUBKEY et G1BARRE pour encourager le DON

---
 ajouter_video.sh             |  2 +-
 zen/ipns_TAG_refresh.sh      | 17 ++++++++++++++---
 zen/new_file_in_astroport.sh |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ajouter_video.sh b/ajouter_video.sh
index cca0ec0..f70923a 100755
--- a/ajouter_video.sh
+++ b/ajouter_video.sh
@@ -466,7 +466,7 @@ echo "new_file_in_astroport.sh \"$HOME/astroport/${CAT}/${TMDB}/\" \"${FILE_NAME
 ########################################################################
 
 [[ "$CHOICE" == "film" || "$CHOICE" == "serie" ]] && CHOICE="TMDB"
-zenity --width ${large} --height=${haut} --text-info \
+zenity --width=500 --height=500 --text-info \
        --title="QR CODE du portefeuille Libre de ce media (PASS=$(cat /tmp/${CHOICE}_${TMDB}.pass)" \
        --html \
        --url="http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/KEY/${CHOICE}_${TMDB}/QR.png" \
diff --git a/zen/ipns_TAG_refresh.sh b/zen/ipns_TAG_refresh.sh
index e8aff37..2983899 100755
--- a/zen/ipns_TAG_refresh.sh
+++ b/zen/ipns_TAG_refresh.sh
@@ -123,6 +123,15 @@ do
 	# echo "<meta charset=\"UTF-8\"><meta http-equiv=\"Refresh\" content=\"0;URL=http://127.0.0.1:8181$(cat /tmp/${mediakey}_filelink.txt)\">" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/${G1PUB}/index.html
 	# echo "<meta charset=\"UTF-8\"><meta http-equiv=\"Refresh\" content=\"0;URL=https://tube.copylaradio.com$(cat /tmp/${mediakey}_filelink.txt)\">" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/${G1PUB}/index.html
 
+	## TREAT OLD DATA from new_file_in_astroport.sh (LATER can be removed)
+    if [[ ! -f $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/MEDIAPUBKEY ]]; then
+        $MY_PATH/tools/natools.py privkey -f ipfs-keystore -k $HOME/.ipfs/keystore/$KEYFILE -F pubsec -o /tmp/${MEDIAKEY}.dunikey
+        # PubFromDunikey=$(cat /tmp/${MEDIAKEY}.dunikey | grep "sec" | cut -d ' ' -f2 | base58 -d | tail -c+33 | base58)
+        PubFromDunikey=$(cat /tmp/${MEDIAKEY}.dunikey | grep "pub" | cut -d ' ' -f2)
+		echo "$PubFromDunikey" > $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/MEDIAPUBKEY
+	fi
+	MEDIAPUBKEY=$(cat $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/MEDIAPUBKEY)
+	
 ## DEMO PERIOD
 ## NICE FINAL STREAMING PAGE
 	FILETYPE="${LOCALTUBELINK##*.}"
@@ -154,10 +163,12 @@ do
 </article>
 </main>
 <center><br>Ce fichier possède un G1 portefeuille qui permet de payer son hébergement ( 1 Zen / Mo / Bootstrap ).
-<br>Faire un don permet de conserver ${mediakey} en ligne mais aussi de récompenser son Auteur!<br>
+<br>Faire un don permet de conserver cette version de ${mediakey} en ligne et aussi de récompenser son Auteur!<br>
 <br>
-<br><img width=222 src=\"https://tube.copylaradio.com/ipns/$IPNSLINK/QR.png\"><br><br>1 G1 = 100 Zen</center>
-
+<br><img width=222 src=\"https://tube.copylaradio.com/ipns/$IPNSLINK/QR.png\"><br><br>1 G1 = 100 Zen
+<br>
+<img src=\"https://g1sms.fr/g1barre/image.php?pubkey=${MEDIAPUBKEY}&amp;target=1000&amp;title=DONS%20%${mediakey}&amp;node=g1.duniter.org&amp;start_date=2021-06-21&amp;display_pubkey=true&amp;display_qrcode=true&amp;progress_color=ff07a4\">
+</center>
 </body>
 </html>" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/${G1PUB}/index.html
 
diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh
index 31c39a3..8c517d6 100755
--- a/zen/new_file_in_astroport.sh
+++ b/zen/new_file_in_astroport.sh
@@ -213,6 +213,7 @@ $MY_PATH/tools/natools.py privkey -f ipfs-keystore -k $HOME/.ipfs/keystore/$KEYF
 # PubFromDunikey=$(cat /tmp/${MEDIAKEY}.dunikey | grep "sec" | cut -d ' ' -f2 | base58 -d | tail -c+33 | base58)
 PubFromDunikey=$(cat /tmp/${MEDIAKEY}.dunikey | grep "pub" | cut -d ' ' -f2)
 qrencode -s 6 -o "$HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/QR.png" "$PubFromDunikey"
+echo "$PubFromDunikey" > $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/MEDIAPUBKEY
 
 ########################################################################
 ## MEDIAKEY => DUNIKEY + PASS 6 DIGITS openssl protection