From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 19 Feb 2024 10:45:27 +0000 (+0000)
Subject: fireinfo: Fix reading memory from database
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa1baca6d72655652ca7dbe55e8e9570e776e35c;p=ipfire.org.git

fireinfo: Fix reading memory from database

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

diff --git a/src/backend/fireinfo.py b/src/backend/fireinfo.py
index ff672043..831b8b4e 100644
--- a/src/backend/fireinfo.py
+++ b/src/backend/fireinfo.py
@@ -615,6 +615,16 @@ class System(Object):
 	def release(self):
 		return self.blob.get("release")
 
+	# Memory
+
+	@property
+	def memory(self):
+		return self.blob.get("memory") * 1024
+
+	@property
+	def friendly_memory(self):
+		return util.format_size(self.memory or 0)
+
 	@property
 	def storage(self):
 		return self.blob.get("storage_size", 0)
@@ -688,16 +698,6 @@ class Profile(Object):
 	def processor(self):
 		return Processor(self.backend, self.blob.get("cpu", {}))
 
-	# Memory
-
-	@property
-	def memory(self):
-		return self.blob.get("memory")
-
-	@property
-	def friendly_memory(self):
-		return util.format_size(self.memory or 0)
-
 	# Virtual
 
 	def is_virtual(self):
diff --git a/src/backend/iuse.py b/src/backend/iuse.py
index 19651b56..be28b790 100644
--- a/src/backend/iuse.py
+++ b/src/backend/iuse.py
@@ -97,7 +97,7 @@ class Image1(ImageObject):
 			if self.profile.processor:
 				line2.append(self.profile.processor.friendly_string)
 
-			line2.append(self.profile.friendly_memory)
+			line2.append(self.profile.system.friendly_memory)
 
 		self.draw_text((225, 5), " | ".join(line1))
 		self.draw_text((225, 23), "%s" % " - ".join(line2))
diff --git a/src/templates/fireinfo/profile.html b/src/templates/fireinfo/profile.html
index 44fd9b8d..87f9bea3 100644
--- a/src/templates/fireinfo/profile.html
+++ b/src/templates/fireinfo/profile.html
@@ -129,11 +129,11 @@
 			</div>
 
 			<div class="block">
-				{% if profile.memory %}
+				{% if profile.system.memory %}
 					<div class="columns">
 						<div class="column is-3">{{ _("Memory") }}</div>
 						<div class="column is-9">
-							{{ format_size(profile.memory) }}
+							{{ format_size(profile.system.memory) }}
 						</div>
 					</div>
 				{% end %}