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.

Count what an app embeds under its own identifier as certainly its own

Țugui Dragoșa2b03feee0a6
diff --git a/Packages/PeelCore/Sources/PeelCore/Leftovers/LeftoverMatcher.swift b/Packages/PeelCore/Sources/PeelCore/Leftovers/LeftoverMatcher.swift
index bcfa9b23..75309d37 100644
--- a/Packages/PeelCore/Sources/PeelCore/Leftovers/LeftoverMatcher.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Leftovers/LeftoverMatcher.swift
@@ -347,7 +347,7 @@ extension LeftoverMatcher {
struct EmbeddedIdentifier {
let value: String
- let sharesVendor: Bool
+ let isTheAppsOrItsMakers: Bool
}
struct Profile {
@@ -381,10 +381,13 @@ extension LeftoverMatcher {
reference = app.reference
identifier = app.bundleIdentifier?.lowercased()
let vendor = identifier.flatMap(Identifier.vendor(of:))
+ let ownPrefix = identifier.map { $0 + "." }
embeddedIdentifiers = app.embeddedBundleIdentifiers.map {
- EmbeddedIdentifier(
- value: $0.lowercased(),
- sharesVendor: vendor != nil && Identifier.vendor(of: $0) == vendor
+ let embedded = $0.lowercased()
+ return EmbeddedIdentifier(
+ value: embedded,
+ isTheAppsOrItsMakers: ownPrefix.map(embedded.hasPrefix) == true
+ || vendor != nil && Identifier.vendor(of: embedded) == vendor
)
}
prefixes = ([identifier].compactMap(\.self) + embeddedIdentifiers.map(\.value))
@@ -451,7 +454,7 @@ extension LeftoverMatcher {
guard Identifier.isValid(key) else { return unproven(.embeddedBundleIdentifier, candidate) }
return Evidence(
.embeddedBundleIdentifier,
- embedded.sharesVendor ? .certain : .likely,
+ embedded.isTheAppsOrItsMakers ? .certain : .likely,
specificity: key.count
)
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/LeftoverMatcherTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/LeftoverMatcherTests.swift
index 7a082739..78854e63 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/LeftoverMatcherTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/LeftoverMatcherTests.swift
@@ -178,6 +178,15 @@ struct LeftoverMatcherTests {
#expect(electron.confidence == .likely)
}
+ @Test func whatAnAppEmbedsUnderItsOwnIdentifierIsCertainlyItsOwn() throws {
+ let short = app("example.atlas", name: "Atlas", embedded: ["example.atlas.helper"])
+ let hosted = app("io.github.atlas", name: "Atlas", embedded: ["io.github.atlas.helper", "org.example.updater"])
+
+ #expect(try #require(match("example.atlas.helper", in: .caches, for: short)).confidence == .certain)
+ #expect(try #require(match("io.github.atlas.helper", in: .caches, for: hosted)).confidence == .certain)
+ #expect(try #require(match("org.example.updater", in: .caches, for: hosted)).confidence == .likely)
+ }
+
@Test func applicationGroupSharedWithAnotherAppIsNotRecommended() throws {
let word = app("com.microsoft.Word", name: "Microsoft Word", groups: ["UBF8T346G9.Office"])
let excel = app("com.microsoft.Excel", name: "Microsoft Excel", groups: ["UBF8T346G9.Office"])