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

Jump to bottom

Add support for standalone sdktool installation #677

Merged
merged 2 commits into from
May 17, 2023
Merged

Add support for standalone sdktool installation #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27fb2b3
Add support for standalone sdktool installation
luk1337 May 16, 2023
66940df
Update aqt/combinations.json
luk1337 May 17, 2023
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
18 changes: 18 additions & 0 deletions aqt/combinations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,12 @@
}
],
"tools": [
{
"arch": "qt.tools.qtcreator",
"os_name": "linux",
"target": "desktop",
"tool_name": "sdktool"
},
{
"arch": "qt.tools.cmake",
"os_name": "linux",
Expand Down Expand Up @@ -684,6 +690,12 @@
"target": "desktop",
"tool_name": "tools_telemetry_gui"
},
{
"arch": "qt.tools.qtcreator",
"os_name": "mac",
"target": "desktop",
"tool_name": "sdktool"
},
{
"arch": "qt.tools.cmake",
"os_name": "mac",
Expand Down Expand Up @@ -792,6 +804,12 @@
"target": "desktop",
"tool_name": "tools_telemetry_gui"
},
{
"arch": "qt.tools.qtcreator",
"os_name": "windows",
"target": "desktop",
"tool_name": "sdktool"
},
{
"arch": "qt.tools.cmake",
"os_name": "windows",
Expand Down
7 changes: 6 additions & 1 deletion aqt/metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,10 @@ def __init__(

if archive_id.is_tools():
if tool_name is not None:
_tool_name: str = "tools_" + tool_name if not tool_name.startswith("tools_") else tool_name
if not tool_name.startswith("tools_") and tool_name != "sdktool":
_tool_name = f"tools_{tool_name}"
else:
_tool_name = tool_name
if is_long_listing:
self.request_type = "tool long listing"
self._action: MetadataFactory.Action = lambda: self.fetch_tool_long_listing(_tool_name)
Expand Down Expand Up @@ -733,6 +736,8 @@ def link_to_folder(link: bs4.element.Tag) -> str:
continue
if folder.startswith(filter_category):
yield folder
if filter_category == "tools" and folder == "sdktool":
yield folder
except Exception as e:
raise ArchiveConnectionError(
f"Failed to retrieve the expected HTML page at {html_url}",
Expand Down