Improve code readability

F1248 · Dec 30, 2024 · 1be55ac · 1be55ac
1 parent f4f5ca5
commit 1be55ac
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/Genius/Models/SystemInformation/Hardware.swift b/Genius/Models/SystemInformation/Hardware.swift
@@ -119,7 +119,7 @@ extension SystemInformation {
 			static let hardwareUUID =
 				SystemInformationData<String?>(IORegistry(class: "IOPlatformExpertDevice").read(kIOPlatformUUIDKey))
 			static let provisioningUDID = SystemInformationData<String?>(
-				{ SystemProfiler.hardware?["provisioning_UDID"] ?? (CPU.type.value == .intel ? hardwareUUID.value : nil) },
+				{ SystemProfiler.hardware?["provisioning_UDID"] as? String ?? (CPU.type.value == .intel ? hardwareUUID.value : nil) },
 				applicable: Software.OS.bootMode.value !=? .recovery ||? CPU.type.value == .intel
 			)
 		}

diff --git a/Genius/Models/SystemInformation/Software.swift b/Genius/Models/SystemInformation/Software.swift
@@ -16,15 +16,15 @@ extension SystemInformation {
 		enum SMC {
 
 			static let version = SystemInformationData<String?>(
-				{ SystemProfiler.hardware?["SMC_version_system"] },
+				{ SystemProfiler.hardware?["SMC_version_system"] as? String },
 				applicable: Hardware.securityChip.value <=? .t1 &&? OS.bootMode.value !=? .recovery
 			)
 		}
 
 		enum Firmware {
 
 			static let version = SystemInformationData<String?>(
-				{ SystemProfiler.hardware?["boot_rom_version"] },
+				{ SystemProfiler.hardware?["boot_rom_version"] as? String },
 				applicable: OS.bootMode.value !=? .recovery
 			)
 		}
@@ -61,15 +61,20 @@ extension SystemInformation {
 					safe ? .safe : .normal
 				} else { nil }
 			}())
-			static let bootVolume =
-				SystemInformationData<String?>({ SystemProfiler.software?["boot_volume"] }, applicable: bootMode.value !=? .recovery)
-			static let loaderVersion =
-				SystemInformationData<String?>({ SystemProfiler.hardware?["os_loader_version"] }, applicable: bootMode.value !=? .recovery)
+			static let bootVolume = SystemInformationData<String?>(
+				{ SystemProfiler.software?["boot_volume"] as? String },
+				applicable: bootMode.value !=? .recovery
+			)
+			static let loaderVersion = SystemInformationData<String?>(
+				{ SystemProfiler.hardware?["os_loader_version"] as? String },
+				applicable: bootMode.value !=? .recovery
+			)
 		}
 
 		enum Computer {
 
-			static let name = SystemInformationData<String?>(SystemProfiler.software?["local_host_name"] ?? Host.current().localizedName)
+			static let name =
+				SystemInformationData<String?>(SystemProfiler.software?["local_host_name"] as? String ?? Host.current().localizedName)
 			static let hostName = SystemInformationData<String?>(Sysctl.read("kern.hostname"))
 		}
 

diff --git a/Genius/Models/SystemInformation/SystemInformationData.swift b/Genius/Models/SystemInformation/SystemInformationData.swift
@@ -16,17 +16,8 @@ struct SystemInformationData<T: Sendable>: SystemInformationDataProtocol {
 		self.applicable = true
 	}
 
-	init<W>(_ value: Any?) where T == W? {
-		self.init(value as? W)
-	}
-
 	init<W>(_ value: () -> T, applicable: Bool?) where T == W? {
 		self.value = applicable ?? true ? value() : nil
 		self.applicable = applicable
 	}
-
-	init<W>(_ value: () -> Any?, applicable: Bool?) where T == W? {
-		self.value = applicable ?? true ? value() as? W : nil
-		self.applicable = applicable
-	}
 }