Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Stop walking the driver folders when Intel Software is stopped

Țugui Dragoșec28cb70bc26
diff --git a/Packages/PeelCore/Sources/PeelCore/Apps/IntelInspector.swift b/Packages/PeelCore/Sources/PeelCore/Apps/IntelInspector.swift
index dc285194..c9a4b72d 100644
--- a/Packages/PeelCore/Sources/PeelCore/Apps/IntelInspector.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Apps/IntelInspector.swift
@@ -278,7 +278,12 @@ public enum IntelInspector {
includingPropertiesForKeys: [.isDirectoryKey],
options: [.skipsHiddenFiles, .skipsPackageDescendants]
) else { return [] }
- return enumerator.compactMap { $0 as? URL }.filter { driverExtensions.contains($0.pathExtension) }
+ var bundles: [URL] = []
+ for case let item as URL in enumerator {
+ guard !Task.isCancelled else { break }
+ if driverExtensions.contains(item.pathExtension) { bundles.append(item) }
+ }
+ return bundles
}
}
@@ -294,6 +299,7 @@ public enum IntelInspector {
) else { return [] }
var programs: [URL] = []
for case let item as URL in enumerator {
+ guard !Task.isCancelled else { break }
if driverExtensions.contains(item.pathExtension) {
enumerator.skipDescendants()
continue
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/IntelInspectorTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/IntelInspectorTests.swift
index 01f2a86a..b3c15eb6 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/IntelInspectorTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/IntelInspectorTests.swift
@@ -67,6 +67,29 @@ struct IntelInspectorTests {
#expect(stop.askedAfter == 0)
}
+ /// A printer's folder can hold thousands of files, so a stopped scan stops walking it.
+ @Test func aStoppedScanStopsWalkingDriverFolders() async throws {
+ let directory = try TemporaryDirectory()
+ for index in 1...3 {
+ _ = try bundle(directory, "Printers/Driver \(index).driver", cpuTypes: [intel])
+ let filter = try directory.file("Printers/Filters/filter\(index)", contents: intelHeader(fileType: 2))
+ try FileManager.default.setAttributes(
+ [.posixPermissions: 0o755], ofItemAtPath: filter.path(percentEncoded: false)
+ )
+ }
+ let printers = directory.url.appending(path: "Printers").path(percentEncoded: false)
+
+ let walked = await Task {
+ withUnsafeCurrentTask { $0?.cancel() }
+ return (IntelInspector.bundles(in: [printers]), IntelInspector.programs(in: [printers]))
+ }.value
+
+ #expect(IntelInspector.bundles(in: [printers]).count == 3)
+ #expect(IntelInspector.programs(in: [printers]).count == 3)
+ #expect(walked.0.isEmpty)
+ #expect(walked.1.isEmpty)
+ }
+
private func bundle(_ directory: borrowing TemporaryDirectory, _ path: String, cpuTypes: [UInt32]) throws -> URL {
let name = (path as NSString).lastPathComponent
let executableName = (name as NSString).deletingPathExtension