From c08520f9902aeb1b4ce22e1159060792081b0327 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton@hvornum.se>
Date: Wed, 2 Feb 2022 14:22:52 +0100
Subject: SysCommand() to remove ANSII VT100 Esc codes & archlinux-keyring fix
 (#933)

* Fixed SysCommandWorker() so that it removes ANSII VT100 escape codes. I also moved package.py into it's own folder, as that's something I want to expand on a lot, so package related stuff should go in there. I created a installed_package() function which gets information about the locally installed package. I changed so that find_packages() and find_package() returns a data-model instead for the package information. This should unify and make sure we detect issues down the line.

* Working on structuring .version constructor that works with BaseModel

* Added version contructors to VersionDef(). Also added __eq__ and __lt__ to LocalPackage() and PackageSearchResult().

* removed debug and added a TODO

* Removed whitespace

* Removed mirror-database function from myrepo
---
 archinstall/lib/packages/__init__.py |   0
 archinstall/lib/packages/packages.py | 109 +++++++++++++++++++++++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 archinstall/lib/packages/__init__.py
 create mode 100644 archinstall/lib/packages/packages.py

(limited to 'archinstall/lib/packages')

diff --git a/archinstall/lib/packages/__init__.py b/archinstall/lib/packages/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/archinstall/lib/packages/packages.py b/archinstall/lib/packages/packages.py
new file mode 100644
index 00000000..7dc74b32
--- /dev/null
+++ b/archinstall/lib/packages/packages.py
@@ -0,0 +1,109 @@
+import ssl
+import urllib.request
+import json
+from typing import Dict, Any
+from ..general import SysCommand
+from ..models import PackageSearch, PackageSearchResult, LocalPackage
+from ..exceptions import PackageError, SysCallError, RequirementError
+
+BASE_URL_PKG_SEARCH = 'https://archlinux.org/packages/search/json/?name={package}'
+# BASE_URL_PKG_CONTENT = 'https://archlinux.org/packages/search/json/'
+BASE_GROUP_URL = 'https://archlinux.org/groups/x86_64/{group}/'
+
+
+def find_group(name :str) -> bool:
+	# 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:
+		response = urllib.request.urlopen(BASE_GROUP_URL.format(group=name), context=ssl_context)
+	except urllib.error.HTTPError as err:
+		if err.code == 404:
+			return False
+		else:
+			raise err
+
+	# Just to be sure some code didn't slip through the exception
+	if response.code == 200:
+		return True
+
+	return False
+
+def package_search(package :str) -> PackageSearch:
+	"""
+	Finds a specific package via the package database.
+	It makes a simple web-request, which might be a bit slow.
+	"""
+	# TODO UPSTREAM: Implement bulk search, either support name=X&name=Y or split on space (%20 or ' ')
+	# TODO: utilize pacman cache first, upstream second.
+	ssl_context = ssl.create_default_context()
+	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:
+		raise PackageError(f"Could not locate package: [{response.code}] {response}")
+
+	data = response.read().decode('UTF-8')
+
+	return PackageSearch(**json.loads(data))
+
+class IsGroup(BaseException):
+	pass
+
+def find_package(package :str) -> PackageSearchResult:
+	data = package_search(package)
+
+	if not data.results:
+		# Check if the package is actually a group
+		if find_group(package):
+			# TODO: Until upstream adds a JSON result for group searches
+			# there is no way we're going to parse HTML reliably.
+			raise IsGroup("Implement group search")
+
+		raise PackageError(f"Could not locate {package} while looking for repository category")
+
+	# If we didn't find the package in the search results,
+	# odds are it's a group package
+	for result in data.results:
+		if result.pkgname == package:
+			return result
+
+	raise PackageError(f"Could not locate {package} in result while looking for repository category")
+
+def find_packages(*names :str) -> Dict[str, Any]:
+	"""
+	This function returns the search results for many packages.
+	The function itself is rather slow, so consider not sending to
+	many packages to the search query.
+	"""
+	return {package: find_package(package) for package in names}
+
+
+def validate_package_list(packages: list) -> bool:
+	"""
+	Validates a list of given packages.
+	Raises `RequirementError` if one or more packages are not found.
+	"""
+	invalid_packages = [
+		package
+		for package in packages
+		if not find_package(package)['results'] and not find_group(package)
+	]
+	if invalid_packages:
+		raise RequirementError(f"Invalid package names: {invalid_packages}")
+
+	return True
+
+def installed_package(package :str) -> LocalPackage:
+	package_info = {}
+	try:
+		for line in SysCommand(f"pacman -Q --info {package}"):
+			if b':' in line:
+				key, value = line.decode().split(':', 1)
+				package_info[key.strip().lower().replace(' ', '_')] = value.strip()
+	except SysCallError:
+		pass
+	
+	return LocalPackage(**package_info)
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf