Merge pull request #507 from TwilCynder/feature/load-stream-queue

Fix and improvement for the stream queue
joaorb64 · Jul 25, 2023 · 04df4b1 · 04df4b1
2 parents 00e7fee + 0adae14
commit 04df4b1
Show file tree

Hide file tree

Showing 14 changed files with 183 additions and 161 deletions.
diff --git a/TSH.exe b/TSH.exe
diff --git a/layout/stream_queue/index.js b/layout/stream_queue/index.js
@@ -10,6 +10,7 @@ LoadEverything().then(() => {
         "sets_displayed" : -1,
         "display_first_set": true,
         "station" : -1,
+        "currentEventOnly": false,
         "display" : {
             "station" : false,
             "country_flag" : true,
@@ -87,7 +88,7 @@ LoadEverything().then(() => {
                 `
         )
 
-        resolver.add(`.set${s} .p${t} .twitter`, 
+        resolver.add(`.set${s - 1} .p${t} .twitter`, 
             (!isTeams) ?  `<span class="twitter_logo"></span>${String(player.twitter)}` : ""  
         )
 
@@ -103,9 +104,17 @@ LoadEverything().then(() => {
                 <div class = "name">
                     <div class = "tag"></div>
                     <div class = "extra">
-                        <div class = "twitter">  </div> 
-                        <div class = "pronoun"> ${ wrap_text((!isTeams && true) ?  String(player.pronoun) : "") } </div>
-                        <div class = "seed"> ${wrap_text("Seed " + team.seed)} </div>
+                        ${ player.twitter ?
+                            ` <div class = "twitter">  </div> ` : ''
+                        }
+                        ${ player.pronoun ?
+                            ` <div class = "pronoun"> ${ wrap_text((!isTeams && true) ?  String(player.pronoun) : "") } </div>` : ''
+                        }
+                        ${ team.seed ?
+                            `<div class = "seed"> ${wrap_text("Seed " + team.seed)} </div> ` : ''
+                        }
+                       
+                        
                     </div>
                 </div>
             </div>
@@ -118,6 +127,7 @@ LoadEverything().then(() => {
         for (const [s, set] of Object.values(queue).slice(first_index).entries()){
             if (sets_nb && (current_set_nb >= sets_nb)) break;
 
+            if (config.currentEventOnly && !set.isCurrentEvent) continue;
             if (config.station != -1 && config.station != set.station) continue;
 
             let isTeams = Object.keys(set.team["1"].player).length > 1;

diff --git a/layout/stream_queue/settings.json b/layout/stream_queue/settings.json
@@ -9,6 +9,7 @@
   "sets_displayed" : -1,
   "display_first_set": true,
   "station" : -1,
+  "currentEventOnly": true,
   "display" : {
       "station" : false,
       "country_flag" : true,

diff --git a/src/TournamentDataProvider/StartGGDataProvider.py b/src/TournamentDataProvider/StartGGDataProvider.py
@@ -885,6 +885,7 @@ def GetStreamQueue(self, progress_callback=None):
             data = json.loads(data.text)
             print("Stream queue loaded from StartGG")
 
+            eventSlug = deep_get(data, "data.event.slug", "")
             queues = deep_get(data, "data.event.tournament.streamQueue", [])
 
             finalData = {}
@@ -897,13 +898,16 @@ def GetStreamQueue(self, progress_callback=None):
                 streamName = q.get("stream", {}).get("streamName", "")
                 queueData = {}
                 for setIndex, _set in enumerate(q.get("sets", [])):
+
+
                     phase_name = deep_get(_set, "phaseGroup.phase.name")
                     if deep_get(_set, "phaseGroup.phase.groupCount") > 1:
                         phase_name += " - " + TSHLocaleHelper.phaseNames.get(
                             "group").format(deep_get(_set, "phaseGroup.displayIdentifier"))
 
                     frt = _set.get("fullRoundText", "")
                     total_games = _set.get("totalGames", 0)
+                    seteventSlug = deep_get(_set, "event.slug", "")
 
                     setData = {
                         "id": _set.get("id"),
@@ -913,7 +917,9 @@ def GetStreamQueue(self, progress_callback=None):
                         "best_of_text": TSHLocaleHelper.matchNames.get("best_of").format(total_games) if total_games > 0 else "",
                         "state": _set.get("state"),
                         "team": {},
-                        "station": deep_get(_set, "station.number", -1)
+                        "station": deep_get(_set, "station.number", -1),
+                        "event": seteventSlug,
+                        "isCurrentEvent": seteventSlug == eventSlug
                     }
 
                     for teamIndex, slot in enumerate(_set.get("slots", [])):
@@ -945,18 +951,19 @@ def GetStreamQueue(self, progress_callback=None):
                                 stateCode = playerData.get("state_code", "")
                                 countryData = TSHCountryHelper.countries.get(
                                     countryCode)
-                                states = countryData.get("states")
-                                stateData = {}
-                                if stateCode:
-                                    stateData = states[stateCode]
-
-                                    path = f'./assets/state_flag/{countryCode}/{"_CON" if stateCode == "CON" else stateCode}.png'
-                                    if not os.path.exists(path):
-                                        path = None
-
-                                    stateData.update({
-                                        "asset": path
-                                    })
+                                if countryData:
+                                    states = countryData.get("states")
+                                    stateData = {}
+                                    if stateCode:
+                                        stateData = states[stateCode]
+
+                                        path = f'./assets/state_flag/{countryCode}/{"_CON" if stateCode == "CON" else stateCode}.png'
+                                        if not os.path.exists(path):
+                                            path = None
+
+                                        stateData.update({
+                                            "asset": path
+                                        })
 
                                 playerData = {
                                     "country": TSHCountryHelper.GetBasicCountryInfo(countryCode),

diff --git a/src/TournamentDataProvider/StartGGStreamQueueQuery.txt b/src/TournamentDataProvider/StartGGStreamQueueQuery.txt
@@ -1,5 +1,6 @@
 query StreamQueueQuery($slug: String) {
     event(slug: $slug){
+        slug
         tournament {
             streamQueue {
                 sets {
@@ -11,6 +12,9 @@ query StreamQueueQuery($slug: String) {
                     station {
                       number
                     }
+                    event {
+                        slug
+                    }
                     slots {
                         entrant {
                             id

diff --git a/src/i18n/TSH_de.ts b/src/i18n/TSH_de.ts
@@ -141,11 +141,11 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Form</name>
     <message>
+        <location filename="../layout/TSHScoreboardTeam.ui" line="20"/>
         <location filename="../layout/TSHScoreboardScore.ui" line="21"/>
+        <location filename="../layout/TSHThumbnailSettings.ui" line="14"/>
         <location filename="../layout/TSHScoreboardPlayer.ui" line="25"/>
         <location filename="../layout/TSHScoreboardStage.ui" line="14"/>
-        <location filename="../layout/TSHThumbnailSettings.ui" line="14"/>
-        <location filename="../layout/TSHScoreboardTeam.ui" line="20"/>
         <source>Form</source>
         <translation></translation>
     </message>
@@ -622,14 +622,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupBox</name>
     <message>
-        <location filename="../layout/TSHCommentary.ui" line="23"/>
         <location filename="../layout/TSHCommentator.ui" line="29"/>
+        <location filename="../layout/TSHCommentary.ui" line="23"/>
         <source>GroupBox</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../layout/TSHCommentary.ui" line="26"/>
         <location filename="../layout/TSHCommentator.ui" line="32"/>
+        <location filename="../layout/TSHCommentary.ui" line="26"/>
         <source>Commentator 1</source>
         <translation>Kommentator 1</translation>
     </message>
@@ -644,38 +644,38 @@ p, li { white-space: pre-wrap; }
         <translation></translation>
     </message>
     <message>
-        <location filename="../layout/TSHCommentary.ui" line="90"/>
         <location filename="../layout/TSHCommentator.ui" line="90"/>
+        <location filename="../layout/TSHCommentary.ui" line="90"/>
         <source>GamerTag</source>
         <translation>Spielername</translation>
     </message>
     <message>
-        <location filename="../layout/TSHCommentary.ui" line="108"/>
         <location filename="../layout/TSHCommentator.ui" line="108"/>
+        <location filename="../layout/TSHCommentary.ui" line="108"/>
         <source>REAL NAME</source>
         <translation>KLARNAME</translation>
     </message>
     <message>
-        <location filename="../layout/TSHCommentary.ui" line="124"/>
         <location filename="../layout/TSHCommentator.ui" line="124"/>
+        <location filename="../layout/TSHCommentary.ui" line="124"/>
         <source>Real Name</source>
         <translation>Klarname</translation>
     </message>
     <message>
-        <location filename="../layout/TSHCommentary.ui" line="140"/>
         <location filename="../layout/TSHCommentator.ui" line="140"/>
+        <location filename="../layout/TSHCommentary.ui" line="140"/>
         <source>TWITTER</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../layout/TSHCommentary.ui" line="156"/>
         <location filename="../layout/TSHCommentator.ui" line="156"/>
+        <location filename="../layout/TSHCommentary.ui" line="156"/>
         <source>Handle Only</source>
         <translation>Handle exkl. @</translation>
     </message>
     <message>
-        <location filename="../layout/TSHCommentary.ui" line="170"/>
         <location filename="../layout/TSHCommentator.ui" line="172"/>
+        <location filename="../layout/TSHCommentary.ui" line="170"/>
         <source>PRONOUNS</source>
         <translation>PRONOMEN</translation>
     </message>
@@ -708,21 +708,21 @@ p, li { white-space: pre-wrap; }
         <translation>Spielerliste</translation>
     </message>
     <message>
-        <location filename="../TSHPlayerListWidget.py" line="54"/>
         <location filename="../TSHBracketWidget.py" line="70"/>
+        <location filename="../TSHPlayerListWidget.py" line="54"/>
         <source>Number of slots</source>
         <translation>Zahl der Slots</translation>
     </message>
     <message>
-        <location filename="../TSHPlayerListWidget.py" line="63"/>
         <location filename="../TSHBracketWidget.py" line="81"/>
+        <location filename="../TSHPlayerListWidget.py" line="63"/>
         <source>Players per slot</source>
         <translation>Spieler pro Slot</translation>
     </message>
     <message>
+        <location filename="../TSHBracketWidget.py" line="90"/>
         <location filename="../TSHScoreboardWidget.py" line="116"/>
         <location filename="../TSHPlayerListWidget.py" line="72"/>
-        <location filename="../TSHBracketWidget.py" line="90"/>
         <source>Characters per player</source>
         <translation>Charaktere pro Slot</translation>
     </message>
@@ -773,8 +773,8 @@ p, li { white-space: pre-wrap; }
         <translation>Das Programm wird nun geschlossen.</translation>
     </message>
     <message>
-        <location filename="../TSHThumbnailSettingsWidget.py" line="74"/>
         <location filename="../TournamentStreamHelper.py" line="233"/>
+        <location filename="../TSHThumbnailSettingsWidget.py" line="74"/>
         <source>Thumbnail Settings</source>
         <translation>Thumbnail-Einstellungen</translation>
     </message>
@@ -1245,12 +1245,12 @@ p, li { white-space: pre-wrap; }
         <translation>TEAM {0}</translation>
     </message>
     <message>
-        <location filename="../TSHThumbnailSettingsWidget.py" line="929"/>
         <location filename="../TournamentStreamHelper.py" line="59"/>
         <location filename="../TournamentStreamHelper.py" line="95"/>
         <location filename="../TournamentStreamHelper.py" line="496"/>
         <location filename="../TournamentStreamHelper.py" line="683"/>
         <location filename="../TSHScoreboardWidget.py" line="459"/>
+        <location filename="../TSHThumbnailSettingsWidget.py" line="929"/>
         <source>Warning</source>
         <translation>ACHTUNG</translation>
     </message>
@@ -1454,8 +1454,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>thumb_app</name>
     <message>
-        <location filename="../TSHThumbnailSettingsWidget.py" line="927"/>
         <location filename="../TSHScoreboardWidget.py" line="435"/>
+        <location filename="../TSHThumbnailSettingsWidget.py" line="927"/>
         <source>TSH - Thumbnail</source>
         <translation></translation>
     </message>