Added more offline functionality, such as skipping package search (#1296)

* Added more offline functionality, such as skipping package search

* Disabled list_mirrors() from going online if --offline is given. Defaults to /etc/pacman.d/mirrorlist instead.

* Forgot import of pathlib

* Made list_mirrors() open /etc/pacman.d/mirrorlist in byte mode to better emulate the result of urllib response reading.

* Forgot variable declaration

* Made list_mirrors include activated server definitions

2 files changed, 39 insertions, 25 deletions

diff --git a/archinstall/lib/mirrors.py b/archinstall/lib/mirrors.py
index 73921cef..d76e0473 100644
--- a/archinstall/lib/mirrors.py
+++ b/archinstall/lib/mirrors.py
@@ -1,10 +1,12 @@
 import logging
+import pathlib
 import urllib.error
 import urllib.request
 from typing import Union, Mapping, Iterable, Dict, Any, List
 
 from .general import SysCommand
 from .output import log
+from .storage import storage
 
 def sort_mirrorlist(raw_data :bytes, sort_order=["https", "http"]) -> bytes:
 	"""
@@ -144,16 +146,22 @@ def re_rank_mirrors(
 
 
 def list_mirrors(sort_order :List[str] = ["https", "http"]) -> Dict[str, Any]:
-	url = "https://archlinux.org/mirrorlist/?protocol=https&protocol=http&ip_version=4&ip_version=6&use_mirror_status=on"
 	regions = {}
 
-	try:
-		response = urllib.request.urlopen(url)
-	except urllib.error.URLError as err:
-		log(f'Could not fetch an active mirror-list: {err}', level=logging.WARNING, fg="orange")
-		return regions
+	if storage['arguments']['offline']:
+		with pathlib.Path('/etc/pacman.d/mirrorlist').open('rb') as fh:
+			mirrorlist = fh.read()
+	else:
+		url = "https://archlinux.org/mirrorlist/?protocol=https&protocol=http&ip_version=4&ip_version=6&use_mirror_status=on"
+
+		try:
+			response = urllib.request.urlopen(url)
+		except urllib.error.URLError as err:
+			log(f'Could not fetch an active mirror-list: {err}', level=logging.WARNING, fg="orange")
+			return regions
+
+		mirrorlist = response.read()
 
-	mirrorlist = response.read()
 	if sort_order:
 		mirrorlist = sort_mirrorlist(mirrorlist, sort_order=sort_order)
 
@@ -170,5 +178,10 @@ def list_mirrors(sort_order :List[str] = ["https", "http"]) -> Dict[str, Any]:
 
 			url = line.lstrip('#Server = ')
 			regions[region][url] = True
+		elif line.startswith('Server = '):
+			regions.setdefault(region, {})
+
+			url = line.lstrip('Server = ')
+			regions[region][url] = True
 
 	return regions
diff --git a/archinstall/lib/user_interaction/general_conf.py b/archinstall/lib/user_interaction/general_conf.py
index f1d56fc1..70a0e73f 100644
--- a/archinstall/lib/user_interaction/general_conf.py
+++ b/archinstall/lib/user_interaction/general_conf.py
@@ -3,8 +3,6 @@ from __future__ import annotations
 import logging
 from typing import List, Any, Optional, Dict, TYPE_CHECKING
 
-import archinstall
-
 from ..menu.menu import MenuSelectionType
 from ..menu.text_input import TextInput
 
@@ -17,6 +15,8 @@ from ..mirrors import list_mirrors
 from ..translation import Translation
 from ..packages.packages import validate_package_list
 
+from ..storage import storage
+
 if TYPE_CHECKING:
 	_: Any
 
@@ -155,11 +155,11 @@ def select_profile(preset) -> Optional[Profile]:
 		case MenuSelectionType.Selection:
 			return options[selection.value] if selection.value is not None else None
 		case MenuSelectionType.Ctrl_c:
-			archinstall.storage['profile_minimal'] = False
-			archinstall.storage['_selected_servers'] = []
-			archinstall.storage['_desktop_profile'] = None
-			archinstall.arguments['desktop-environment'] = None
-			archinstall.arguments['gfx_driver_packages'] = None
+			storage['profile_minimal'] = False
+			storage['_selected_servers'] = []
+			storage['_desktop_profile'] = None
+			storage['arguments']['desktop-environment'] = None
+			storage['arguments']['gfx_driver_packages'] = None
 			return None
 		case MenuSelectionType.Esc:
 			return None
@@ -178,17 +178,18 @@ def ask_additional_packages_to_install(pre_set_packages: List[str] = []) -> List
 	pre_set_packages = pre_set_packages if pre_set_packages else []
 	packages = read_packages(pre_set_packages)
 
-	while True:
-		if len(packages):
-			# Verify packages that were given
-			print(_("Verifying that additional packages exist (this might take a few seconds)"))
-			valid, invalid = validate_package_list(packages)
-
-			if invalid:
-				log(f"Some packages could not be found in the repository: {invalid}", level=logging.WARNING, fg='red')
-				packages = read_packages(valid)
-				continue
-		break
+	if not storage['arguments']['offline'] and not storage['arguments']['no_pkg_lookups']:
+		while True:
+			if len(packages):
+				# Verify packages that were given
+				print(_("Verifying that additional packages exist (this might take a few seconds)"))
+				valid, invalid = validate_package_list(packages)
+
+				if invalid:
+					log(f"Some packages could not be found in the repository: {invalid}", level=logging.WARNING, fg='red')
+					packages = read_packages(valid)
+					continue
+			break
 
 	return packages