Skip to content

Commit

Permalink
umu_run: update error handling when getting layer id
Browse files Browse the repository at this point in the history
  • Loading branch information
R1kaB3rN committed Oct 22, 2024
1 parent 63dc529 commit 1b0cd3d
Showing 1 changed file with 23 additions and 17 deletions.
40 changes: 23 additions & 17 deletions umu/umu_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -497,27 +497,33 @@ def get_steam_layer_id() -> int:
"""Get the Steam layer ID from the host environment variables."""
steam_layer_id: int = 0

try:
if os.environ.get("STEAM_COMPAT_TRANSCODED_MEDIA_PATH"):
steam_layer_id = int(
if os.environ.get("STEAM_COMPAT_TRANSCODED_MEDIA_PATH"):
try:
return int(
Path(os.environ["STEAM_COMPAT_TRANSCODED_MEDIA_PATH"]).parts[
-1
]
)
elif os.environ.get("STEAM_COMPAT_MEDIA_PATH"):
steam_layer_id = int(
Path(os.environ["STEAM_COMPAT_MEDIA_PATH"]).parts[-2]
)
elif os.environ.get("STEAM_FOSSILIZE_DUMP_PATH"):
steam_layer_id = int(
Path(os.environ["STEAM_FOSSILIZE_DUMP_PATH"]).parts[-3]
)
elif os.environ.get("DXVK_STATE_CACHE_PATH"):
steam_layer_id = int(
Path(os.environ["DXVK_STATE_CACHE_PATH"]).parts[-2]
)
except (ValueError, IndexError) as e:
log.exception(e)
except (ValueError, IndexError): # Value isn't a number or empty tuple
pass

if os.environ.get("STEAM_COMPAT_MEDIA_PATH"):
try:
return int(Path(os.environ["STEAM_COMPAT_MEDIA_PATH"]).parts[-2])
except (ValueError, IndexError):
pass

if os.environ.get("STEAM_FOSSILIZE_DUMP_PATH"):
try:
return int(Path(os.environ["STEAM_FOSSILIZE_DUMP_PATH"]).parts[-3])
except (ValueError, IndexError):
pass

if os.environ.get("DXVK_STATE_CACHE_PATH"):
try:
return int(Path(os.environ["DXVK_STATE_CACHE_PATH"]).parts[-2])
except (ValueError, IndexError):
pass

return steam_layer_id

Expand Down

0 comments on commit 1b0cd3d

Please sign in to comment.