From 130260dbc7025705176c4254c4d82900877e68dc Mon Sep 17 00:00:00 2001
From: Bruno21 <bruno@clicclac.info>
Date: Sat, 20 Aug 2022 11:18:39 +0200
Subject: [PATCH] =?UTF-8?q?tag=20=C2=AB=C2=A0others=C2=A0=C2=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-possibilité de rajouter des tags dans le tableau others()
-les tableaux de tags sont déplacés au début du script
---
 keywords2insta.sh | 51 +++++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/keywords2insta.sh b/keywords2insta.sh
index ac02602..f039f21 100755
--- a/keywords2insta.sh
+++ b/keywords2insta.sh
@@ -1,16 +1,21 @@
 #!/usr/bin/env bash
 
-
-#italic="\033[3m"
-#underline="\033[4m"
-#bgd="\033[1;4;31m"
 red="\033[1;31m"
 bold="\033[1m"
-#bold_under="\033[1;4m"
 reset="\033[0m"
 
 file=$1
 
+
+# Tags automatically added
+# You can add tags to this 4 arrays
+
+wild=("wildlife" "wildlifephoto" "wildlifephotographer")
+nat=("naturelovers" "natureshot" "naturephotography")
+reg=("Bourgogne" "Burgundy" "Bourgogne Franche-Comté" "Côte d'or")
+others=("tag" "keu")
+
+
 #trans fr:en -b "renard"
 #fox
 
@@ -95,12 +100,12 @@ done
 
 # model
 # Canon EOS R6		Canon EOS 5D Mark III		Canon EOS-1D Mark IV		Canon EOS 20D
-mod=("canonphotography")
 m=$(echo "$exif" | sed -n '/^Model/p' | awk -F":" '{print $2}' | xargs)
-mod+=("${m}")	# Canon EOS R6
+mod=("${m}")	# Canon EOS R6
 
 if [[ "$m" =~ ^Canon ]]; then
-	mod+=("Canon")											# Canon
+	mod+=("Canon")
+	mod+=("canonphotography")
 	[[ "$m" = *EOS* ]] || mod+=("EOS")						# EOS
 	z=$(echo "$m" | sed 's/Canon\ //g' | xargs)
 	y=$(echo "$m" | sed 's/EOS//g' | sed 's/[ ][ ]*/ /g' | xargs)
@@ -126,11 +131,6 @@ lens_flickr="\"${l}\" "
 lens_insta="$(echo "$l" | sed 's/ //g' | sed -r 's/[^ ]+/#&/g') "
 
 
-#fixes
-wild=("wildlife" "wildlifephoto" "wildlifephotographer")
-nat=("naturelovers" "natureshot" "naturephotography")
-reg=("Bourgogne" "Burgundy" "Bourgogne Franche-Comté" "Côte d'or")
-
 for i in "${wild[@]}"
 do 
 	if [[ "$i" = *" "* ]]; then
@@ -162,13 +162,15 @@ do
 	region_insta+="#$(echo "${i}" | iconv -f UTF-8-MAC -t ascii//translit | sed 's/[^a-zA-Z 0-9]//g' | sed 's/ //g') "
 done
 
+
+echo "Model flickr: $model_flickr"
+echo "Model insta: $model_insta"
+echo
+
 : <<'END_COMMENT'
 echo "Keywords flickr: $keyword_flickr"
 echo "Keywords insta: $keyword_insta"
 echo
-echo "Model flickr: $model_flickr"
-echo "Model insta: $model_insta"
-echo
 echo "Lens flick: $lens_flickr"
 echo "Lens_insta: $lens_insta"
 echo
@@ -186,6 +188,21 @@ END_COMMENT
 keywords_flickr="$keyword_flickr$model_flickr$lens_flickr$wildlife_flickr$nature_flickr$region_flickr"
 keywords_insta=$(echo "$keyword_insta$model_insta$lens_insta$wildlife_insta$nature_insta$region_insta" | awk '{print tolower($0)}')
 
+if [ ${#others[@]} -gt 0 ]; then
+
+	for i in "${others[@]}"
+	do 
+		if [[ "$i" = *" "* ]]; then
+			others_flickr+="\"${i}\" "
+		else
+			others_flickr+="${i} "
+		fi
+		others_insta+="#$(echo "${i}" | iconv -f UTF-8-MAC -t ascii//translit | sed 's/[^a-zA-Z 0-9]//g' | sed 's/ //g') "
+	done
+	keywords_flickr+="$others_flickr"
+	keywords_insta+="$others_insta"
+fi
+
 : <<'END_COMMENT'
 echo "$keywords_flickr"
 echo
@@ -215,7 +232,7 @@ if ! command -v gawk &> /dev/null; then
 	echo -e "  - brew install gawk"
 	echo -e ""
 else
-	keywords_flickr=$(echo "$keywords_flickr" | gawk -v RS="[ \n]" -v ORS=" " '!($0 in a){print;a[$0]}')
+	#keywords_flickr=$(echo "$keywords_flickr" | gawk -v RS="[ \n]" -v ORS=" " '!($0 in a){print;a[$0]}')
 	keywords_insta=$(echo "$keywords_insta" | gawk -v RS="[ \n]" -v ORS=" " '!($0 in a){print;a[$0]}')
 fi