Merge pull request #778 from ZombieHDGaming/bugfix/line-endings

How many times do we have to teach you this less old man?!
joaorb64 · Oct 30, 2024 · 748cb2c · 748cb2c
2 parents b7bba19 + 83f103e
commit 748cb2c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 28 deletions.
diff --git a/src/Helpers/TSHCountryHelper.py b/src/Helpers/TSHCountryHelper.py
@@ -227,8 +227,7 @@ def FindState(countryCode, city):
                     None
                 )
             if state is not None:
-                logger.debug(f"State was explicit: [{
-                             city}] -> [{part}] = {state}")
+                logger.debug(f"State was explicit: [{city}] -> [{part}] = {state}")
                 return state["original_code"]
 
         # No, so get by City
@@ -239,8 +238,7 @@ def FindState(countryCode, city):
                 TSHCountryHelper.remove_accents_lower(part), None)
 
             if state is not None:
-                logger.debug(f"Got state from city name: [{
-                             city}] -> [{part}] = {state}")
+                logger.debug(f"Got state from city name: [{city}] -> [{part}] = {state}")
                 return state
 
         return None

diff --git a/src/TSHGameAssetManager.py b/src/TSHGameAssetManager.py
@@ -939,19 +939,16 @@ def GetCharacterAssets(self, characterCodename: str, skin: int, assetpack: str =
                             else:
                                 metadata_title_locale = asset.get("metadata", {})[
                                     key].get("title", '')
-                            charFiles[assetKey]['metadata'][f"{
-                                key}"]["title"] = metadata_title_locale
-                            charFiles[assetKey]['metadata'][f"{
-                                key}"][f"value_en"] = metadata[key]
+                            charFiles[assetKey]['metadata'][f"{key}"]["title"] = metadata_title_locale
+                            charFiles[assetKey]['metadata'][f"{key}"][f"value_en"] = metadata[key]
                             if TSHLocaleHelper.exportLocale in asset.get("metadata", {})[key]["values"].get(characterCodename, {}).get("locale", {}).keys() or TSHLocaleHelper.exportLocale.split('-')[0] in asset.get("metadata", {})[key]["values"].get(characterCodename, {}).get("locale", {}).keys():
                                 try:
                                     metadata[key] = asset.get("metadata", {})[key]["values"].get(
                                         characterCodename, {}).get("locale", {})[TSHLocaleHelper.exportLocale]
                                 except KeyError:
                                     metadata[key] = asset.get("metadata", {})[key]["values"].get(
                                         characterCodename, {}).get("locale", {})[TSHLocaleHelper.exportLocale.split('-')[0]]
-                            charFiles[assetKey]['metadata'][f"{
-                                key}"][f"value"] = metadata[key]
+                            charFiles[assetKey]['metadata'][f"{key}"][f"value"] = metadata[key]
 
                         # if len(metadata.keys()) > 0:
                         #     if str(skin) in metadata:

diff --git a/src/TSHScoreboardPlayerWidget.py b/src/TSHScoreboardPlayerWidget.py
@@ -530,8 +530,7 @@ def LoadStates(self, index):
                 item = QStandardItem()
                 # Windows has some weird thing with files named CON.png. In case a state code is CON,
                 # we try to load _CON.png instead
-                path = f'./assets/state_flag/{countryData.get(
-                    "code")}/{"_CON" if state_code == "CON" else state_code}.png'
+                path = f'./assets/state_flag/{countryData.get("code")}/{"_CON" if state_code == "CON" else state_code}.png'
 
                 if not os.path.exists(path):
                     path = None

diff --git a/src/TSHScoreboardWidget.py b/src/TSHScoreboardWidget.py
@@ -563,8 +563,7 @@ def SetPlayersPerTeam(self, number):
             p = TSHScoreboardPlayerWidget(
                 index=len(self.team1playerWidgets)+1,
                 teamNumber=1,
-                path=f'score.{self.scoreboardNumber}.team.{
-                    1}.player.{len(self.team1playerWidgets)+1}',
+                path=f'score.{self.scoreboardNumber}.team.{1}.player.{len(self.team1playerWidgets)+1}',
                 scoreboardNumber=self.scoreboardNumber)
             self.playerWidgets.append(p)
 
@@ -593,8 +592,7 @@ def SetPlayersPerTeam(self, number):
             p = TSHScoreboardPlayerWidget(
                 index=len(self.team2playerWidgets)+1,
                 teamNumber=2,
-                path=f'score.{self.scoreboardNumber}.team.{
-                    2}.player.{len(self.team2playerWidgets)+1}',
+                path=f'score.{self.scoreboardNumber}.team.{2}.player.{len(self.team2playerWidgets)+1}',
                 scoreboardNumber=self.scoreboardNumber)
             self.playerWidgets.append(p)
 

diff --git a/src/TournamentDataProvider/ChallongeDataProvider.py b/src/TournamentDataProvider/ChallongeDataProvider.py
@@ -109,8 +109,7 @@ def GetTournamentData(self, progress_callback=None, cancel_event=None):
             slug = self.GetSlug()
 
             data = self.scraper.get(
-                f"https://challonge.com/en/search/tournaments.json?filters%5B&page=1&per=1&q={
-                    slug}",
+                f"https://challonge.com/en/search/tournaments.json?filters%5B&page=1&per=1&q={slug}",
 
             )
             logger.debug(data.text)
@@ -134,8 +133,7 @@ def GetTournamentData(self, progress_callback=None, cancel_event=None):
                     finalData["startAt"] = dateutil.parser.parse(
                         dateElement.get("text"), fuzzy=True).timestamp()
             except Exception as e:
-                logger.error(f"Could not get tournament date: {
-                             traceback.format_exc()}")
+                logger.error(f"Could not get tournament date: {traceback.format_exc()}")
 
             participantsElement = next(
                 (d for d in details if d.get("icon") == "fa fa-users"), None)
@@ -157,8 +155,7 @@ def GetIconURL(self):
             slug = self.GetSlug()
 
             data = self.scraper.get(
-                f"https://challonge.com/en/search/tournaments.json?filters%5B&page=1&per=1&q={
-                    slug}",
+                f"https://challonge.com/en/search/tournaments.json?filters%5B&page=1&per=1&q={slug}",
                 headers=HEADERS
             )
 

diff --git a/src/TournamentDataProvider/StartGGDataProvider.py b/src/TournamentDataProvider/StartGGDataProvider.py
@@ -392,8 +392,7 @@ def _GetMatchTasks(self, setId, progress_callback, cancel_event):
             return self.ParseMatchDataOldApi({})
 
         data = self.QueryRequests(
-            f'https://www.start.gg/api/-/gg_api./set/{
-                setId};bustCache=true;expand=["setTask"];fetchMostRecentCached=true',
+            f'https://www.start.gg/api/-/gg_api./set/{setId};bustCache=true;expand=["setTask"];fetchMostRecentCached=true',
             type=requests.get,
             params={
                 "extensions": {"cacheControl": {"version": 1, "noCache": True}},
@@ -1054,8 +1053,7 @@ def ProcessFutureSet(self, _set, eventSlug):
                         if stateCode:
                             stateData = states[stateCode]
 
-                            path = f'./assets/state_flag/{countryCode}/{
-                                "_CON" if stateCode == "CON" else stateCode}.png'
+                            path = f'./assets/state_flag/{countryCode}/{"_CON" if stateCode == "CON" else stateCode}.png'
                             if not os.path.exists(path):
                                 path = None
 

diff --git a/src/TournamentStreamHelper.py b/src/TournamentStreamHelper.py
@@ -206,8 +206,7 @@ def ExtractUpdate():
                     tar.extract(m)
                     updateLog.append(f"Extract {m}")
                 except Exception:
-                    updateLog.append(f"Failed to extract {
-                                     m} - {traceback.format_exc()}")
+                    updateLog.append(f"Failed to extract {m} - {traceback.format_exc()}")
 
         try:
             with open("assets/update_log.txt", "w") as f: