From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 9 May 2022 16:51:55 +0000 (+0000)
Subject: disks: Moving scan into an extra step
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=256906d3811d1759763147ff8491f7098b158fcc;p=people%2Fms%2Fbricklayer.git

disks: Moving scan into an extra step

This avoids slight code duplication

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/python/__init__.py b/src/python/__init__.py
index 8966df1..ac6cf9d 100644
--- a/src/python/__init__.py
+++ b/src/python/__init__.py
@@ -98,6 +98,7 @@ class Bricklayer(object):
 		step.UnattendedWarning,
 		step.Welcome,
 		timezones.SelectTimezone,
+		disk.Scan,
 		disk.UnattendedSelectDisk,
 		disk.SelectDisk,
 		disk.CalculatePartitionLayout,
diff --git a/src/python/disk.py b/src/python/disk.py
index 935a856..0450b4f 100644
--- a/src/python/disk.py
+++ b/src/python/disk.py
@@ -416,6 +416,15 @@ class Partition(object):
 		self.bricklayer.command(command)
 
 
+class Scan(step.Step):
+	def run(self):
+		with self.tui.progress(
+			_("Scanning for Disks"),
+			_("Scanning for disks..."),
+		):
+			self.bricklayer.disks.scan()
+
+
 class UnattendedSelectDisk(step.UnattendedStep):
 	"""
 		Scans for any disks
@@ -425,9 +434,6 @@ class UnattendedSelectDisk(step.UnattendedStep):
 		if self.bricklayer.disks.selected:
 			return
 
-		# Scan for disks
-		self.bricklayer.disks.scan()
-
 		# End here if we could not find any disks
 		if not self.bricklayer.disks.supported:
 			self.tui.error(
@@ -448,9 +454,6 @@ class SelectDisk(step.InteractiveStep):
 		Ask the user which disk(s) to use for the installation process
 	"""
 	def run(self):
-		# Scan for disks
-		self.bricklayer.disks.scan()
-
 		# Create a dictionary with all disks
 		disks = { disk : "%s" % disk for disk in self.bricklayer.disks.supported }