From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 11 Jan 2024 13:40:33 +0000 (+0000)
Subject: fireinfo: Fix rendering profile images
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42a4186012d2349c97a0057833293f98970e693a;p=ipfire.org.git

fireinfo: Fix rendering profile images

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

diff --git a/src/backend/fireinfo.py b/src/backend/fireinfo.py
index 277ad781..0cc5e268 100644
--- a/src/backend/fireinfo.py
+++ b/src/backend/fireinfo.py
@@ -337,6 +337,10 @@ class Processor(Object):
 
 		return " ".join(s)
 
+	@property
+	def arch(self):
+		return self.blob.get("arch")
+
 	@property
 	def vendor(self):
 		vendor = self.blob.get("vendor")
@@ -388,7 +392,7 @@ class Processor(Object):
 
 	@property
 	def clock_speed(self):
-		return self.__clock_speed
+		return self.blob.get("speed", 0)
 
 	def format_clock_speed(self):
 		if not self.clock_speed:
@@ -595,10 +599,6 @@ class System(Object):
 	def init(self, blob):
 		self.blob = blob
 
-	@property
-	def arch(self):
-		return self.blob.get("arch")
-
 	@property
 	def language(self):
 		return self.blob.get("language")
diff --git a/src/backend/iuse.py b/src/backend/iuse.py
index 77fbcdd5..19651b56 100644
--- a/src/backend/iuse.py
+++ b/src/backend/iuse.py
@@ -82,15 +82,11 @@ class Image1(ImageObject):
 	def render(self):
 		_ = self.locale.translate
 
-		line1 = [_("%s on %s") % (self.profile.release_short, self.profile.arch),]
+		line1 = [_("%s on %s") % (self.profile.system.release, self.profile.processor.arch),]
 		line2 = []
 
-		# Show the appliance model in the second line if available
-		if self.profile.appliance:
-			line2.append(self.profile.appliance)
-
 		# Show the hypervisor vendor for virtual machines
-		elif self.profile.virtual:
+		if self.profile.system.is_virtual():
 			if self.profile.hypervisor:
 				line2.append(_("Virtualised on %s") % self.profile.hypervisor)
 			else: