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.

Never uninstall from the Homebrew page an app its own page leaves alone

Țugui Dragoș419fd7d76428
diff --git a/Packages/PeelCore/Sources/PeelCore/Apps/AppInspector.swift b/Packages/PeelCore/Sources/PeelCore/Apps/AppInspector.swift
index 29be85e8..c2b8d2e1 100644
--- a/Packages/PeelCore/Sources/PeelCore/Apps/AppInspector.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Apps/AppInspector.swift
@@ -116,7 +116,8 @@ public enum AppInspector {
isSystemProtected: isSystemProtected
),
updaterFolder: electronConfiguration.flatMap(ElectronUpdater.downloadsFolder(fromConfiguration:)),
- webApp: bundleIdentifier.flatMap { WebApp.of(identifier: $0, info: info) }
+ webApp: bundleIdentifier.flatMap { WebApp.of(identifier: $0, info: info) },
+ carriesSystemExtensions: !AppExtensions.systemExtensions(carriedBy: url).isEmpty
)
}
diff --git a/Packages/PeelCore/Sources/PeelCore/Apps/InstalledApp.swift b/Packages/PeelCore/Sources/PeelCore/Apps/InstalledApp.swift
index 437ba0d2..647babc5 100644
--- a/Packages/PeelCore/Sources/PeelCore/Apps/InstalledApp.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Apps/InstalledApp.swift
@@ -38,6 +38,8 @@ public struct InstalledApp: Sendable, Hashable, Identifiable {
public let isTheRunningCopy: Bool
/// The browser's web app this is, or nil for any other app.
public let webApp: WebApp?
+ /// Whether the bundle carries a system extension, which macOS removes only when Finder moves the app.
+ public let carriesSystemExtensions: Bool
/// Whether `other`, a reading of the same path, is the same build. Not `==`: the date an app was last opened
/// changes every time it is opened, which is no reason to forget its size or check it for updates again.
@@ -66,7 +68,8 @@ public struct InstalledApp: Sendable, Hashable, Identifiable {
dateAdded: Date? = nil,
updateFeed: UpdateFeed? = nil,
updaterFolder: String? = nil,
- webApp: WebApp? = nil
+ webApp: WebApp? = nil,
+ carriesSystemExtensions: Bool = false
) {
self.url = url
self.bundleIdentifier = bundleIdentifier.flatMap { $0.isEmpty ? nil : $0 }
@@ -88,6 +91,7 @@ public struct InstalledApp: Sendable, Hashable, Identifiable {
self.webApp = webApp
self.updateFeed = updateFeed
self.updaterFolder = updaterFolder
+ self.carriesSystemExtensions = carriesSystemExtensions
let path = PathPattern.comparablePath(of: url)
isPeelItself = Self.isPeel(self.bundleIdentifier, at: path)
isTheRunningCopy = path == Self.runningBundle
@@ -144,7 +148,8 @@ public struct InstalledApp: Sendable, Hashable, Identifiable {
dateAdded: dateAdded,
updateFeed: updateFeed,
updaterFolder: updaterFolder,
- webApp: webApp
+ webApp: webApp,
+ carriesSystemExtensions: carriesSystemExtensions
)
}
diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/RemovedElsewhere.swift b/Packages/PeelCore/Sources/PeelCore/Removal/RemovedElsewhere.swift
index 6ec09f6e..cacaf0c0 100644
--- a/Packages/PeelCore/Sources/PeelCore/Removal/RemovedElsewhere.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Removal/RemovedElsewhere.swift
@@ -11,4 +11,16 @@ public enum RemovedElsewhere: Sendable, Hashable {
public static func of(_ app: InstalledApp, installedSystemExtensions names: [String]) -> RemovedElsewhere? {
app.removedElsewhere ?? (names.isEmpty ? nil : .byFinder(systemExtensions: names))
}
+
+ /// How the first of `apps` that Peel never removes is removed instead, such as one of the apps a cask installed.
+ public static func first(
+ among apps: [InstalledApp],
+ asking answer: @escaping AppExtensions.SystemExtensionsAnswer = AppExtensions.askingMacOS
+ ) async -> RemovedElsewhere? {
+ for app in apps {
+ let names = await AppExtensions.installedNames(carriedBy: app, asking: answer)
+ if let found = of(app, installedSystemExtensions: names) { return found }
+ }
+ return nil
+ }
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/AppInspectorTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/AppInspectorTests.swift
index 082b372a..de504660 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/AppInspectorTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/AppInspectorTests.swift
@@ -142,6 +142,20 @@ struct AppInspectorTests {
#expect(app.embeddedBundleIdentifiers == ["org.example.updater.Downloader"])
}
+ @Test func knowsAnAppThatCarriesASystemExtension() throws {
+ let directory = try TemporaryDirectory()
+ try plist(["CFBundleIdentifier": "org.example.guard"], at: "Guard.app/Contents/Info.plist", in: directory)
+ try plist(
+ ["CFBundleIdentifier": "org.example.guard.filter"],
+ at: "Guard.app/Contents/Library/SystemExtensions/org.example.guard.filter.systemextension/Contents/Info.plist",
+ in: directory
+ )
+ try plist(["CFBundleIdentifier": "org.example.plain"], at: "Plain.app/Contents/Info.plist", in: directory)
+
+ #expect(try #require(AppInspector.inspect(directory.url.appending(path: "Guard.app"))).carriesSystemExtensions)
+ #expect(try #require(AppInspector.inspect(directory.url.appending(path: "Plain.app"))).carriesSystemExtensions == false)
+ }
+
/// Spotlight does not index the temporary folder, and answers there with the bundle's modification date for when
/// it was last used.
@Test func anAppSpotlightDoesNotIndexHasNoRecordOfBeingOpened() throws {
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/UninstallationTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/UninstallationTests.swift
index 702eb86d..136f6e73 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/UninstallationTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/UninstallationTests.swift
@@ -1,5 +1,6 @@
import Foundation
@testable import PeelCore
+import PeelPrivileged
import Synchronization
import Testing
@@ -105,6 +106,23 @@ struct UninstallationTests {
#expect(await prepared { [] }.removedElsewhere == nil)
}
+ @Test func namesHowTheFirstAppPeelNeverRemovesIsRemovedInstead() async throws {
+ let directory = try TemporaryDirectory()
+ let filtering = try appCarryingAFilter(in: directory)
+ let plain = InstalledApp(
+ url: try directory.directory("root/Applications/Plain.app"), bundleIdentifier: "org.example.plain", name: "Plain"
+ )
+ let peel = InstalledApp(
+ url: URL(filePath: "/Applications/Peel.app"), bundleIdentifier: HelperIdentity.appIdentifier, name: "Peel"
+ )
+
+ #expect(await RemovedElsewhere.first(among: [plain, filtering], asking: installed(.on))
+ == .byFinder(systemExtensions: ["Example Filter"]))
+ #expect(await RemovedElsewhere.first(among: [plain, peel], asking: installed(.on)) == .byRemovePeel)
+ #expect(await RemovedElsewhere.first(among: [plain], asking: installed(.on)) == nil)
+ #expect(await RemovedElsewhere.first(among: [filtering], asking: installed(.beingRemoved)) == nil)
+ }
+
@Test func severalAppsAskMacOSOnceAndOnlyWhenOneCarriesASystemExtension() async throws {
let directory = try TemporaryDirectory()
let example = try appCarryingAFilter(in: directory)
diff --git a/Peel/Views/Homebrew/HomebrewDetailView.swift b/Peel/Views/Homebrew/HomebrewDetailView.swift
index 8ddbc44a..b429819d 100644
--- a/Peel/Views/Homebrew/HomebrewDetailView.swift
+++ b/Peel/Views/Homebrew/HomebrewDetailView.swift
@@ -8,6 +8,8 @@ struct HomebrewDetailView: View {
@State private var isConfirmingUninstall = false
@State private var isConfirmingUpgrade = false
@State private var casksToForget: [HomebrewPackage]?
+ /// What macOS said of the system extensions the cask's apps carry, with the apps it was asked about.
+ @State private var extensionsAnswer: (apps: [URL], removedElsewhere: RemovedElsewhere?)?
let package: HomebrewPackage
var body: some View {
@@ -170,6 +172,12 @@ struct HomebrewDetailView: View {
Text("This can take a long time, since Homebrew builds some packages on this Mac. Its progress shows on this page as it works, and you can stop it there.")
}
.forgetCasksDialog(for: $casksToForget)
+ .task(id: caskApps.filter(\.carriesSystemExtensions).map(\.url)) {
+ let carrying = caskApps.filter(\.carriesSystemExtensions)
+ guard !carrying.isEmpty else { return }
+ let found = await RemovedElsewhere.first(among: carrying)
+ extensionsAnswer = (carrying.map(\.url), found)
+ }
.confirmationDialog("Uninstall \(package.name)?", isPresented: $isConfirmingUninstall) {
Button("Uninstall", role: .destructive) {
// Checks again, since the exclusions can change while the dialog is open.
@@ -210,10 +218,21 @@ struct HomebrewDetailView: View {
private var uninstallRefusal: LocalizedStringResource? {
if exclusions.exclusions.isUnreadable { return "Exclusions can’t be read: see Settings" }
if !exclusions.exclusions.hasBeenRead { return "Checking…" }
- let apps = library.apps.filter { library.cask(for: $0)?.id == package.id }
+ let apps = caskApps
+ // Homebrew deletes the app, so an app its own page never removes is never uninstalled from here either.
+ if let removedElsewhere = apps.lazy.compactMap(\.removedElsewhere).first { return removedElsewhere.explanation }
+ let carrying = apps.filter(\.carriesSystemExtensions).map(\.url)
+ if !carrying.isEmpty {
+ guard let extensionsAnswer, extensionsAnswer.apps == carrying else { return "Checking…" }
+ if let removedElsewhere = extensionsAnswer.removedElsewhere { return removedElsewhere.explanation }
+ }
return exclusions.exclusions.excludes(package, apps: apps, prefix: homebrew.installation?.prefix) ? "Excluded in Settings" : nil
}
+ private var caskApps: [InstalledApp] {
+ library.apps.filter { library.cask(for: $0)?.id == package.id }
+ }
+
private var isRunning: Bool {
if homebrew.forgetting.contains(package.id) { return true }
return switch homebrew.runningCommand {