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.

An Apple preference domain behind a group or team prefix is kept

Țugui Dragoș76a918dc8078
diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/RemovalHygiene.swift b/Packages/PeelCore/Sources/PeelCore/Removal/RemovalHygiene.swift
index 4f33ed90..e07c2227 100644
--- a/Packages/PeelCore/Sources/PeelCore/Removal/RemovalHygiene.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Removal/RemovalHygiene.swift
@@ -104,8 +104,8 @@ enum PreferenceCleanup {
// a file another Mac left behind names no domain here.
let fileHost = url.lastPathComponent.removingSuffix(".plist").dropFirst(name.count + 1)
guard !isByHost || (!host.isEmpty && fileHost.caseInsensitiveCompare(host) == .orderedSame) else { return nil }
- // The disk ignores case, so `COM.APPLE.DOCK` is the Dock's domain too.
- guard !name.lowercased().hasPrefix("com.apple.") || isOwned(name, by: owner) else { return nil }
+ // Apple's name whatever its case, since the disk ignores it, and behind a team or group prefix too.
+ guard !ProtectedData.isApplesName(name) || isOwned(name, by: owner) else { return nil }
let domain = Domain(name: name, isByHost: isByHost)
guard !seen.contains(domain), !containerKeeps(domain, apartFrom: urls, home: home) else { return nil }
seen.insert(domain)
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/RemovalHygieneTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/RemovalHygieneTests.swift
index 9f0d0860..3fd5d002 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/RemovalHygieneTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/RemovalHygieneTests.swift
@@ -195,6 +195,19 @@ struct RemovalHygieneTests {
#expect(PreferenceCleanup.domains(for: urls, ownedBy: "com.apple").isEmpty)
}
+ @Test func forgetsNoAppleDomainBehindAGroupOrTeamPrefix() {
+ let urls = [
+ URL(filePath: "/Users/x/Library/Preferences/group.com.apple.notes.plist"),
+ URL(filePath: "/Users/x/Library/Preferences/systemgroup.com.apple.example.plist"),
+ URL(filePath: "/Users/x/Library/Preferences/ABCDE12345.com.apple.example.plist"),
+ URL(filePath: "/Users/x/Library/Preferences/group.org.example.app.plist"),
+ ]
+
+ #expect(PreferenceCleanup.domains(for: urls, home: home) == [
+ PreferenceCleanup.Domain(name: "group.org.example.app", isByHost: false),
+ ])
+ }
+
@Test func namesBackupFilesSoTheDomainReadsBack() {
let plain = PreferenceCleanup.Domain(name: "com.example.app", isByHost: false)
let byHost = PreferenceCleanup.Domain(name: "com.example.app", isByHost: true)