From 944b89702e076d84f1e5e6017696b50d833c678f Mon Sep 17 00:00:00 2001
From: Xavier Fontanet <xavier.fontanet@edreamsodigeo.com>
Date: Thu, 11 May 2023 18:15:00 +0200
Subject: [PATCH] happy with the result

---
 new audio test.groovy | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/new audio test.groovy b/new audio test.groovy
index 46b66b1..262a4d3 100755
--- a/new audio test.groovy	
+++ b/new audio test.groovy	
@@ -122,7 +122,6 @@ def printAudio (audio2Print) {
 	/***********/
 /*********************************************************/
 
-
 def bloqueAudio2=''
 def audiosMap = [:]
 for (aud in audio) {
@@ -130,18 +129,41 @@ for (aud in audio) {
     if (audiosMap.containsKey(shortDesc)) audiosMap[shortDesc].add(aud)
     else audiosMap[shortDesc] = [aud]
 }
-
+def groupedAudiosMap = [:]
 for (audioElms in audiosMap) {
     def k = audioElms.key
     def v = audioElms.value
-    def s = v.size()
     def mQ = getMaxQuality2(v)
-    if (s>1) k = k+'('+s+')' 
-    bloqueAudio2 += k+' '+printAudio2(mQ)+', '
+    if (v.size()>1 && !k.contains('+')) k += '+' 
+    def mQstr = printAudio2(mQ)
+    if (groupedAudiosMap.containsKey(mQstr)) groupedAudiosMap[mQstr].add(k)
+    else groupedAudiosMap[mQstr] = [k]
 }
+audiosMap=null
+def temp=''
+for (audioGroup in groupedAudiosMap) {
+    def k = audioGroup.key
+    def v = audioGroup.value
+    def gS = v.size()
+    def str=''
+    for (int i=0; i<gS; i++) {
+        str += (v[i]!=null?v[i]:'und') +', '
+        if (i==gS-1) {
+            str = removeLastComa(str)+' '
+            str += k+', '
+        }
+    }
+    bloqueAudio2 += str
+}
+groupedAudiosMap=null
+bloqueAudio2 = removeLastComa(bloqueAudio2)
+
 
 /***********/
-def getMaxQuality2 (listOfLanguageAudio) {
+def removeLastComa(txt) {
+    return txt.substring(0, txt.size()-2)
+}
+def getMaxQuality2 (listOfLanguageAudio) { 
 	def formatSet = ["PCM", "MLP FBA" ,"DTS", "FLAC", "AC-3", "E-AC-3", "EAC3", "AAC", "MPEG Audio", "MP3"]
 	for (cFormat in formatSet) {
 		def audiosFormatFound = getAudiosFromListByFormat2(cFormat, listOfLanguageAudio);
@@ -183,5 +205,4 @@ def getBestChannelFromList2 (audiosFormatFound) {
 }
 
 
-
-return bloqueAudio + ' vs [' + bloqueAudio2.substring(0,bloqueAudio2.size()-2) + ']'
\ No newline at end of file
+return bloqueAudio + ' vs [' + bloqueAudio2 + ']'
\ No newline at end of file