give the tuple field names and rename size to sizeInBytes

Author: realrajaryan

Sources/ContainerClient/Core/ClientImage.swift

@@ -296,7 +296,7 @@ extension ClientImage {
     /// Calculate disk usage for images
     /// - Parameter activeReferences: Set of image references currently in use by containers
     /// - Returns: Tuple of (total count, active count, total size, reclaimable size)
-    public static func calculateDiskUsage(activeReferences: Set<String>) async throws -> (Int, Int, UInt64, UInt64) {
+    public static func calculateDiskUsage(activeReferences: Set<String>) async throws -> (totalCount: Int, activeCount: Int, totalSize: UInt64, reclaimableSize: UInt64) {
         let client = newXPCClient()
         let request = newRequest(.imageDiskUsage)
 
@@ -310,7 +310,7 @@ extension ClientImage {
         let size = response.uint64(key: .imageSize)
         let reclaimable = response.uint64(key: .reclaimableSize)
 
-        return (total, active, size, reclaimable)
+        return (totalCount: total, activeCount: active, totalSize: size, reclaimableSize: reclaimable)
     }
 
     public static func fetch(reference: String, platform: Platform? = nil, scheme: RequestScheme = .auto, progressUpdate: ProgressUpdateHandler? = nil) async throws -> ClientImage

Sources/ContainerClient/Core/DiskUsage.swift

@@ -43,15 +43,15 @@ public struct ResourceUsage: Sendable, Codable {
     public var active: Int
 
     /// Total size in bytes
-    public var size: UInt64
+    public var sizeInBytes: UInt64
 
     /// Reclaimable size in bytes (from unused/inactive resources)
     public var reclaimable: UInt64
 
-    public init(total: Int, active: Int, size: UInt64, reclaimable: UInt64) {
+    public init(total: Int, active: Int, sizeInBytes: UInt64, reclaimable: UInt64) {
         self.total = total
         self.active = active
-        self.size = size
+        self.sizeInBytes = sizeInBytes
         self.reclaimable = reclaimable
     }
 }

Sources/ContainerCommands/System/SystemDF.swift

@@ -65,26 +65,26 @@ extension Application {
                 "Images",
                 "\(stats.images.total)",
                 "\(stats.images.active)",
-                formatSize(stats.images.size),
-                formatReclaimable(stats.images.reclaimable, total: stats.images.size),
+                formatSize(stats.images.sizeInBytes),
+                formatReclaimable(stats.images.reclaimable, total: stats.images.sizeInBytes),
             ])
 
             // Containers row
             rows.append([
                 "Containers",
                 "\(stats.containers.total)",
                 "\(stats.containers.active)",
-                formatSize(stats.containers.size),
-                formatReclaimable(stats.containers.reclaimable, total: stats.containers.size),
+                formatSize(stats.containers.sizeInBytes),
+                formatReclaimable(stats.containers.reclaimable, total: stats.containers.sizeInBytes),
             ])
 
             // Volumes row
             rows.append([
                 "Local Volumes",
                 "\(stats.volumes.total)",
                 "\(stats.volumes.active)",
-                formatSize(stats.volumes.size),
-                formatReclaimable(stats.volumes.reclaimable, total: stats.volumes.size),
+                formatSize(stats.volumes.sizeInBytes),
+                formatReclaimable(stats.volumes.reclaimable, total: stats.volumes.sizeInBytes),
             ])
 
             let tableFormatter = TableOutput(rows: rows)

Sources/Services/ContainerAPIService/DiskUsage/DiskUsageService.swift

@@ -49,29 +49,29 @@ public actor DiskUsageService {
 
         let stats = DiskUsageStats(
             images: ResourceUsage(
-                total: imageData.0,
-                active: imageData.1,
-                size: imageData.2,
-                reclaimable: imageData.3
+                total: imageData.totalCount,
+                active: imageData.activeCount,
+                sizeInBytes: imageData.totalSize,
+                reclaimable: imageData.reclaimableSize
             ),
             containers: ResourceUsage(
                 total: containerData.0,
                 active: containerData.1,
-                size: containerData.2,
+                sizeInBytes: containerData.2,
                 reclaimable: containerData.3
             ),
             volumes: ResourceUsage(
                 total: volumeData.0,
                 active: volumeData.1,
-                size: volumeData.2,
+                sizeInBytes: volumeData.2,
                 reclaimable: volumeData.3
             )
         )
 
         log.debug(
             "disk usage calculation complete",
             metadata: [
-                "images_total": "\(imageData.0)",
+                "images_total": "\(imageData.totalCount)",
                 "containers_total": "\(containerData.0)",
                 "volumes_total": "\(volumeData.0)",
             ])