From 8357ddceb3f20fbe47e1926e8aeccc086b0ba252 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Tue, 30 Mar 2021 18:25:52 +0200
Subject: [PATCH] correct "&" in filename problem for youtube and mp3

---
 ajouter_video.sh             | 11 ++++++++---
 zen/new_file_in_astroport.sh |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ajouter_video.sh b/ajouter_video.sh
index 05c8057..810fb54 100755
--- a/ajouter_video.sh
+++ b/ajouter_video.sh
@@ -84,11 +84,14 @@ TMDB="${YID}"
 
 FILE_PATH="$HOME/astroport/youtube/$YID"
 mkdir -p ${FILE_PATH} && mv -f ${YTEMP}/* ${FILE_PATH}/
+# Remove "&" from FILE_NAME rename to YNAME
+mv "${FILE_PATH}/${FILE_NAME}" "${FILE_PATH}/${YNAME}" && FILE_NAME="${YNAME}"
 
 ## CORRECT PARAMETERS to Make Kodi compatible YASTRXBIAN FILE
 TITLE="${YNAME%.*}"
 GENRES="[\"$XZUID\"]"
-GROUPES="_IPNSKEY_"
+GROUPES="$G1PUB__IPNSKEY_" # USE GROUPS TO RECORD G1PUB_MEDIAKEY
+
 FILE_RES=$(ffprobe -v error -select_streams v:0 -show_entries stream=width,height -of csv=s=x:p=0 "${FILE_PATH}/${FILE_NAME}" | cut -d "x" -f 2)
 RES=${FILE_RES%?}0p
 
@@ -147,11 +150,13 @@ YNAME=$(echo "${FILE_NAME}" | cut -d "&" -f 2-)
 || FILE_PATH="$HOME/astroport/$CAT/${YID}"
 
 mkdir -p "${FILE_PATH}" && mv -f ${YTEMP}/* "${FILE_PATH}/"
+# Remove "&" from FILE_NAME rename to YNAME
+mv "${FILE_PATH}/${FILE_NAME}" "${FILE_PATH}/${YNAME}" && FILE_NAME="${YNAME}"
 
 TMDB="${YID}"
 TITLE="${YNAME%.*}"
 GENRES="[\"$XZUID\"]"
-GROUPES="_IPNSKEY_"
+GROUPES="$G1PUB__IPNSKEY_" # USE GROUPS TO RECORD G1PUB_MEDIAKEY
 
 rm -Rf ${YTEMP}
 # zenity --warning --width ${large} --text "MP3 copié"
@@ -261,7 +266,7 @@ GENRES="[\"$(echo ${FILM_GENRES} | sed s/\|/\",\"/g)\"]"
 
 # VIDEO GROUP (was XZUID, now becoming IPNS key)
 # GROUPES=$(zenity --entry --width 300 --title "Groupe" --text "Associez la vidéo à un groupe (optionnel). Exemple: PIXAR" --entry-text="${XZUID}")
-GROUPES="_IPNSKEY_" # USE GROUPS TO RECORD IPNS LINK : Replaced later
+GROUPES="$G1PUB__IPNSKEY_" # USE GROUPS TO RECORD G1PUB_MEDIAKEY
 
 # DEBUG VERIFICATION
 # zenity --question --width ${large} --title "EMBARQUEMENT ASTROPORT! OK?"\
diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh
index 0ba3b0f..9699741 100755
--- a/zen/new_file_in_astroport.sh
+++ b/zen/new_file_in_astroport.sh
@@ -87,7 +87,7 @@ case ${CAT} in
 esac
 
 ########################################################################
-## CHECK if ${INDEXPREFIX}${REFERENCE} KEY exists
+## CHECK if ${INDEXPREFIX}${REFERENCE} MEDIAKEY exists
 ########################################################################
 echo "SEARCH for ;$REFERENCE; in ${PREFIX}ASTRXBIAN"
 isREFERENCEinINDEX=$(grep ";$REFERENCE;" ~/.zen/ipfs*/.12D*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN)