RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-01-26 08:53:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Exception handling cleanup

Browse Source
This commit is contained in:
Eric Froemling 2020-06-16 20:29:03 -07:00
parent 414afe598d
commit 0fdc5f1fc4
55 changed files with 214 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.efrocachemap
View File

@ -4135,16 +4135,16 @@
"assets/build/windows/x64/vc_redist.x64.exe": "https://files.ballistica.net/cache/ba1/ea/19/8b8787d81abcdce158ba608cd24f",
"assets/build/windows/x64/vcruntime140_1d.dll": "https://files.ballistica.net/cache/ba1/11/d8/ff6344b429b00c24d9a1930d4338",
"assets/build/windows/x64/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/20/33/0825e11e6518f87ece3009309933",
"build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/59/6a/634ef384e18384fa78b7a2a624f8",
"build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d6/1b/165df7c0c0c21761cba641640d4d",
"build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/e3/8b/b1770e7c2ade5a6f538260acae4d",
"build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9f/c1/7ad792405a744d9f2fa4cf682d4b",
"build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a5/d5/d9ed741473501d1a1541d5c100df",
"build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/10/e5/70bde6663088d44e126ec91cfaae",
"build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/88/6c/b4eb60746d994cddd19813faee85",
"build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/17/31/dff0defb0cc64a80d5068ed97930",
"build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/02/b0/83ec7dc92ec4e5b75a9d9a058cda",
"build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/aa/1e/bfcf2f01ae72a897333a4e4137b5",
"build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/cc/ec/50508b196f190b4a4b137d4aaf9c",
"build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/94/71/340f38cdbbcad105395733b9e556"
"build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/29/9c/24a918c046b06f010d9948458a09",
"build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2e/1c/2285cc92d83ce3a32b26c020cb71",
"build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/24/b6/9410d8cf8be5aaf2ffad07964950",
"build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/48/c4/2bdd6802858b92c348df702c9dcd",
"build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/b4/ca/0a1426dabc53a9f90a6beb011423",
"build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/f8/ef/4186b927c2675c3e4dfa19ba180d",
"build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/29/59/60175945534d87709dfc29d1b180",
"build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/5c/b8/16b868c1bbd8b1be2ebaf4da4d31",
"build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/30/6c/33b6b194062212beeae3043515a3",
"build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/4b/24/c54be077112185f6a3d2c67641ea",
"build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/ee/6e/a9d59e81b549b992673d20f84f11",
"build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/5b/73/97159eb1d7dfb4018c5a1241f164"
}

2
.idea/dictionaries/ericf.xml generated
View File

@ -572,6 +572,7 @@
<w>ensurepip</w>
<w>entitylist</w>
<w>entrynew</w>
<w>entrystorename</w>
<w>entrytype</w>
<w>entrytypeselect</w>
<w>enumtype</w>
@ -1306,6 +1307,7 @@
<w>ntriple</w>
<w>nturl</w>
<w>numedit</w>
<w>numsound</w>
<w>numstr</w>
<w>nvcompress</w>
<w>nvidia</w>

4
assets/src/ba_data/python/ba/_dependency.py
View File

@ -422,8 +422,8 @@ def test_depset() -> None:
if dep.cls is AssetPackage:
print('MISSING ASSET PACKAGE', dep.config)
else:
raise Exception('unknown dependency error for ' +
str(dep.cls))
raise RuntimeError(
f'Unknown dependency error for {dep.cls}') from exc
except Exception as exc:
print('DependencySet resolve failed with exc type:', type(exc))
if depset.resolved:

8
assets/src/ba_data/python/ba/_general.py
View File

@ -337,7 +337,7 @@ def _verify_object_death(wref: ReferenceType) -> None:
i += 1
def storagename(basename: str) -> str:
def storagename(suffix: str = None) -> str:
"""Generate a (hopefully) unique name for storing things in public places.
Category: General Utility Functions
@ -371,7 +371,9 @@ def storagename(basename: str) -> str:
qualname = fback.f_locals.get('__qualname__')
if qualname is not None:
assert isinstance(qualname, str)
fullpath = f'_{modulepath}_{qualname.lower()}_{basename}'
fullpath = f'_{modulepath}_{qualname.lower()}'
else:
fullpath = f'_{modulepath}_{basename}'
fullpath = f'_{modulepath}'
if suffix is not None:
fullpath = f'{fullpath}_{suffix}'
return fullpath.replace('.', '_')

7
assets/src/ba_data/python/ba/_lang.py
View File

@ -296,8 +296,8 @@ def _add_to_attr_dict(dst: AttrDict, src: Dict) -> None:
except Exception:
dst_dict = dst[key] = AttrDict()
if not isinstance(dst_dict, AttrDict):
raise Exception("language key '" + key +
"' is defined both as a dict and value")
raise RuntimeError("language key '" + key +
"' is defined both as a dict and value")
_add_to_attr_dict(dst_dict, value)
else:
if not isinstance(value, (float, int, bool, str, str, type(None))):
@ -404,7 +404,8 @@ def get_resource(resource: str,
from ba import _error
if fallback_value is not None:
return fallback_value
raise _error.NotFoundError("resource not found: '" + resource + "'")
raise _error.NotFoundError(
f"Resource not found: '{resource}'") from None
def translate(category: str,

4
assets/src/ba_data/python/ba/_map.py
View File

@ -143,9 +143,9 @@ def get_map_class(name: str) -> Type[ba.Map]:
name = get_filtered_map_name(name)
try:
return _ba.app.maps[name]
except Exception:
except KeyError:
from ba import _error
raise _error.NotFoundError("Map not found: '" + name + "'")
raise _error.NotFoundError(f"Map not found: '{name}'") from None
class Map(Actor):

29
assets/src/ba_data/python/bastd/activity/coopscore.py
View File

@ -322,7 +322,6 @@ class CoopScoreScreen(ba.Activity[ba.Player, ba.Team]):
def show_ui(self) -> None:
"""Show the UI for restarting, playing the next Level, etc."""
# pylint: disable=too-many-locals
# pylint: disable=too-many-statements
from bastd.ui.store.button import StoreButton
from bastd.ui.league.rankbutton import LeagueRankButton
@ -330,15 +329,7 @@ class CoopScoreScreen(ba.Activity[ba.Player, ba.Team]):
# If there's no players left in the game, lets not show the UI
# (that would allow restarting the game with zero players, etc).
# Hmmm shouldn't need this try/except here i don't think.
try:
players = self.players
except Exception as exc:
print(('EXC bs_coop_game show_ui cant get '
'self.players; shouldn\'t happen:'), exc)
players = []
if not players:
if not self.players:
return
rootc = self._root_ui = ba.containerwidget(size=(0, 0),
@ -513,7 +504,7 @@ class CoopScoreScreen(ba.Activity[ba.Player, ba.Team]):
self._store_button_instance.set_position((pos_x + 100, pos_y))
def on_begin(self) -> None:
# FIXME: clean this up
# FIXME: Clean this up.
# pylint: disable=too-many-statements
# pylint: disable=too-many-branches
# pylint: disable=too-many-locals
@ -661,12 +652,9 @@ class CoopScoreScreen(ba.Activity[ba.Player, ba.Team]):
# Add us to high scores, filter, and store.
our_high_scores_all = self._campaign.getlevel(
self._level_name).get_high_scores()
try:
our_high_scores = our_high_scores_all[str(len(self._playerinfos)) +
' Player']
except Exception:
our_high_scores = our_high_scores_all[str(len(self._playerinfos)) +
' Player'] = []
our_high_scores = our_high_scores_all.setdefault(
str(len(self._playerinfos)) + ' Player', [])
if self._score is not None:
our_score: Optional[list] = [
@ -685,8 +673,8 @@ class CoopScoreScreen(ba.Activity[ba.Player, ba.Team]):
our_high_scores.sort(reverse=self._score_order == 'increasing',
key=lambda x: x[0])
except Exception:
ba.print_exception('Error sorting scores')
print('our_high_scores:', our_high_scores)
ba.print_exception('Error sorting scores.')
print(f'our_high_scores: {our_high_scores}')
del our_high_scores[10:]
@ -809,6 +797,7 @@ class CoopScoreScreen(ba.Activity[ba.Player, ba.Team]):
name_str = ', '.join(
[p['name'] for p in display_scores[i][1]['players']])
except Exception:
ba.print_exception('Error calcing name_str')
name_str = '-'
if display_scores[i] == our_score and not showed_ours:
flash = True
@ -1256,7 +1245,7 @@ class CoopScoreScreen(ba.Activity[ba.Player, ba.Team]):
transition_delay=2.0).autoretain()
vval -= 35
except Exception:
ba.print_exception('error showing prize ranges')
ba.print_exception('Error showing prize ranges.')
if self._do_new_rating:
if error:

22
assets/src/ba_data/python/bastd/actor/powerupbox.py
View File

@ -98,6 +98,8 @@ class PowerupBoxFactory:
that has this ba.Material applied.
"""
_STORENAME = ba.storagename()
def __init__(self) -> None:
"""Instantiate a PowerupBoxFactory.
@ -187,21 +189,17 @@ class PowerupBoxFactory:
self._lastpoweruptype = ptype
return ptype
@staticmethod
def get() -> PowerupBoxFactory:
@classmethod
def get(cls) -> PowerupBoxFactory:
"""Return a shared ba.PowerupBoxFactory object, creating if needed."""
activity = ba.getactivity()
if activity is None:
raise RuntimeError('no current activity')
try:
# FIXME: et better way to store stuff with activity
# pylint: disable=protected-access
# noinspection PyProtectedMember
return activity._shared_powerup_factory # type: ignore
except Exception:
factory = activity._shared_powerup_factory = ( # type: ignore
PowerupBoxFactory())
return factory
raise ba.ContextError('No current activity.')
factory = activity.customdata.get(cls._STORENAME)
if factory is None:
factory = activity.customdata[cls._STORENAME] = PowerupBoxFactory()
assert isinstance(factory, PowerupBoxFactory)
return factory
class PowerupBox(ba.Actor):

6
assets/src/ba_data/python/bastd/actor/scoreboard.py
View File

@ -343,7 +343,7 @@ class Scoreboard:
category: Gameplay Classes
"""
_STORENAME = ba.storagename('entry')
_ENTRYSTORENAME = ba.storagename('entry')
def __init__(self, label: ba.Lstr = None, score_split: float = 0.7):
"""Instantiate a scoreboard.
@ -384,8 +384,8 @@ class Scoreboard:
# Create a proxy in the team which will kill
# our entry when it dies (for convenience)
assert self._STORENAME not in team.customdata
team.customdata[self._STORENAME] = _EntryProxy(self, team)
assert self._ENTRYSTORENAME not in team.customdata
team.customdata[self._ENTRYSTORENAME] = _EntryProxy(self, team)
# Now set the entry.
self._entries[team.id].set_value(score=score,

21
assets/src/ba_data/python/bastd/actor/spazbot.py
View File

@ -235,11 +235,7 @@ class SpazBot(Spaz):
# towards the flag and try to pick it up.
if self.target_flag:
if self.node.hold_node:
try:
holding_flag = (
self.node.hold_node.getnodetype() == 'flag')
except Exception:
holding_flag = False
holding_flag = (self.node.hold_node.getnodetype() == 'flag')
else:
holding_flag = False
@ -280,11 +276,8 @@ class SpazBot(Spaz):
# Not a flag-bearer. If we're holding anything but a bomb, drop it.
if self.node.hold_node:
try:
holding_bomb = (self.node.hold_node.getnodetype()
in ['bomb', 'prop'])
except Exception:
holding_bomb = False
holding_bomb = (self.node.hold_node.getnodetype()
in ['bomb', 'prop'])
if not holding_bomb:
self.node.pickup_pressed = True
self.node.pickup_pressed = False
@ -532,8 +525,8 @@ class SpazBot(Spaz):
picked_up_by = msg.node.source_player
else:
picked_up_by = None
except Exception as exc:
print('EXC on SpazBot DroppedMessage:', exc)
except Exception:
ba.print_exception('Error on SpazBot DroppedMessage.')
picked_up_by = None
if picked_up_by:
@ -969,7 +962,7 @@ class SpazBotSet:
])
except Exception:
bot_list = []
ba.print_exception('error updating bot list: ' +
ba.print_exception('Error updating bot list: ' +
str(self._bot_lists[self._bot_update_list]))
self._bot_update_list = (self._bot_update_list +
1) % self._bot_list_count
@ -988,7 +981,7 @@ class SpazBotSet:
player_pts.append((ba.Vec3(player.actor.node.position),
ba.Vec3(player.actor.node.velocity)))
except Exception:
ba.print_exception('error on bot-set _update')
ba.print_exception('Error on bot-set _update.')
for bot in bot_list:
bot.set_player_points(player_pts)

5
assets/src/ba_data/python/bastd/game/easteregghunt.py
View File

@ -139,12 +139,15 @@ class EasterEggHuntGame(ba.TeamGameActivity[Player, Team]):
if self.has_ended():
return
collision = ba.getcollision()
# Be defensive here; we could be hitting the corpse of a player
# who just left/etc.
try:
egg = collision.sourcenode.getdelegate(Egg, True)
player = collision.opposingnode.getdelegate(PlayerSpaz,
True).getplayer(
Player, True)
except Exception:
except ba.NotFoundError:
return
player.team.score += 1

2
assets/src/ba_data/python/bastd/game/football.py
View File

@ -653,7 +653,7 @@ class FootballCoopGame(ba.CoopGameActivity[Player, Team]):
assert self._flag is not None
self._flag.handlemessage(ba.DieMessage())
except Exception:
ba.print_exception('error in _kill_flag')
ba.print_exception('Error in _kill_flag.')
def _handle_score(self) -> None:
""" a point has been scored """

2
assets/src/ba_data/python/bastd/game/keepaway.py
View File

@ -208,7 +208,7 @@ class KeepAwayGame(ba.TeamGameActivity[Player, Team]):
holdingflag = (
player.actor.node.hold_node.getnodetype() == 'flag')
except Exception:
ba.print_exception('exception checking hold flag')
ba.print_exception('Error checking hold flag.')
if holdingflag:
self._holding_players.append(player)
player.team.holdingflag = True

8
assets/src/ba_data/python/bastd/game/kingofthehill.py
View File

@ -216,11 +216,9 @@ class KingOfTheHillGame(ba.TeamGameActivity[Player, Team]):
self._flag.set_score_text(str(scoring_team.time_remaining))
# Announce numbers we have sounds for.
try:
ba.playsound(
self._countdownsounds[scoring_team.time_remaining])
except Exception:
pass
numsound = self._countdownsounds.get(scoring_team.time_remaining)
if numsound is not None:
ba.playsound(numsound)
# winner
if scoring_team.time_remaining <= 0:

30
assets/src/ba_data/python/bastd/game/onslaught.py
View File

@ -1225,25 +1225,21 @@ class OnslaughtGame(ba.CoopGameActivity[Player, Team]):
if msg.killerplayer is not None:
self._handle_kill_achievements(msg)
target: Optional[Sequence[float]]
try:
assert msg.spazbot.node
if msg.spazbot.node:
target = msg.spazbot.node.position
except Exception:
ba.print_exception()
else:
target = None
try:
killerplayer = msg.killerplayer
self.stats.player_scored(killerplayer,
pts,
target=target,
kill=True,
screenmessage=False,
importance=importance)
ba.playsound(self._dingsound
if importance == 1 else self._dingsoundhigh,
volume=0.6)
except Exception:
pass
killerplayer = msg.killerplayer
self.stats.player_scored(killerplayer,
pts,
target=target,
kill=True,
screenmessage=False,
importance=importance)
ba.playsound(self._dingsound
if importance == 1 else self._dingsoundhigh,
volume=0.6)
# Normally we pull scores from the score-set, but if there's
# no player lets be explicit.

8
assets/src/ba_data/python/bastd/game/race.py
View File

@ -361,8 +361,8 @@ class RaceGame(ba.TeamGameActivity[Player, Team]):
2.2: 0
})
ba.timer(2.3, mathnode.delete)
except Exception as exc:
print('Exception printing lap:', exc)
except Exception:
ba.print_exception('Error printing lap.')
def on_team_join(self, team: Team) -> None:
self._update_scoreboard()
@ -392,7 +392,7 @@ class RaceGame(ba.TeamGameActivity[Player, Team]):
if otherplayer.actor is not None:
otherplayer.actor.handlemessage(ba.DieMessage())
except Exception:
ba.print_exception('Error sending diemessages')
ba.print_exception('Error sending DieMessage.')
# Defer so team/player lists will be updated.
ba.pushcall(self._check_end_game)
@ -520,7 +520,7 @@ class RaceGame(ba.TeamGameActivity[Player, Team]):
assert isinstance(player.actor, PlayerSpaz)
player.actor.connect_controls_to_player()
except Exception:
ba.print_exception('Error in race player connects')
ba.print_exception('Error in race player connects.')
assert self._timer is not None
self._timer.start()

2
assets/src/ba_data/python/bastd/game/runaround.py
View File

@ -1158,7 +1158,7 @@ class RunaroundGame(ba.CoopGameActivity[Player, Team]):
self._dingsoundhigh,
volume=0.6)
except Exception:
ba.print_exception('Error on SpazBotDiedMessage')
ba.print_exception('Error on SpazBotDiedMessage.')
# Normally we pull scores from the score-set, but if there's no
# player lets be explicit.

2
assets/src/ba_data/python/bastd/game/thelaststand.py
View File

@ -216,7 +216,7 @@ class TheLastStandGame(ba.CoopGameActivity[Player, Team]):
assert player.actor.node
playerpts.append(player.actor.node.position)
except Exception:
ba.print_exception('Error updating bots')
ba.print_exception('Error updating bots.')
for i in range(3):
for playerpt in playerpts:
dists[i] += abs(playerpt[0] - botspawnpts[i][0])

6
assets/src/ba_data/python/bastd/tutorial.py
View File

@ -2305,8 +2305,7 @@ class TutorialActivity(ba.Activity[Player, Team]):
]
except Exception:
import traceback
traceback.print_exc()
ba.print_exception()
# If we read some, exec them.
if self._entries:
@ -2324,8 +2323,7 @@ class TutorialActivity(ba.Activity[Player, Team]):
result = entry.run(self)
except Exception:
result = None
import traceback
traceback.print_exc()
ba.print_exception()
# If the entry returns an int value, set a timer;
# otherwise just keep going.

13
assets/src/ba_data/python/bastd/ui/account/settings.py
View File

@ -984,7 +984,7 @@ class AccountSettingsWindow(ba.Window):
str(int(progress * 100.0)) + '%')])
except Exception:
p_str = '?'
ba.print_exception('error calculating co-op campaign progress')
ba.print_exception('Error calculating co-op campaign progress.')
ba.textwidget(edit=self._campaign_progress_text, text=p_str)
def _refresh_tickets_text(self) -> None:
@ -1081,7 +1081,7 @@ class AccountSettingsWindow(ba.Window):
campaign = getcampaign('Challenges')
campaign.reset() # also writes the config..
except Exception:
ba.print_exception('exception resetting co-op campaign progress')
ba.print_exception('Error resetting co-op campaign progress.')
ba.playsound(ba.getsound('shieldDown'))
self._refresh()
@ -1108,14 +1108,11 @@ class AccountSettingsWindow(ba.Window):
raise ValueError('unrecognized selection')
ba.app.window_states[self.__class__.__name__] = sel_name
except Exception:
ba.print_exception('exception saving state for', self.__class__)
ba.print_exception(f'Error saving state for {self}.')
def _restore_state(self) -> None:
try:
try:
sel_name = ba.app.window_states[self.__class__.__name__]
except Exception:
sel_name = None
sel_name = ba.app.window_states.get(self.__class__.__name__)
if sel_name == 'Back':
sel = self._back_button
elif sel_name == 'Scroll':
@ -1124,4 +1121,4 @@ class AccountSettingsWindow(ba.Window):
sel = self._back_button
ba.containerwidget(edit=self._root_widget, selected_child=sel)
except Exception:
ba.print_exception('error restoring state for', self.__class__)
ba.print_exception(f'Error restoring state for {self}.')

6
assets/src/ba_data/python/bastd/ui/account/viewer.py
View File

@ -208,7 +208,7 @@ class AccountViewerWindow(popup.PopupWindow):
if trophystr == '':
trophystr = '-'
except Exception:
ba.print_exception('Error displaying trophies')
ba.print_exception('Error displaying trophies.')
account_name_spacing = 15
tscale = 0.65
ts_height = _ba.get_string_height(trophystr,
@ -255,7 +255,7 @@ class AccountViewerWindow(popup.PopupWindow):
tint2_color=tint2_color)
v -= 95
except Exception:
ba.print_exception('Error displaying character')
ba.print_exception('Error displaying character.')
ba.textwidget(
parent=self._subcontainer,
size=(0, 0),
@ -474,7 +474,7 @@ class AccountViewerWindow(popup.PopupWindow):
text=trophystr)
except Exception:
ba.print_exception('Error displaying account info')
ba.print_exception('Error displaying account info.')
def _on_cancel_press(self) -> None:
self._transition_out()

21
assets/src/ba_data/python/bastd/ui/coop/browser.py
View File

@ -83,10 +83,8 @@ class CoopBrowserWindow(ba.Window):
# Try to recreate the same number of buttons we had last time so our
# re-selection code works.
try:
self._tournament_button_count = app.config['Tournament Rows']
except Exception:
self._tournament_button_count = 0
self._tournament_button_count = app.config.get('Tournament Rows', 0)
assert isinstance(self._tournament_button_count, int)
self._easy_button: Optional[ba.Widget] = None
self._hard_button: Optional[ba.Widget] = None
@ -345,7 +343,7 @@ class CoopBrowserWindow(ba.Window):
ba.imagewidget(edit=self._hard_button_lock_image,
opacity=0.0 if have_pro_options() else 1.0)
except Exception:
ba.print_exception('error updating campaign lock')
ba.print_exception('Error updating campaign lock.')
def _update_for_data(self, data: Optional[List[Dict[str, Any]]]) -> None:
# pylint: disable=too-many-statements
@ -1006,7 +1004,7 @@ class CoopBrowserWindow(ba.Window):
up_widget=tournament_h_scroll if self._tournament_buttons
else self._tournament_info_button)
except Exception:
ba.print_exception('Error wiring up custom buttons')
ba.print_exception('Error wiring up custom buttons.')
if self._back_button is not None:
ba.buttonwidget(edit=self._back_button,
@ -1531,11 +1529,8 @@ class CoopBrowserWindow(ba.Window):
def _restore_state(self) -> None:
try:
try:
sel_name = ba.app.window_states[
self.__class__.__name__]['sel_name']
except Exception:
sel_name = None
sel_name = ba.app.window_states.get(self.__class__.__name__,
{}).get('sel_name')
if sel_name == 'Back':
sel = self._back_button
elif sel_name == 'Scroll':
@ -1548,7 +1543,7 @@ class CoopBrowserWindow(ba.Window):
sel = self._scrollwidget
ba.containerwidget(edit=self._root_widget, selected_child=sel)
except Exception:
ba.print_exception('error restoring state for', self.__class__)
ba.print_exception(f'Error restoring state for {self}.')
def _save_state(self) -> None:
cfg = ba.app.config
@ -1568,7 +1563,7 @@ class CoopBrowserWindow(ba.Window):
'sel_name': sel_name
}
except Exception:
ba.print_exception('error saving state for', self.__class__)
ba.print_exception(f'Error saving state for {self}.')
cfg['Selected Coop Row'] = self._selected_row
cfg['Selected Coop Custom Level'] = self._selected_custom_level

2
assets/src/ba_data/python/bastd/ui/creditslist.py
View File

@ -173,7 +173,7 @@ class CreditsListWindow(ba.Window):
translation_contributors = (json.loads(
infile.read())['translation_contributors'])
except Exception:
ba.print_exception('error reading translation contributors')
ba.print_exception('Error reading translation contributors.')
translation_contributors = []
translation_names = _format_names(translation_contributors, 60)

2
assets/src/ba_data/python/bastd/ui/fileselector.py
View File

@ -181,7 +181,7 @@ class FileSelectorWindow(ba.Window):
test_path))
except Exception:
ba.print_exception(
'error on FileSelectorWindow._on_entry_activated')
'Error in FileSelectorWindow._on_entry_activated().')
if new_path is not None:
self._set_path(new_path)

14
assets/src/ba_data/python/bastd/ui/gather.py
View File

@ -828,14 +828,14 @@ class GatherWindow(ba.Window):
self._call = call
def run(self) -> None:
result: Optional[str]
try:
import socket
addr2 = socket.gethostbyname(self._name)
ba.pushcall(ba.Call(self._call, addr2),
from_other_thread=True)
result = socket.gethostbyname(self._name)
except Exception:
ba.pushcall(ba.Call(self._call, None),
from_other_thread=True)
result = None
ba.pushcall(ba.Call(self._call, result),
from_other_thread=True)
def do_it_2(addr2: Optional[str]) -> None:
if addr2 is None:
@ -1969,7 +1969,7 @@ class GatherWindow(ba.Window):
'internet_tab': self._internet_tab
}
except Exception:
ba.print_exception('error saving state for', self.__class__)
ba.print_exception(f'Error saving state for {self}.')
def _restore_state(self) -> None:
try:
@ -1990,7 +1990,7 @@ class GatherWindow(ba.Window):
sel = self._tab_buttons[current_tab]
ba.containerwidget(edit=self._root_widget, selected_child=sel)
except Exception:
ba.print_exception('error restoring state for', self.__class__)
ba.print_exception(f'Error restoring state for {self}.')
def _back(self) -> None:
from bastd.ui import mainmenu

5
assets/src/ba_data/python/bastd/ui/kiosk.py
View File

@ -336,10 +336,7 @@ class KioskWindow(ba.Window):
repeat=True)
def _restore_state(self) -> None:
try:
sel_name = ba.app.window_states[self.__class__.__name__]
except Exception:
sel_name = None
sel_name = ba.app.window_states.get(self.__class__.__name__)
sel: Optional[ba.Widget]
if sel_name == 'b1':
sel = self._b1

17
assets/src/ba_data/python/bastd/ui/league/rankbutton.py
View File

@ -227,7 +227,7 @@ class LeagueRankButton:
ba.buttonwidget(edit=self._button, color=color_used)
except Exception:
ba.print_exception('error doing smooth update')
ba.print_exception('Error doing smooth update.')
self._smooth_update_timer = None
def _update_for_league_rank_data(self, data: Optional[Dict[str,
@ -285,7 +285,7 @@ class LeagueRankButton:
status_text = str(int(self._smooth_percent)) + '%'
except Exception:
ba.print_exception('error updating power ranking')
ba.print_exception('Error updating power ranking.')
self._percent = self._rank = None
status_text = '-'
@ -326,10 +326,15 @@ class LeagueRankButton:
else:
try:
assert data is not None
txt = ba.Lstr(resource='league.leagueFullText',
subs=[('${NAME}',
ba.Lstr(translate=('leagueNames',
data['l']['n'])))])
txt = ba.Lstr(
resource='league.leagueFullText',
subs=[
(
'${NAME}',
ba.Lstr(translate=('leagueNames', data['l']['n'])),
),
],
)
t_color = data['l']['c']
except Exception:
txt = ba.Lstr(

4
assets/src/ba_data/python/bastd/ui/league/rankwindow.py
View File

@ -259,7 +259,7 @@ class LeagueRankWindow(ba.Window):
ba.textwidget(edit=self._season_ends_text, text='')
ba.textwidget(edit=self._trophy_counts_reset_text, text='')
except Exception:
ba.print_exception('error showing updated rank info')
ba.print_exception('Error showing updated rank info.')
self._last_power_ranking_query_time = cur_time
self._doing_power_ranking_query = True
@ -651,7 +651,7 @@ class LeagueRankWindow(ba.Window):
'${REMAINING}', str(data['scores'][-1][1])))
do_percent = True
except Exception:
ba.print_exception('error updating power ranking')
ba.print_exception('Error updating power ranking.')
status_text = self._rdict.powerRankingNotInTopText.replace(
'${NUMBER}', str(data['listSize']))
extra_text = ''

13
assets/src/ba_data/python/bastd/ui/mainmenu.py
View File

@ -109,8 +109,8 @@ class MainMenuWindow(ba.Window):
ba.timer(2.5,
_check_show_bs_remote_window,
timetype=ba.TimeType.REAL)
except Exception as exc:
print('EXC bs_remote_show', exc)
except Exception:
ba.print_exception('Error showing get-remote-app info')
def _get_store_char_tex(self) -> str:
return ('storeCharacterXmas' if _ba.get_account_misc_read_val(
@ -677,8 +677,8 @@ class MainMenuWindow(ba.Window):
str(cme))
except Exception:
custom_menu_entries = []
ba.print_exception('exception getting custom menu entries for',
session)
ba.print_exception(
f'Error getting custom menu entries for {session}')
self._width = 250.0
self._height = 250.0 if self._input_player else 180.0
if self._is_kiosk and self._input_player:
@ -738,10 +738,7 @@ class MainMenuWindow(ba.Window):
# Ask the entry whether we should resume when we call
# it (defaults to true).
try:
resume = entry['resume_on_call']
except Exception:
resume = True
resume = bool(entry.get('resume_on_call', True))
if resume:
call = ba.Call(self._resume_and_call, entry['call'])

2
assets/src/ba_data/python/bastd/ui/party.py
View File

@ -284,7 +284,7 @@ class PartyWindow(ba.Window):
'displayString']
except Exception:
ba.print_exception(
'error calcing client name str')
'Error calcing client name str.')
p_str = '???'
widget = ba.textwidget(parent=self._root_widget,

2
assets/src/ba_data/python/bastd/ui/partyqueue.py
View File

@ -279,7 +279,7 @@ class PartyQueueWindow(ba.Window):
})
_ba.run_transactions()
except Exception:
ba.print_exception('err removing self from party queue')
ba.print_exception('Error removing self from party queue.')
def get_line_left(self) -> float:
"""(internal)"""

9
assets/src/ba_data/python/bastd/ui/play.py
View File

@ -541,14 +541,11 @@ class PlayWindow(ba.Window):
raise ValueError(f'unrecognized selection {sel}')
ba.app.window_states[self.__class__.__name__] = sel_name
except Exception:
ba.print_exception('error saving state for', self.__class__)
ba.print_exception(f'Error saving state for {self}.')
def _restore_state(self) -> None:
try:
try:
sel_name = ba.app.window_states[self.__class__.__name__]
except Exception:
sel_name = None
sel_name = ba.app.window_states.get(self.__class__.__name__)
if sel_name == 'Team Games':
sel = self._teams_button
elif sel_name == 'Co-op Games':
@ -561,4 +558,4 @@ class PlayWindow(ba.Window):
sel = self._coop_button
ba.containerwidget(edit=self._root_widget, selected_child=sel)
except Exception:
ba.print_exception('error restoring state for', self.__class__)
ba.print_exception(f'Error restoring state for {self}.')

2
assets/src/ba_data/python/bastd/ui/playlist/browser.py
View File

@ -452,7 +452,7 @@ class PlaylistBrowserWindow(ba.Window):
maptype: Optional[Type[ba.Map]]
try:
maptype = get_map_class(mapname)
except Exception:
except ba.NotFoundError:
maptype = None
if maptype is not None:
tex_name = maptype.get_preview_texture_name()

16
assets/src/ba_data/python/bastd/ui/playlist/customizebrowser.py
View File

@ -229,11 +229,8 @@ class PlaylistCustomizeBrowserWindow(ba.Window):
h = 145
try:
self._do_randomize_val = ba.app.config[self._pvars.config_name +
' Playlist Randomize']
except Exception:
self._do_randomize_val = 0
self._do_randomize_val = ba.app.config.get(
self._pvars.config_name + ' Playlist Randomize', 0)
h += 210
@ -300,7 +297,7 @@ class PlaylistCustomizeBrowserWindow(ba.Window):
_ba.new_host_session(self._sessiontype)
except Exception:
from bastd import mainmenu
ba.print_exception('exception running session', self._sessiontype)
ba.print_exception(f'Error running session {self._sessiontype}.')
# Drop back into a main menu session.
_ba.new_host_session(mainmenu.MainMenuSession)
@ -318,11 +315,8 @@ class PlaylistCustomizeBrowserWindow(ba.Window):
# If there was no prev selection, look in prefs.
if old_selection is None:
try:
old_selection = ba.app.config[self._pvars.config_name +
' Playlist Selection']
except Exception:
pass
old_selection = ba.app.config.get(self._pvars.config_name +
' Playlist Selection')
old_selection_index = self._selected_playlist_index

4
assets/src/ba_data/python/bastd/ui/playlist/editgame.py
View File

@ -97,7 +97,7 @@ class PlaylistEditGameWindow(ba.Window):
if filtered_map_name in valid_maps:
self._map = filtered_map_name
except Exception:
ba.print_exception('exception getting map for editor')
ba.print_exception('Error getting map for editor.')
if config is not None and 'settings' in config:
self._settings = config['settings']
@ -427,7 +427,7 @@ class PlaylistEditGameWindow(ba.Window):
prev_widgets = cwdg
except Exception:
ba.print_exception(
'error wiring up game-settings-select widget column')
'Error wiring up game-settings-select widget column.')
ba.buttonwidget(edit=add_button, on_activate_call=ba.Call(self._add))
ba.containerwidget(edit=self._root_widget,

3
assets/src/ba_data/python/bastd/ui/playlist/mapselect.py
View File

@ -135,8 +135,7 @@ class PlaylistMapSelectWindow(ba.Window):
map_tex = ba.gettexture(map_tex_name)
self._maps.append((mapname, map_tex))
except Exception:
print('invalid map preview texture: "' + map_tex_name +
'"')
print(f'Invalid map preview texture: "{map_tex_name}".')
else:
print('Error: no map preview texture for map:', mapname)

13
assets/src/ba_data/python/bastd/ui/playoptions.py
View File

@ -117,7 +117,7 @@ class PlayOptionsWindow(popup.PopupWindow):
maptype: Optional[Type[ba.Map]]
try:
maptype = get_map_class(mapname)
except Exception:
except ba.NotFoundError:
maptype = None
if maptype is not None:
tex_name = maptype.get_preview_texture_name()
@ -141,7 +141,7 @@ class PlayOptionsWindow(popup.PopupWindow):
self._height += self._row_height * rows
except Exception:
ba.print_exception('error listing playlist maps')
ba.print_exception('Error listing playlist maps.')
show_shuffle_check_box = game_count > 1
@ -304,10 +304,7 @@ class PlayOptionsWindow(popup.PopupWindow):
on_value_change_call=_cb_callback)
# Show tutorial.
try:
show_tutorial = ba.app.config['Show Tutorial']
except Exception:
show_tutorial = True
show_tutorial = bool(ba.app.config.get('Show Tutorial', True))
def _cb_callback_2(val: bool) -> None:
cfg = ba.app.config
@ -388,10 +385,8 @@ class PlayOptionsWindow(popup.PopupWindow):
def _does_target_playlist_exist(self) -> bool:
if self._playlist == '__default__':
return True
val: bool = self._playlist in ba.app.config.get(
return self._playlist in ba.app.config.get(
self._pvars.config_name + ' Playlists', {})
assert isinstance(val, bool)
return val
def _update(self) -> None:
# All we do here is make sure our targeted playlist still exists,

14
assets/src/ba_data/python/bastd/ui/profile/browser.py
View File

@ -290,10 +290,7 @@ class ProfileBrowserWindow(ba.Window):
# Delete old.
while self._profile_widgets:
self._profile_widgets.pop().delete()
try:
self._profiles = ba.app.config['Player Profiles']
except Exception:
self._profiles = {}
self._profiles = ba.app.config.get('Player Profiles', {})
assert self._profiles is not None
items = list(self._profiles.items())
items.sort(key=lambda x: x[0].lower())
@ -365,14 +362,11 @@ class ProfileBrowserWindow(ba.Window):
sel_name = 'Back'
ba.app.window_states[self.__class__.__name__] = sel_name
except Exception:
ba.print_exception('error saving state for', self.__class__)
ba.print_exception(f'Error saving state for {self}.')
def _restore_state(self) -> None:
try:
try:
sel_name = ba.app.window_states[self.__class__.__name__]
except Exception:
sel_name = None
sel_name = ba.app.window_states.get(self.__class__.__name__)
if sel_name == 'Scroll':
sel = self._scrollwidget
elif sel_name == 'New':
@ -392,4 +386,4 @@ class ProfileBrowserWindow(ba.Window):
sel = self._scrollwidget
ba.containerwidget(edit=self._root_widget, selected_child=sel)
except Exception:
ba.print_exception('error restoring state for', self.__class__)
ba.print_exception(f'Error restoring state for {self}.')

13
assets/src/ba_data/python/bastd/ui/settings/advanced.py
View File

@ -253,7 +253,7 @@ class AdvancedSettingsWindow(ba.Window):
lang_names_translated = (json.loads(
infile.read())['lang_names_translated'])
except Exception:
ba.print_exception('error reading lang data')
ba.print_exception('Error reading lang data.')
lang_names_translated = {}
langs_translated = {}
@ -605,16 +605,13 @@ class AdvancedSettingsWindow(ba.Window):
'sel_name': sel_name
}
except Exception:
ba.print_exception('error saving state for', self.__class__)
ba.print_exception(f'Error saving state for {self.__class__}')
def _restore_state(self) -> None:
# pylint: disable=too-many-branches
try:
try:
sel_name = ba.app.window_states[
self.__class__.__name__]['sel_name']
except Exception:
sel_name = None
sel_name = ba.app.window_states.get(self.__class__.__name__,
{}).get('sel_name')
if sel_name == 'Back':
sel = self._back_button
else:
@ -654,7 +651,7 @@ class AdvancedSettingsWindow(ba.Window):
selected_child=sel,
visible_child=sel)
except Exception:
ba.print_exception('error restoring state for', self.__class__)
ba.print_exception(f'Error restoring state for {self.__class__}')
def _on_menu_open(self) -> None:
self._menu_open = True

11
assets/src/ba_data/python/bastd/ui/settings/allsettings.py
View File

@ -257,15 +257,12 @@ class AllSettingsWindow(ba.Window):
'sel_name': sel_name
}
except Exception:
ba.print_exception('error saving state for', self.__class__)
ba.print_exception(f'Error saving state for {self}.')
def _restore_state(self) -> None:
try:
try:
sel_name = ba.app.window_states[
self.__class__.__name__]['sel_name']
except Exception:
sel_name = None
sel_name = ba.app.window_states.get(self.__class__.__name__,
{}).get('sel_name')
sel: Optional[ba.Widget]
if sel_name == 'Controllers':
sel = self._controllers_button
@ -282,4 +279,4 @@ class AllSettingsWindow(ba.Window):
if sel is not None:
ba.containerwidget(edit=self._root_widget, selected_child=sel)
except Exception:
ba.print_exception('error restoring state for', self.__class__)
ba.print_exception(f'Error restoring state for {self}.')

11
assets/src/ba_data/python/bastd/ui/settings/audio.py
View File

@ -210,7 +210,7 @@ class AudioSettingsWindow(ba.Window):
try:
ba.widget(edit=back_button, down_widget=svne.minusbutton)
except Exception:
ba.print_exception('error wiring AudioSettingsWindow')
ba.print_exception('Error wiring AudioSettingsWindow.')
self._restore_state()
@ -269,14 +269,11 @@ class AudioSettingsWindow(ba.Window):
raise ValueError(f'unrecognized selection \'{sel}\'')
ba.app.window_states[self.__class__.__name__] = sel_name
except Exception:
ba.print_exception('error saving state for', self.__class__)
ba.print_exception(f'Error saving state for {self.__class__}.')
def _restore_state(self) -> None:
try:
try:
sel_name = ba.app.window_states[self.__class__.__name__]
except Exception:
sel_name = None
sel_name = ba.app.window_states.get(self.__class__.__name__)
sel: Optional[ba.Widget]
if sel_name == 'SoundMinus':
sel = self._sound_volume_numedit.minusbutton
@ -297,4 +294,4 @@ class AudioSettingsWindow(ba.Window):
if sel:
ba.containerwidget(edit=self._root_widget, selected_child=sel)
except Exception:
ba.print_exception('error restoring state for', self.__class__)
ba.print_exception(f'Error restoring state for {self.__class__}.')

5
assets/src/ba_data/python/bastd/ui/settings/controls.py
View File

@ -474,10 +474,7 @@ class ControlsSettingsWindow(ba.Window):
ba.app.window_states[self.__class__.__name__] = sel_name
def _restore_state(self) -> None:
try:
sel_name = ba.app.window_states[self.__class__.__name__]
except Exception:
sel_name = None
sel_name = ba.app.window_states.get(self.__class__.__name__)
if sel_name == 'GamePads':
sel = self._gamepads_button
elif sel_name == 'Touch':

2
assets/src/ba_data/python/bastd/ui/settings/gamepad.py
View File

@ -351,7 +351,7 @@ class GamepadSettingsWindow(ba.Window):
ba.widget(edit=cancel_button, right_widget=save_button)
ba.widget(edit=save_button, left_widget=cancel_button)
except Exception:
ba.print_exception('error wiring gamepad config window')
ba.print_exception('Error wiring up gamepad config window.')
def get_r(self) -> str:
"""(internal)"""

5
assets/src/ba_data/python/bastd/ui/settings/gamepadadvanced.py
View File

@ -403,10 +403,7 @@ class GamepadAdvancedSettingsWindow(ba.Window):
def _inc(self, control: str, min_val: float, max_val: float,
inc: float) -> None:
try:
val = self._parent_window.get_settings()[control]
except Exception:
val = 1.0
val = self._parent_window.get_settings().get(control, 1.0)
val = min(max_val, max(min_val, val + inc))
if abs(1.0 - val) < 0.001:
if control in self._parent_window.get_settings():

20
assets/src/ba_data/python/bastd/ui/soundtrack/browser.py
View File

@ -379,19 +379,14 @@ class SoundtrackBrowserWindow(ba.Window):
# If there was no prev selection, look in prefs.
if old_selection is None:
try:
old_selection = ba.app.config['Soundtrack']
except Exception:
pass
old_selection = ba.app.config.get('Soundtrack')
old_selection_index = self._selected_soundtrack_index
# Delete old.
while self._soundtrack_widgets:
self._soundtrack_widgets.pop().delete()
try:
self._soundtracks = ba.app.config['Soundtracks']
except Exception:
self._soundtracks = {}
self._soundtracks = ba.app.config.get('Soundtracks', {})
assert self._soundtracks is not None
items = list(self._soundtracks.items())
items.sort(key=lambda x: x[0].lower())
@ -488,14 +483,11 @@ class SoundtrackBrowserWindow(ba.Window):
raise ValueError(f'unrecognized selection \'{sel}\'')
ba.app.window_states[self.__class__.__name__] = sel_name
except Exception:
ba.print_exception('error saving state for', self.__class__)
ba.print_exception(f'Error saving state for {self}.')
def _restore_state(self) -> None:
try:
try:
sel_name = ba.app.window_states[self.__class__.__name__]
except Exception:
sel_name = None
sel_name = ba.app.window_states.get(self.__class__.__name__)
if sel_name == 'Scroll':
sel = self._scrollwidget
elif sel_name == 'New':
@ -510,4 +502,4 @@ class SoundtrackBrowserWindow(ba.Window):
sel = self._scrollwidget
ba.containerwidget(edit=self._root_widget, selected_child=sel)
except Exception:
ba.print_exception('error restoring state for', self.__class__)
ba.print_exception(f'Error restoring state for {self}.')

5
assets/src/ba_data/python/bastd/ui/soundtrack/edit.py
View File

@ -213,10 +213,7 @@ class SoundtrackEditWindow(ba.Window):
claims_left_right=True,
claims_tab=True,
selection_loop_to_parent=True)
try:
type_name = type_names_translated[song_type]
except Exception:
type_name = song_type
type_name = type_names_translated.get(song_type, song_type)
ba.textwidget(parent=row,
size=(230, 25),
always_highlight=True,

3
assets/src/ba_data/python/bastd/ui/specialoffer.py
View File

@ -119,6 +119,7 @@ class SpecialOfferWindow(ba.Window):
resource='store.salePercentText').evaluate().replace(
'${PERCENT}', str(percent_off))
except Exception:
ba.print_exception('Error setting up special-offer')
original_price_str = new_price_str = '?'
percent_off_text = ''
@ -462,6 +463,6 @@ def show_offer() -> bool:
app.special_offer = None
return True
except Exception:
ba.print_exception('Error showing offer')
ba.print_exception('Error showing offer.')
return False

16
assets/src/ba_data/python/bastd/ui/store/browser.py
View File

@ -1008,20 +1008,14 @@ class StoreBrowserWindow(ba.Window):
'tab': self._current_tab
}
except Exception:
ba.print_exception('error saving state for', self.__class__)
ba.print_exception(f'Error saving state for {self}.')
def _restore_state(self) -> None:
try:
sel: Optional[ba.Widget]
try:
sel_name = (
ba.app.window_states[self.__class__.__name__]['sel_name'])
except Exception:
sel_name = None
try:
current_tab = ba.app.config['Store Tab']
except Exception:
current_tab = None
sel_name = ba.app.window_states.get(self.__class__.__name__,
{}).get('sel_name')
current_tab = ba.app.config.get('Store Tab')
if self._show_tab is not None:
current_tab = self._show_tab
if current_tab is None or current_tab not in self._tab_buttons:
@ -1044,7 +1038,7 @@ class StoreBrowserWindow(ba.Window):
if sel is not None:
ba.containerwidget(edit=self._root_widget, selected_child=sel)
except Exception:
ba.print_exception('error restoring state for', self.__class__)
ba.print_exception(f'Error restoring state for {self}.')
def _on_get_more_tickets_press(self) -> None:
# pylint: disable=cyclic-import

2
assets/src/ba_data/python/bastd/ui/store/button.py
View File

@ -259,7 +259,7 @@ class StoreButton:
if to_end > 0:
sale_times.append(to_end)
except Exception:
ba.print_exception('Error parsing sales')
ba.print_exception('Error parsing sales.')
if sale_times:
sale_time = int(min(sale_times) * 1000)

8
assets/src/ba_data/python/bastd/ui/tournamententry.py
View File

@ -332,10 +332,7 @@ class TournamentEntryWindow(popup.PopupWindow):
cfg.commit()
def _restore_state(self) -> None:
try:
sel_name = ba.app.config['Tournament Pay Selection']
except Exception:
sel_name = 'Tickets'
sel_name = ba.app.config.get('Tournament Pay Selection', 'Tickets')
if sel_name == 'Ad' and self._pay_with_ad_btn is not None:
sel = self._pay_with_ad_btn
else:
@ -457,13 +454,14 @@ class TournamentEntryWindow(popup.PopupWindow):
ba.screenmessage(ba.Lstr(translate=('serverResponses',
'Entering tournament...')),
color=(0, 1, 0))
# We can hit exceptions here if _tournament_activity ends before
# our restart attempt happens.
# In this case we'll fall back to launching a new session.
# This is not ideal since players will have to rejoin, etc.,
# but it works for now.
except Exception:
pass
print('Error restarting tournament activity.')
# If we had no existing activity (or were unable to restart it)
# launch a new session.

45
assets/src/ba_data/python/bastd/ui/watch.py
View File

@ -286,16 +286,17 @@ class WatchWindow(ba.Window):
def do_it() -> None:
try:
# reset to normal speed
# Reset to normal speed.
_ba.set_replay_speed_exponent(0)
_ba.fade_screen(True)
assert self._my_replay_selected is not None
_ba.new_replay_session(_ba.get_replays_dir() + '/' +
self._my_replay_selected)
except Exception:
ba.print_exception('exception running replay session')
# drop back into a fresh main menu session
# in case we half-launched or something..
ba.print_exception('Error running replay session.')
# Drop back into a fresh main menu session
# in case we half-launched or something.
from bastd import mainmenu
_ba.new_host_session(mainmenu.MainMenuSession)
@ -391,11 +392,12 @@ class WatchWindow(ba.Window):
ba.playsound(ba.getsound('gunCocking'))
except Exception:
ba.print_exception(
f"error renaming replay '{replay}' to '{new_name}'")
f"Error renaming replay '{replay}' to '{new_name}'.")
ba.playsound(ba.getsound('error'))
ba.screenmessage(ba.Lstr(resource=self._r +
'.replayRenameErrorText'),
color=(1, 0, 0))
ba.screenmessage(
ba.Lstr(resource=self._r + '.replayRenameErrorText'),
color=(1, 0, 0),
)
ba.containerwidget(edit=self._my_replays_rename_window,
transition='out_scale')
@ -428,11 +430,12 @@ class WatchWindow(ba.Window):
if replay == self._my_replay_selected:
self._my_replay_selected = None
except Exception:
ba.print_exception("exception deleting replay '" + replay + "'")
ba.print_exception(f"Error deleting replay '{replay}'.")
ba.playsound(ba.getsound('error'))
ba.screenmessage(ba.Lstr(resource=self._r +
'.replayDeleteErrorText'),
color=(1, 0, 0))
ba.screenmessage(
ba.Lstr(resource=self._r + '.replayDeleteErrorText'),
color=(1, 0, 0),
)
def _on_my_replay_select(self, replay: str) -> None:
self._my_replay_selected = replay
@ -448,7 +451,7 @@ class WatchWindow(ba.Window):
names = [n for n in names if n.endswith('.brp')]
names.sort(key=lambda x: x.lower())
except Exception:
ba.print_exception('error listing replays dir')
ba.print_exception('Error listing replays dir.')
names = []
assert self._my_replays_scroll_width is not None
@ -488,19 +491,13 @@ class WatchWindow(ba.Window):
'tab': self._current_tab
}
except Exception:
ba.print_exception('error saving state for', self.__class__)
ba.print_exception(f'Error saving state for {self}.')
def _restore_state(self) -> None:
try:
try:
sel_name = ba.app.window_states[
self.__class__.__name__]['sel_name']
except Exception:
sel_name = None
try:
current_tab = ba.app.config['Watch Tab']
except Exception:
current_tab = None
sel_name = ba.app.window_states.get(self.__class__.__name__,
{}).get('sel_name')
current_tab = ba.app.config.get('Watch Tab')
if current_tab is None or current_tab not in self._tab_buttons:
current_tab = 'my_replays'
self._set_tab(current_tab)
@ -517,7 +514,7 @@ class WatchWindow(ba.Window):
sel = self._tab_buttons[current_tab]
ba.containerwidget(edit=self._root_widget, selected_child=sel)
except Exception:
ba.print_exception('error restoring state for', self.__class__)
ba.print_exception(f'Error restoring state for {self}.')
def _back(self) -> None:
from bastd.ui import mainmenu

4
docs/ba_module.md
View File

@ -1,5 +1,5 @@
<!-- THIS FILE IS AUTO GENERATED; DO NOT EDIT BY HAND -->
<h4><em>last updated on 2020-06-16 for Ballistica version 1.5.5 build 20070</em></h4>
<h4><em>last updated on 2020-06-16 for Ballistica version 1.5.5 build 20071</em></h4>
<p>This page documents the Python classes and functions in the 'ba' module,
which are the ones most relevant to modding in Ballistica. If you come across something you feel should be included here or could be better explained, please <a href="mailto:support@froemling.net">let me know</a>. Happy modding!</p>
<hr>
@ -6620,7 +6620,7 @@ playing, the playing track will not be restarted.</p>
<hr>
<h2><strong><a name="function_ba_storagename">ba.storagename()</a></strong></h3>
<p><span>storagename(basename: str) -&gt; str</span></p>
<p><span>storagename(suffix: str = None) -&gt; str</span></p>
<p>Generate a (hopefully) unique name for storing things in public places.</p>

4
tools/bacloud
View File

@ -438,7 +438,7 @@ if __name__ == '__main__':
except KeyboardInterrupt:
# Let's do a clean fail on keyboard interrupt.
# Can make this optional if a backtrace is ever useful..
sys.exit(-1)
sys.exit(1)
except CleanError as exc:
exc.pretty_print()
sys.exit(-1)
sys.exit(1)

3
tools/efro/entity/_value.py
View File

@ -369,7 +369,8 @@ class BaseEnumValue(TypedValue[T]):
except ValueError:
if error:
raise ValueError(
f'Invalid value for {self._enumtype}: {data}')
f'Invalid value for {self._enumtype}: {data}'
) from None
logging.error('Ignoring invalid value for %s: %s',
self._enumtype, data)
data = self._default_data

2
tools/efro/terminal.py
View File

@ -145,7 +145,7 @@ def _windows_enable_color() -> bool:
return set_conout_mode(mode, mask)
except WindowsError as exc:
if exc.winerror == ERROR_INVALID_PARAMETER:
raise NotImplementedError
raise NotImplementedError from exc
raise
try: