Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Steamutil: Do not raise error in get_steam_vdf_compat_tool_mapping #478

Merged
merged 2 commits into from
Jan 6, 2025
Merged

Steamutil: Do not raise error in get_steam_vdf_compat_tool_mapping #478

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78e5f10
steamutil: Do not raise an error in get_stream_vdf_compat_tool_mapping
DavidoTek Jan 6, 2025
9e85d48
steamutil: Improve error messages
DavidoTek Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions pupgui2/steamutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@
_cached_steam_ctool_id_map = None


def get_steam_vdf_compat_tool_mapping(vdf_file: dict):
def get_steam_vdf_compat_tool_mapping(vdf_file: dict) -> dict:

s = vdf_file.get('InstallConfigStore', {}).get('Software', {})

# Sometimes the key is 'Valve', sometimes 'valve', see #226
c = s.get('Valve') or s.get('valve')
if not c:
raise KeyError('Error! config.vdf InstallConfigStore.Software neither contains key "Valve" nor "valve" - config.vdf file may be invalid!')
print('Error! config.vdf InstallConfigStore.Software neither contains key "Valve" nor "valve" - config.vdf file may be invalid!')
return {}

m = c.get('Steam', {}).get('CompatToolMapping', {})

Expand Down Expand Up @@ -88,7 +89,7 @@ def get_steam_app_list(steam_config_folder: str, cached=False, no_shortcuts=Fals
apps = update_steamapp_info(steam_config_folder, apps)
apps = update_steamapp_awacystatus(apps)
except Exception as e:
print('Error: Could not get a list of all Steam apps:', e)
print('Error (get_steam_app_list): Could not get a list of all Steam apps:', e)
else:
if not no_shortcuts:
apps.extend(get_steam_shortcuts_list(steam_config_folder, c))
Expand Down Expand Up @@ -144,7 +145,7 @@ def get_steam_shortcuts_list(steam_config_folder: str, compat_tools: dict=None)
app.compat_tool = ct.get('name')
apps.append(app)
except Exception as e:
print('Error: Could not get a list of Steam shortcut apps:', e)
print('Error (get_steam_shortcuts_list): Could not get a list of Steam shortcut apps:', e)

return apps

Expand Down Expand Up @@ -765,7 +766,7 @@ def get_steam_user_list(steam_config_folder: str) -> List[SteamUser]:

users.append(user)
except Exception as e:
print('Error: Could not get a list of Steam users:', e)
print('Error (get_steam_user_list): Could not get a list of Steam users:', e)

return users

Expand Down