From ef92c3e888951a29f5e7effee212f79fe2477f7a Mon Sep 17 00:00:00 2001
From: Breizh <breizh@breizh.pm>
Date: Fri, 6 Jan 2023 14:51:48 +0100
Subject: [PATCH] =?UTF-8?q?Factorisation=20des=20encodages=20d=E2=80=99URL?=
 =?UTF-8?q?=20en=20une=20fonction?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 generator.sh | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/generator.sh b/generator.sh
index f7aaaee..083ce73 100755
--- a/generator.sh
+++ b/generator.sh
@@ -22,6 +22,15 @@ echo "${blue}Start${reset} /$webpath"
 # Déplacement dans le dossier à traiter
 cd "${root}/${webpath}"
 
+# Encode certains caractères posant problème dans le HTML
+encodeUrl() {
+	encoded="${*//\&/%26}"
+	encoded="${encoded//\?/%3F}"
+	encoded="${encoded//\#/%23}"
+	encoded="${encoded//\"/%22}"
+	printf "%s" "${encoded}"
+}
+
 # Définition des différentes parties de la page
 header() {
 cat <<DELIM
@@ -46,13 +55,9 @@ DELIM
 }
 
 row() {
-encoded="${1//\&/%26}"
-encoded="${encoded//\?/%3F}"
-encoded="${encoded//\#/%23}"
-encoded="${encoded//\"/%22}"
 cat <<DELIM
             <tr>
-	        <td><a href="${encoded}">${1}</a></td>
+	        <td><a href="$(encodeUrl "${1}")">${1}</a></td>
 		<td class="right-align" data-kbytes="${2}">${3}</td>
 		<td class="right-align">${4}</td>
 		<td>${5}</td>
@@ -80,9 +85,7 @@ IFS=/
 
 for folder in $webpath
 do
-    encoded_folder="${folder//\&/%26}"
-    encoded_folder="${encoded_folder//\?/%3F}"
-    tmp+="$encoded_folder/"
+    tmp+="$(encodeUrl "$folder")/"
     navpath+="<a href=\"$tmp\">$folder</a>/"
 done
 
@@ -165,11 +168,7 @@ do
 	case $mimetype in
 	audio/*)
 		# Pour l'audio, ajout d'un lecteur
-    		encoded_src="${i//\&/%26}"
-    		encoded_src="${encoded_src//\?/%3F}"
-		encoded_src="${encoded_src//\#/%23}"
-		encoded_src="${encoded_src//\"/%22}"
-		type="<audio controls preload=\"$preload\"><source src=\"$encoded_src\" type=\"$mimetype\">$mimetype</audio>";;
+		type="<audio controls preload=\"$preload\"><source src=\"$(encodeUrl "${i}")\" type=\"$mimetype\">$mimetype</audio>";;
 	image/*)
 		# Pour les images, une miniature de 60px de haut est créée
 		thumbname="$(md5sum <<<$(readlink -f "$i") | cut -d' ' -f1).${i##*.}"	# Nom sur base d'un hash pour éviter les conflits