mirror of
https://github.com/apple/container.git
synced 2026-07-12 20:47:04 +00:00
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
48 lines
1.8 KiB
Swift
48 lines
1.8 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 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.
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
import Foundation
|
|
|
|
extension FileManager {
|
|
/// Total bytes allocated on disk for all files in a directory (recursive).
|
|
///
|
|
/// Caveats: hidden files are skipped, symlinks to directories are not followed, but
|
|
/// symlinks-to-files and hard links each contribute their target's full allocation
|
|
/// so shared inodes are counted multiple times.
|
|
public func allocatedSize(of directory: URL) -> UInt64 {
|
|
guard
|
|
let enumerator = self.enumerator(
|
|
at: directory,
|
|
includingPropertiesForKeys: [.totalFileAllocatedSizeKey],
|
|
options: [.skipsHiddenFiles]
|
|
)
|
|
else {
|
|
return 0
|
|
}
|
|
|
|
var size: UInt64 = 0
|
|
for case let fileURL as URL in enumerator {
|
|
guard let resourceValues = try? fileURL.resourceValues(forKeys: [.totalFileAllocatedSizeKey]),
|
|
let fileSize = resourceValues.totalFileAllocatedSize
|
|
else {
|
|
continue
|
|
}
|
|
size += UInt64(fileSize)
|
|
}
|
|
return size
|
|
}
|
|
}
|