Refactor language handling in filespec.groovy for consistency in subtitle and audio language display

Author: nattadasu

modules/filespec.groovy

@@ -13,25 +13,25 @@
     2: '2.0',
     1: '1.0',
 )}
-{
-    def textLangCount = any { textLanguages.size() } { 0 }
-    def substat = textLangCount > 2 ? " MULTi" : textLangCount > 1 ? " DUAL" : textLangCount = 1 ? " SUB" : null
-    def langs_ = textLangCount > 5 ? textLanguages.take(5) : textLanguages
-    substat ? substat + langs_.joining(" ", " (", "").upper() + (textLangCount > 6 ? " ...)" : ")") : ""
-}
 {
     def audioLangCount = any { audioLanguages.size() } { 0 }
-    def substat = audioLangCount > 2 ? ", MULTi-AUD" : audioLangCount > 1 ? ", DUAL-AUD" : null
+    def substat = audioLangCount > 2 ? " MULTi-AUD" : audioLangCount > 1 ? " DUAL-AUD" : null
     def langs_ = audioLangCount > 5 ? audioLanguages.take(5) : audioLanguages
     substat ? substat + langs_.joining(" ", " (", "").upper() + (audioLangCount > 5 ? " ...)" : ")") : ""
 }
 {
-    def dub = ", DUBBED"
+    def dub = " DUBBED"
     // if audioLanguages contains language, blank out dub
     def substat = audioLanguages.any { it.ISO3B == language.ISO3B } ? "" : dub
     substat = audioLanguages.size() == 1 && audioLanguages.any { it.ISO3B == "und" } ? "" : substat
     substat
 }
+{
+    def textLangCount = any { textLanguages.size() } { 0 }
+    def substat = textLangCount > 2 ? ", MULTi" : textLangCount > 1 ? ", DUAL" : textLangCount = 1 ? ", SUB" : null
+    def langs_ = textLangCount > 5 ? textLanguages.take(5) : textLanguages
+    substat ? substat + langs_.joining(" ", " (", "").upper() + (textLangCount > 6 ? " ...)" : ")") : ""
+}
 {"]["}{crc32.upper()}{"]"}
 {
     if (f.subtitle) {