Merge pull request #658 from Wolfy76700/feature/alt_text

Fixed issue where empty character / player name slots were being used for alt text
joaorb64 · Nov 27, 2023 · f50df14 · f50df14
2 parents 482ea7b + b64e44b
commit f50df14
Show file tree

Hide file tree

Showing 12 changed files with 89 additions and 83 deletions.
diff --git a/TSH.exe b/TSH.exe
diff --git a/src/Helpers/TSHAltTextHelper.py b/src/Helpers/TSHAltTextHelper.py
@@ -62,14 +62,17 @@ def generate_youtube(scoreboard_id=1, use_phase_name=True):
                 character_data = current_player_data.get("character")
                 for character_id in character_data.keys():
                     current_character_data = character_data.get(character_id)
-                    character_names.append(current_character_data.get("name"))
-                player_names.append(player_name.replace(" [L]", ""))
-                if character_names:
-                    player_names_with_characters.append(
-                        f"{player_name.replace(' [L]', '')} ({', '.join(character_names)})")
-                else:
-                    player_names_with_characters.append(
-                        player_name.replace(" [L]", ""))
+                    if current_character_data.get("name"):
+                        character_names.append(current_character_data.get("name"))
+                if player_name:
+                    if player_name.replace(' [L]', ''):
+                        player_names.append(player_name.replace(" [L]", ""))
+                        if character_names:
+                            player_names_with_characters.append(
+                                f"{player_name.replace(' [L]', '')} ({', '.join(character_names)})")
+                        else:
+                            player_names_with_characters.append(
+                                player_name.replace(" [L]", ""))
             title_long = f'{title_long}' + \
                 " / ".join(player_names_with_characters)
             title_short = f'{title_short}' + " / ".join(player_names)
@@ -165,11 +168,13 @@ def CalculatePlacement(x, bracket_type="DOUBLE_ELIMINATION"):
             character_data = current_player_data.get("character")
             for character_id in character_data.keys():
                 current_character_data = character_data.get(character_id)
-                character_names.append(current_character_data.get("name"))
+                if current_character_data.get("name"):
+                    character_names.append(current_character_data.get("name"))
             player_text = f"{player_name}"
             if character_names:
                 player_text = player_text + f" ({', '.join(character_names)})"
-            players_text.append(player_text)
+            if player_name:
+                players_text.append(player_text)
         placement = CalculatePlacement(int(team_id), bracket_type)
         players_text = " / ".join(players_text)
         if team_name:

diff --git a/src/i18n/TSH_de.ts b/src/i18n/TSH_de.ts
@@ -703,30 +703,30 @@ p, li { white-space: pre-wrap; }
     <name>altText</name>
     <message>
         <location filename="../Helpers/TSHAltTextHelper.py" line="30"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="147"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="150"/>
         <source>Game:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="81"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="83"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="85"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="84"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="86"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="88"/>
         <source>VS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="96"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="190"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="99"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="195"/>
         <source>Commentators:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="99"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="102"/>
         <source>Stream powered by TournamentStreamHelper:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="194"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="199"/>
         <source>Stream powered by TournamentStreamHelper</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/i18n/TSH_en.ts b/src/i18n/TSH_en.ts
@@ -698,30 +698,30 @@ p, li { white-space: pre-wrap; }
     <name>altText</name>
     <message>
         <location filename="../Helpers/TSHAltTextHelper.py" line="30"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="147"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="150"/>
         <source>Game:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="81"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="83"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="85"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="84"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="86"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="88"/>
         <source>VS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="96"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="190"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="99"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="195"/>
         <source>Commentators:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="99"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="102"/>
         <source>Stream powered by TournamentStreamHelper:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="194"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="199"/>
         <source>Stream powered by TournamentStreamHelper</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/i18n/TSH_es.ts b/src/i18n/TSH_es.ts
@@ -708,30 +708,30 @@ p, li { white-space: pre-wrap; }
     <name>altText</name>
     <message>
         <location filename="../Helpers/TSHAltTextHelper.py" line="30"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="147"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="150"/>
         <source>Game:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="81"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="83"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="85"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="84"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="86"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="88"/>
         <source>VS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="96"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="190"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="99"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="195"/>
         <source>Commentators:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="99"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="102"/>
         <source>Stream powered by TournamentStreamHelper:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="194"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="199"/>
         <source>Stream powered by TournamentStreamHelper</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/i18n/TSH_fr.ts b/src/i18n/TSH_fr.ts
@@ -703,30 +703,30 @@ p, li { white-space: pre-wrap; }
     <name>altText</name>
     <message>
         <location filename="../Helpers/TSHAltTextHelper.py" line="30"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="147"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="150"/>
         <source>Game:</source>
         <translation>Jeu :</translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="81"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="83"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="85"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="84"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="86"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="88"/>
         <source>VS</source>
         <translation>contre</translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="96"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="190"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="99"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="195"/>
         <source>Commentators:</source>
         <translation>Commentateurs :</translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="99"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="102"/>
         <source>Stream powered by TournamentStreamHelper:</source>
         <translation>Stream produit avec Tournament Stream Helper :</translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="194"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="199"/>
         <source>Stream powered by TournamentStreamHelper</source>
         <translation>Stream produit avec Tournament Stream Helper</translation>
     </message>

diff --git a/src/i18n/TSH_it.ts b/src/i18n/TSH_it.ts
@@ -698,30 +698,30 @@ p, li { white-space: pre-wrap; }
     <name>altText</name>
     <message>
         <location filename="../Helpers/TSHAltTextHelper.py" line="30"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="147"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="150"/>
         <source>Game:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="81"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="83"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="85"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="84"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="86"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="88"/>
         <source>VS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="96"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="190"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="99"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="195"/>
         <source>Commentators:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="99"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="102"/>
         <source>Stream powered by TournamentStreamHelper:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="194"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="199"/>
         <source>Stream powered by TournamentStreamHelper</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/i18n/TSH_ja.ts b/src/i18n/TSH_ja.ts
@@ -711,30 +711,30 @@ p, li { white-space: pre-wrap; }
     <name>altText</name>
     <message>
         <location filename="../Helpers/TSHAltTextHelper.py" line="30"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="147"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="150"/>
         <source>Game:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="81"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="83"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="85"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="84"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="86"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="88"/>
         <source>VS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="96"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="190"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="99"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="195"/>
         <source>Commentators:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="99"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="102"/>
         <source>Stream powered by TournamentStreamHelper:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="194"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="199"/>
         <source>Stream powered by TournamentStreamHelper</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/i18n/TSH_pt-BR.ts b/src/i18n/TSH_pt-BR.ts
@@ -710,30 +710,30 @@ p, li { white-space: pre-wrap; }
     <name>altText</name>
     <message>
         <location filename="../Helpers/TSHAltTextHelper.py" line="30"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="147"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="150"/>
         <source>Game:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="81"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="83"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="85"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="84"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="86"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="88"/>
         <source>VS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="96"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="190"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="99"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="195"/>
         <source>Commentators:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="99"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="102"/>
         <source>Stream powered by TournamentStreamHelper:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="194"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="199"/>
         <source>Stream powered by TournamentStreamHelper</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/i18n/TSH_zh-CN.ts b/src/i18n/TSH_zh-CN.ts
@@ -698,30 +698,30 @@ p, li { white-space: pre-wrap; }
     <name>altText</name>
     <message>
         <location filename="../Helpers/TSHAltTextHelper.py" line="30"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="147"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="150"/>
         <source>Game:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="81"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="83"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="85"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="84"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="86"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="88"/>
         <source>VS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="96"/>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="190"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="99"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="195"/>
         <source>Commentators:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="99"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="102"/>
         <source>Stream powered by TournamentStreamHelper:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHAltTextHelper.py" line="194"/>
+        <location filename="../Helpers/TSHAltTextHelper.py" line="199"/>
         <source>Stream powered by TournamentStreamHelper</source>
         <translation type="unfinished"></translation>
     </message>