mirror of
https://github.com/apple/container.git
synced 2026-07-15 14:07:04 +00:00
Raj
7358102c68
- Closes #1526 and #1527. ## Type of Change - [x] Bug fix - [ ] New feature - [ ] Breaking change - [ ] Documentation update ## Motivation and Context This PR fixes `system df` to report actual on-disk allocated bytes (content blobs + snapshots) instead of summing per-image snapshot sizes. Orphaned blobs are now included as reclaimable, and storage shared across tags is no longer double counted. Also consolidates three identical `calculateDirectorySize` implementations into a shared `FileManager.allocatedSize(of:)` extension. ## Testing - [x] Tested locally - [x] Added/updated tests - [ ] Added/updated docs
53 lines
1.4 KiB
Swift
53 lines
1.4 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 2025-2026 Apple Inc. and the container project authors.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#if os(macOS)
|
|
import Foundation
|
|
import ContainerXPC
|
|
|
|
public enum ImagesServiceXPCRoute: String {
|
|
case imageList
|
|
case imagePull
|
|
case imagePush
|
|
case imageTag
|
|
case imageBuild
|
|
case imageDelete
|
|
case imageSave
|
|
case imageLoad
|
|
case imageCleanupOrphanedBlobs
|
|
case imageDiskUsage
|
|
|
|
case contentGet
|
|
case contentDelete
|
|
case contentClean
|
|
case contentSize
|
|
case contentIngestStart
|
|
case contentIngestComplete
|
|
case contentIngestCancel
|
|
|
|
case imageUnpack
|
|
case snapshotDelete
|
|
case snapshotGet
|
|
}
|
|
|
|
extension XPCMessage {
|
|
public init(route: ImagesServiceXPCRoute) {
|
|
self.init(route: route.rawValue)
|
|
}
|
|
}
|
|
|
|
#endif
|