RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #1018 (#1021) 

* Fix #1018

* Fix flake8

Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>
This commit is contained in:
Daniel 2022-03-03 23:54:43 +11:00 committed by GitHub
parent 47a9fba94b
commit d9d59bee68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
archinstall/lib/packages/packages.py
View File

@ -1,25 +1,35 @@
import json import json
import ssl import ssl
import urllib.request
from typing import Dict, Any, Tuple, List from typing import Dict, Any, Tuple, List
from urllib.error import HTTPError
from urllib.parse import urlencode
from urllib.request import urlopen
from ..exceptions import PackageError, SysCallError from ..exceptions import PackageError, SysCallError
from ..models.dataclasses import PackageSearch, PackageSearchResult, LocalPackage from ..models.dataclasses import PackageSearch, PackageSearchResult, LocalPackage
from ..pacman import run_pacman from ..pacman import run_pacman
BASE_URL_PKG_SEARCH = 'https://archlinux.org/packages/search/json/?name={package}' BASE_URL_PKG_SEARCH = 'https://archlinux.org/packages/search/json/'
# BASE_URL_PKG_CONTENT = 'https://archlinux.org/packages/search/json/' # BASE_URL_PKG_CONTENT = 'https://archlinux.org/packages/search/json/'
BASE_GROUP_URL = 'https://archlinux.org/groups/search/json/?name={group}' BASE_GROUP_URL = 'https://archlinux.org/groups/search/json/'
def _make_request(url: str, params: Dict) -> Any:
ssl_context = ssl.create_default_context()
ssl_context.check_hostname = False
ssl_context.verify_mode = ssl.CERT_NONE
encoded = urlencode(params)
full_url = f'{url}?{encoded}'
return urlopen(full_url, context=ssl_context)
def group_search(name :str) -> List[PackageSearchResult]: def group_search(name :str) -> List[PackageSearchResult]:
# TODO UPSTREAM: Implement /json/ for the groups search # TODO UPSTREAM: Implement /json/ for the groups search
ssl_context = ssl.create_default_context()
ssl_context.check_hostname = False
ssl_context.verify_mode = ssl.CERT_NONE
try: try:
response = urllib.request.urlopen(BASE_GROUP_URL.format(group=name), context=ssl_context) response = _make_request(BASE_GROUP_URL, {'name': name})
except urllib.error.HTTPError as err: except HTTPError as err:
if err.code == 404: if err.code == 404:
return [] return []
else: else:
@ -38,10 +48,7 @@ def package_search(package :str) -> PackageSearch:
""" """
# TODO UPSTREAM: Implement bulk search, either support name=X&name=Y or split on space (%20 or ' ') # TODO UPSTREAM: Implement bulk search, either support name=X&name=Y or split on space (%20 or ' ')
# TODO: utilize pacman cache first, upstream second. # TODO: utilize pacman cache first, upstream second.
ssl_context = ssl.create_default_context() response = _make_request(BASE_URL_PKG_SEARCH, {'name': package})
ssl_context.check_hostname = False
ssl_context.verify_mode = ssl.CERT_NONE
response = urllib.request.urlopen(BASE_URL_PKG_SEARCH.format(package=package), context=ssl_context)
if response.code != 200: if response.code != 200:
raise PackageError(f"Could not locate package: [{response.code}] {response}") raise PackageError(f"Could not locate package: [{response.code}] {response}")