remove logic for calculating disk space freed

Author: saehejkang

Sources/ContainerClient/Core/ClientNetwork.swift

@@ -88,17 +88,16 @@ extension ClientNetwork {
     }
 
     /// Prune the network with the given id.
-    public static func prune() async throws -> ([String], UInt64) {
+    public static func prune() async throws -> [String] {
         let client = XPCClient(service: serviceIdentifier)
         let message = XPCMessage(route: .networkPrune)
         let reply = try await client.send(message)
 
         guard let responseData = reply.dataNoCopy(key: .networkId) else {
-            return ([], 0)
+            return []
         }
 
         let networkNames = try JSONDecoder().decode([String].self, from: responseData)
-        let size = reply.uint64(key: .size)
-        return (networkNames, size)
+        return networkNames
     }
 }

Sources/ContainerCommands/Network/NetworkPrune.swift

@@ -30,14 +30,11 @@ extension Application.NetworkCommand {
         var global: Flags.Global
 
         public func run() async throws {
-            let (networkNames, size) = try await ClientNetwork.prune()
-            let formatter = ByteCountFormatter()
-            let freed = formatter.string(fromByteCount: Int64(size))
+            let networkNames = try await ClientNetwork.prune()
 
             for name in networkNames {
                 print(name)
             }
-            print("Reclaimed \(freed) in disk space")
         }
     }
 }

Sources/Services/ContainerAPIService/Networks/NetworksHarness.swift

@@ -70,12 +70,11 @@ public struct NetworksHarness: Sendable {
 
     @Sendable
     public func prune(_ message: XPCMessage) async throws -> XPCMessage {
-        let (networkNames, size) = try await service.prune()
+        let networkNames = try await service.prune()
         let data = try JSONEncoder().encode(networkNames)
 
         let reply = message.reply()
         reply.set(key: .networkId, value: data)
-        reply.set(key: .size, value: size)
         return reply
     }
 }

Sources/Services/ContainerAPIService/Networks/NetworksService.swift

@@ -247,7 +247,7 @@ public actor NetworksService {
     }
 
     /// Prune all networks with no container connections (preserve default/system networks)
-    public func prune() async throws -> ([String], UInt64) {
+    public func prune() async throws -> [String] {
         let allNetworks = try await self.store.list()
         // do entire prune operation atomically with container list
         return try await self.containersService.withContainerList { containers in
@@ -263,27 +263,20 @@ public actor NetworksService {
             }
 
             var prunedNames = [String]()
-            var totalSize: UInt64 = 0
 
             for network in networksToPrune {
                 do {
-                    // calculate actual disk usage before deletion
-                    let networkPath = self.networkPath(for: network.id)
-                    let actualSize = self.calculateDirectorySize(at: networkPath)
-
                     try await self.store.delete(network.id)
                     await self.removeNetworkState(for: network.id)
-                    try self.removeNetworkDirectory(for: network.id)
 
                     prunedNames.append(network.id)
-                    totalSize += actualSize
-                    self.log.info("Pruned network", metadata: ["name": "\(network.id)", "size": "\(actualSize)"])
+                    self.log.info("Pruned network", metadata: ["name": "\(network.id)"])
                 } catch {
                     self.log.error("Failed to prune network \(network.id): \(error)")
                 }
             }
 
-            return (prunedNames, totalSize)
+            return prunedNames
         }
     }
 
@@ -341,44 +334,4 @@ public actor NetworksService {
     private func removeNetworkState(for id: String) {
         networkStates.removeValue(forKey: id)
     }
-
-    private nonisolated func networkPath(for name: String) -> String {
-        resourceRoot.appendingPathComponent(name).path
-    }
-
-    private nonisolated func removeNetworkDirectory(for name: String) throws {
-        let networkPath = networkPath(for: name)
-        let fm = FileManager.default
-
-        if fm.fileExists(atPath: networkPath) {
-            try fm.removeItem(atPath: networkPath)
-        }
-    }
-
-    private nonisolated func calculateDirectorySize(at path: String) -> UInt64 {
-        let url = URL(fileURLWithPath: path)
-        let fileManager = FileManager.default
-
-        guard
-            let enumerator = fileManager.enumerator(
-                at: url,
-                includingPropertiesForKeys: [.totalFileAllocatedSizeKey],
-                options: [.skipsHiddenFiles]
-            )
-        else {
-            return 0
-        }
-
-        var totalSize: UInt64 = 0
-        for case let fileURL as URL in enumerator {
-            guard let resourceValues = try? fileURL.resourceValues(forKeys: [.totalFileAllocatedSizeKey]),
-                let fileSize = resourceValues.totalFileAllocatedSize
-            else {
-                continue
-            }
-            totalSize += UInt64(fileSize)
-        }
-
-        return totalSize
-    }
 }

Tests/CLITests/Subcommands/Networks/TestCLINetwork.swift

@@ -208,15 +208,15 @@ class TestCLINetwork: CLITest {
         // Clean up is necessary for testing prune with no networks
         doNetworkDeleteIfExists(name: "testnetworkcreateanduse")
 
-        // Prune with no networks should succeed with 0 reclaimed
+        // Prune with no networks should succeed
         let (_, _, _, statusBefore) = try run(arguments: ["network", "list", "--quiet"])
         #expect(statusBefore == 0)
         let (_, output, error, status) = try run(arguments: ["network", "prune"])
         if status != 0 {
             throw CLIError.executionFailed("network prune failed: \(error)")
         }
 
-        #expect(output.contains("Zero KB"), "should show no space reclaimed")
+        #expect(output.isEmpty, "should show no networks pruned")
     }
 
     @Test func testNetworkPruneUnusedNetworks() throws {
@@ -250,7 +250,6 @@ class TestCLINetwork: CLITest {
 
         #expect(output.contains(network1), "should prune network1")
         #expect(output.contains(network2), "should prune network2")
-        #expect(output.contains("Reclaimed"), "should show reclaimed space")
 
         // Verify networks are gone
         let (_, listAfter, _, statusAfter) = try run(arguments: ["network", "list", "--quiet"])