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.

Find the folders WebKit keeps for an app in the account's caches

Țugui Dragoșbc27d3f14d75
diff --git a/Packages/PeelCore/Sources/PeelCore/Leftovers/LeftoverMatcher.swift b/Packages/PeelCore/Sources/PeelCore/Leftovers/LeftoverMatcher.swift
index fbbbe92b..292f5a91 100644
--- a/Packages/PeelCore/Sources/PeelCore/Leftovers/LeftoverMatcher.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Leftovers/LeftoverMatcher.swift
@@ -132,11 +132,22 @@ struct LeftoverMatcher: Sendable {
fileName.removingSuffix(".framework")
case .hiddenHomeFiles:
fileName.hasPrefix(".") ? String(fileName.dropFirst()) : fileName
+ case .caches, .temporaryItems:
+ webKitsClient(in: fileName) ?? withoutTheDotBeforeAnIdentifier(fileName)
default:
withoutTheDotBeforeAnIdentifier(fileName)
}
}
+ /// The app a WebKit process keeps a folder for in the account's cache and temporary folders, named for the
+ /// process, a plus, and the app's code signing identifier (`getUserDirectorySuffix`, WebKit's
+ /// `AuxiliaryProcessMac.mm`): `com.apple.WebKit.Networking+com.example.app`.
+ private static func webKitsClient(in fileName: String) -> String? {
+ guard fileName.hasPrefix("com.apple.WebKit."), let plus = fileName.firstIndex(of: "+") else { return nil }
+ let client = String(fileName[fileName.index(after: plus)...])
+ return Identifier.isValid(client) ? client : nil
+ }
+
/// An app hides a folder of its own by writing a dot before its identifier: `.com.example.app.backups`.
private static func withoutTheDotBeforeAnIdentifier(_ fileName: String) -> String {
let rest = String(fileName.dropFirst())
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/LeftoverMatcherTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/LeftoverMatcherTests.swift
index f32acbdf..df791576 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/LeftoverMatcherTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/LeftoverMatcherTests.swift
@@ -498,6 +498,18 @@ struct LeftoverMatcherTests {
#expect(match(".org.example.app.plist", in: .preferences, for: example) == nil)
}
+ @Test func aWebKitProcessesFolderIsTheAppsItServes() {
+ let example = app("org.example.app", name: "Example", embedded: ["org.example.app.quicklook"])
+
+ for kind in [SearchLocation.Kind.caches, .temporaryItems] {
+ #expect(match("com.apple.WebKit.Networking+org.example.app", in: kind, for: example)?.reason == .bundleIdentifier)
+ #expect(match("com.apple.WebKit.GPU+org.example.app.quicklook", in: kind, for: example)?.reason == .embeddedBundleIdentifier)
+ #expect(match("com.apple.WebKit.WebContent+net.example.other", in: kind, for: example) == nil)
+ #expect(match("com.apple.WebKit.WebContent+com.apple.Safari", in: kind, for: app("com.apple.Safari", name: "Safari")) == nil)
+ }
+ #expect(match("com.apple.WebKit.Networking+org.example.app", in: .applicationSupport, for: example) == nil)
+ }
+
@Test func aPlugInIsMatchedWithoutTheExtensionThatSaysItsKind() throws {
let serum = app("com.xferrecords.serum", name: "Serum")
for name in [
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/OrphanScannerTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/OrphanScannerTests.swift
index 89184692..f9464c2e 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/OrphanScannerTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/OrphanScannerTests.swift
@@ -376,6 +376,27 @@ struct OrphanScannerTests {
#expect(scan.unreadableLocations.isEmpty)
}
+ @Test func findsTheFolderAWebKitProcessKeptForAnAppThatLeft() async throws {
+ let directory = try TemporaryDirectory()
+ try directory.directory("var/C/com.apple.WebKit.Networking+com.gone.app")
+ try directory.directory("var/C/com.apple.WebKit.GPU+com.installed.app")
+ try directory.directory("var/C/com.apple.WebKit.WebContent+com.apple.Safari")
+ let scanner = OrphanScanner(
+ environment: SearchEnvironment(
+ homeDirectory: directory.url.appending(path: "home", directoryHint: .isDirectory),
+ rootDirectory: directory.url.appending(path: "root", directoryHint: .isDirectory),
+ userCacheDirectory: directory.url.appending(path: "var/C", directoryHint: .isDirectory)
+ ),
+ isRegisteredApp: { _ in false },
+ systemApps: []
+ )
+
+ let scan = await scanner.scan(installedApps: installed)
+
+ #expect(scan.groups.map(\.identifier) == ["com.gone.app"])
+ #expect(scan.groups.first?.items.map(\.url.lastPathComponent) == ["com.apple.WebKit.Networking+com.gone.app"])
+ }
+
@Test func findsAFolderAnAppThatLeftHidWithADotBeforeItsIdentifier() async throws {
let directory = try TemporaryDirectory()
try directory.directory("home/Library/Application Support/.com.gone.app.backups")