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.

Intel Software finds the programs a printer driver keeps

Țugui Dragoș3e14d5554cff
diff --git a/Packages/PeelCore/Sources/PeelCore/Apps/IntelInspector.swift b/Packages/PeelCore/Sources/PeelCore/Apps/IntelInspector.swift
index 68487fa2..1fb6bf0a 100644
--- a/Packages/PeelCore/Sources/PeelCore/Apps/IntelInspector.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Apps/IntelInspector.swift
@@ -40,15 +40,19 @@ public enum IntelInspector {
static let driverFolders = [
"Image Capture/Devices",
"Image Capture/TWAIN Data Sources",
- "Printers",
+ printers,
"Audio/Plug-Ins",
"ColorPickers",
]
- static func driverDirectories(_ environment: SearchEnvironment) -> [String] {
+ /// A printer driver keeps programs of its own beside its bundles: the filters and the tools its PPD names, as
+ /// CUPS's PPD specification shows with `/Library/Printers/vendor/Tools/lowinktool`.
+ static let printers = "Printers"
+
+ static func driverDirectories(_ environment: SearchEnvironment, folders: [String] = driverFolders) -> [String] {
[environment.homeDirectory.appending(path: "Library", directoryHint: .isDirectory),
environment.rootDirectory.appending(path: "Library", directoryHint: .isDirectory)]
- .flatMap { library in driverFolders.map { library.appending(path: $0).path(percentEncoded: false) } }
+ .flatMap { library in folders.map { library.appending(path: $0).path(percentEncoded: false) } }
}
static let toolDirectories = ["/usr/local/bin", "/usr/local/sbin", "/usr/local/libexec"]
@@ -147,6 +151,17 @@ public enum IntelInspector {
))
}
+ let printerDirectories = driverDirectories(environment, folders: [printers])
+ for url in programs(in: printerDirectories) where !Task.isCancelled && !exclusions.excludes(url) && isIntelOnly(executable: url) && isNew(url) {
+ findings.append(IntelFinding(
+ url: url,
+ kind: .driver,
+ name: url.lastPathComponent,
+ owner: nil,
+ size: await measure(url),
+ ))
+ }
+
for item in backgroundItems where !Task.isCancelled {
guard let program = item.program.map({ URL(filePath: $0) }), !exclusions.excludes(program) else { continue }
guard isIntelOnly(executable: program), isNew(program) else { continue }
@@ -241,6 +256,8 @@ public enum IntelInspector {
return candidates.first { FileManager.default.isExecutableFile(atPath: $0.path(percentEncoded: false)) }
}
+ static let driverExtensions: Set<String> = ["app", "plugin", "bundle", "driver", "qlgenerator", "mdimporter"]
+
static func bundles(in directories: [String]) -> [URL] {
directories.flatMap { directory -> [URL] in
let url = URL(filePath: directory, directoryHint: .isDirectory)
@@ -249,7 +266,32 @@ public enum IntelInspector {
includingPropertiesForKeys: [.isDirectoryKey],
options: [.skipsHiddenFiles, .skipsPackageDescendants]
) else { return [] }
- return enumerator.compactMap { $0 as? URL }.filter { ["app", "plugin", "bundle", "driver", "qlgenerator", "mdimporter"].contains($0.pathExtension) }
+ return enumerator.compactMap { $0 as? URL }.filter { driverExtensions.contains($0.pathExtension) }
+ }
+ }
+
+ /// The programs in `directories` that sit outside every bundle: one inside a bundle is the bundle's.
+ static func programs(in directories: [String]) -> [URL] {
+ let keys: Set<URLResourceKey> = [.isRegularFileKey, .isExecutableKey]
+ return directories.flatMap { directory -> [URL] in
+ let url = URL(filePath: directory, directoryHint: .isDirectory)
+ guard let enumerator = FileManager.default.enumerator(
+ at: url,
+ includingPropertiesForKeys: Array(keys),
+ options: [.skipsHiddenFiles, .skipsPackageDescendants]
+ ) else { return [] }
+ var programs: [URL] = []
+ for case let item as URL in enumerator {
+ if driverExtensions.contains(item.pathExtension) {
+ enumerator.skipDescendants()
+ continue
+ }
+ let values = try? item.resourceValues(forKeys: keys)
+ if values?.isRegularFile == true, values?.isExecutable == true, MachOHeader.isProgram(at: item) {
+ programs.append(item)
+ }
+ }
+ return programs
}
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/IntelInspectorTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/IntelInspectorTests.swift
index 860d592e..8f1d806e 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/IntelInspectorTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/IntelInspectorTests.swift
@@ -102,6 +102,37 @@ struct IntelInspectorTests {
#expect(scan.findings.allSatisfy { $0.kind == .driver })
}
+ @Test func findsTheIntelProgramsAPrinterDriverKeeps() async throws {
+ let directory = try TemporaryDirectory()
+ let vendor = "root/Library/Printers/Vendor"
+ let filter = try directory.file("\(vendor)/Filter/rastertovendor", contents: intelHeader(fileType: 2))
+ try directory.setPermissions(0o755, of: filter)
+ let tool = try directory.file("\(vendor)/Tools/lowinktool", contents: fatHeader([intel, appleSilicon]))
+ try directory.setPermissions(0o755, of: tool)
+ let library = try directory.file("\(vendor)/Filter/libvendor.dylib", contents: intelHeader(fileType: 6))
+ try directory.setPermissions(0o755, of: library)
+ _ = try directory.file("\(vendor)/Filter/notrunnable", contents: intelHeader(fileType: 2))
+ // A `.driver` is no package to macOS, so the walk goes inside it.
+ let inside = try directory.file("\(vendor)/Port.driver/Contents/MacOS/Port", contents: intelHeader(fileType: 2))
+ try directory.setPermissions(0o755, of: inside)
+ _ = try bundle(directory, "root/Library/Audio/Plug-Ins/HAL/Device.driver", cpuTypes: [intel])
+
+ let scan = await IntelInspector.scan(
+ installedApps: [],
+ plugins: [],
+ backgroundItems: [],
+ exclusions: .none,
+ environment: SearchEnvironment(
+ homeDirectory: directory.url.appending(path: "home", directoryHint: .isDirectory),
+ rootDirectory: directory.url.appending(path: "root", directoryHint: .isDirectory)
+ ),
+ measure: { _ in 1 }
+ )
+
+ #expect(Set(scan.findings.map(\.name)) == ["rastertovendor", "Port.driver", "Device.driver"])
+ #expect(scan.findings.allSatisfy { $0.kind == .driver })
+ }
+
@Test func findsIntelHelpersInsideAUniversalApp() throws {
let directory = try TemporaryDirectory()
_ = try bundle(directory, "Universal.app", cpuTypes: [intel, appleSilicon])