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.

Let an app with no identifier be muted like any other

Țugui Dragoșf6f954515daf
diff --git a/Packages/PeelCore/Sources/PeelCore/Updates/UpdatePreferences.swift b/Packages/PeelCore/Sources/PeelCore/Updates/UpdatePreferences.swift
index 1ef60ceb..96b3b87e 100644
--- a/Packages/PeelCore/Sources/PeelCore/Updates/UpdatePreferences.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Updates/UpdatePreferences.swift
@@ -11,29 +11,30 @@ public struct UpdatePreferences: Sendable, Hashable {
}
public var source: UpdateSource
- public var ignoredIdentifiers: Set<String>
- /// The version the user chose to skip for each app, by bundle identifier.
+ /// The apps the user told Peel never to check, by `InstalledApp.reference`.
+ public var ignoredApps: Set<String>
+ /// The version the user chose to skip for each app, by `InstalledApp.reference`.
public var skippedVersions: [String: String]
public init(
source: UpdateSource = .automatic,
- ignoredIdentifiers: Set<String> = [],
+ ignoredApps: Set<String> = [],
skippedVersions: [String: String] = [:]
) {
self.source = source
- self.ignoredIdentifiers = ignoredIdentifiers
+ self.ignoredApps = ignoredApps
self.skippedVersions = skippedVersions
}
public func isIgnored(_ app: InstalledApp) -> Bool {
- app.bundleIdentifier.map(ignoredIdentifiers.contains) ?? false
+ ignoredApps.contains(app.reference)
}
/// Whether `status` is an update worth showing: the app is not ignored and that version was not skipped.
/// The app list, the menu bar count, the notification, and the command line all ask this, so they agree.
public func isWaiting(_ status: UpdateStatus?, for app: InstalledApp) -> Bool {
guard case .updateAvailable(let version, _, _) = status else { return false }
- return !isIgnored(app) && app.bundleIdentifier.flatMap { skippedVersions[$0] } != version
+ return !isIgnored(app) && skippedVersions[app.reference] != version
}
/// The answer an app's page shows. An update the user muted, by skipping that version or by telling Peel never
@@ -46,7 +47,7 @@ public struct UpdatePreferences: Sendable, Hashable {
public static func read(from defaults: UserDefaults) -> UpdatePreferences {
UpdatePreferences(
source: UpdateSource(rawValue: defaults.string(forKey: Key.source) ?? "") ?? .automatic,
- ignoredIdentifiers: Set(defaults.stringArray(forKey: Key.ignoredApps) ?? []),
+ ignoredApps: Set(defaults.stringArray(forKey: Key.ignoredApps) ?? []),
skippedVersions: defaults.dictionary(forKey: Key.skippedVersions) as? [String: String] ?? [:]
)
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/CommandLineTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/CommandLineTests.swift
index 716a1259..e1473a56 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/CommandLineTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/CommandLineTests.swift
@@ -921,7 +921,7 @@ struct CommandLineTests {
let waiting = UpdateStatus.updateAvailable(version: "3.0", source: .developer, releaseNotes: nil)
let preferences = UpdatePreferences(
source: .homebrew,
- ignoredIdentifiers: ["com.example.notes"],
+ ignoredApps: ["com.example.notes"],
skippedVersions: ["com.example.editor": "3.0"]
)
@@ -956,7 +956,7 @@ struct CommandLineTests {
let preferences = UpdatePreferences.read(from: defaults)
#expect(preferences.source == .homebrew)
- #expect(preferences.ignoredIdentifiers == ["com.example.notes"])
+ #expect(preferences.ignoredApps == ["com.example.notes"])
#expect(preferences.skippedVersions == ["com.example.editor": "3.0"])
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/ReleaseNotesMemoryTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/ReleaseNotesMemoryTests.swift
index 65298032..e5478f96 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/ReleaseNotesMemoryTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/ReleaseNotesMemoryTests.swift
@@ -41,7 +41,7 @@ struct ReleaseNotesMemoryTests {
let memory = ReleaseNotesMemory()
let skipped = UpdatePreferences(skippedVersions: ["org.example.editor": "2.0"])
let skippedBefore = UpdatePreferences(skippedVersions: ["org.example.editor": "1.9"])
- let ignored = UpdatePreferences(ignoredIdentifiers: ["org.example.editor"])
+ let ignored = UpdatePreferences(ignoredApps: ["org.example.editor"])
#expect(memory.asks(about: update, of: app, with: UpdatePreferences()))
#expect(!memory.asks(about: update, of: app, with: skipped))
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift
index d4084a45..9da931b0 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift
@@ -657,7 +657,7 @@ struct UpdatePreferencesTests {
)
let waiting = UpdateStatus.updateAvailable(version: "3.0")
let newer = UpdateStatus.updateAvailable(version: "4.0")
- let preferences = UpdatePreferences(source: .automatic, ignoredIdentifiers: ["com.example.notes"], skippedVersions: ["com.example.editor": "3.0"])
+ let preferences = UpdatePreferences(source: .automatic, ignoredApps: ["com.example.notes"], skippedVersions: ["com.example.editor": "3.0"])
#expect(preferences.shownStatus(waiting, for: editor) == nil, "a skipped version was shown as available")
#expect(preferences.shownStatus(waiting, for: notes) == nil, "an update of an ignored app was shown as available")
@@ -665,4 +665,19 @@ struct UpdatePreferencesTests {
#expect(preferences.shownStatus(.upToDate, for: editor) == .upToDate)
#expect(preferences.shownStatus(.failed, for: notes) == .failed)
}
+
+ @Test func anAppWithNoIdentifierIsMutedByWhereItIs() {
+ let plain = InstalledApp(url: URL(filePath: "/Applications/Plain Editor.app"), bundleIdentifier: nil, name: "Plain Editor")
+ let copy = InstalledApp(
+ url: URL(filePath: "/Users/me/Applications/Plain Editor.app"), bundleIdentifier: nil, name: "Plain Editor"
+ )
+ let update = UpdateStatus.updateAvailable(version: "2.0")
+ let ignored = UpdatePreferences(ignoredApps: [plain.reference])
+ let skipped = UpdatePreferences(skippedVersions: [plain.reference: "2.0"])
+
+ #expect(ignored.isIgnored(plain))
+ #expect(!ignored.isIgnored(copy))
+ #expect(!skipped.isWaiting(update, for: plain))
+ #expect(skipped.isWaiting(update, for: copy))
+ }
}
diff --git a/Peel/Model/AppLibrary.swift b/Peel/Model/AppLibrary.swift
index ae9ff09a..f4bf76ae 100644
--- a/Peel/Model/AppLibrary.swift
+++ b/Peel/Model/AppLibrary.swift
@@ -129,7 +129,7 @@ final class AppLibrary {
/// The apps selected with their checkboxes, to be removed together. Kept apart from `selection`, so
/// choosing a row to look at never clears the batch.
var picked: Set<InstalledApp.ID> = []
- private(set) var ignoredIdentifiers = Set(
+ private(set) var ignoredApps = Set(
UserDefaults.standard.stringArray(forKey: SettingsKey.ignoredUpdateApps) ?? []
) {
didSet { updatesRevision += 1 }
@@ -634,7 +634,7 @@ final class AppLibrary {
var updatePreferences: UpdatePreferences {
UpdatePreferences(
source: updateSource,
- ignoredIdentifiers: ignoredIdentifiers,
+ ignoredApps: ignoredApps,
skippedVersions: skippedVersions
)
}
@@ -700,33 +700,31 @@ final class AppLibrary {
}
func setIgnored(_ isIgnored: Bool, for app: InstalledApp) {
- guard let identifier = app.bundleIdentifier else { return }
- var identifiers = ignoredIdentifiers
+ var references = ignoredApps
if isIgnored {
- identifiers.insert(identifier)
+ references.insert(app.reference)
} else {
- identifiers.remove(identifier)
+ references.remove(app.reference)
}
- ignoredIdentifiers = identifiers
- UserDefaults.standard.set(Array(identifiers).sorted(), forKey: SettingsKey.ignoredUpdateApps)
+ ignoredApps = references
+ UserDefaults.standard.set(Array(references).sorted(), forKey: SettingsKey.ignoredUpdateApps)
}
func skippedVersion(for app: InstalledApp) -> String? {
- app.bundleIdentifier.flatMap { skippedVersions[$0] }
+ skippedVersions[app.reference]
}
func skip(version: String, for app: InstalledApp) {
- guard let identifier = app.bundleIdentifier else { return }
- skippedVersions[identifier] = version
+ skippedVersions[app.reference] = version
UserDefaults.standard.set(skippedVersions, forKey: SettingsKey.skippedUpdateVersions)
}
- /// Undoes both a skipped version and "never check this app", by identifier: what was muted may not be
- /// installed anymore, and then there is no `InstalledApp` to name it with.
- func unmute(_ identifier: String) {
- ignoredIdentifiers.remove(identifier)
- skippedVersions.removeValue(forKey: identifier)
- UserDefaults.standard.set(ignoredIdentifiers.sorted(), forKey: SettingsKey.ignoredUpdateApps)
+ /// Undoes both a skipped version and "never check this app", by `InstalledApp.reference`: what was muted may not
+ /// be installed anymore, and then there is no `InstalledApp` to name it with.
+ func unmute(_ reference: String) {
+ ignoredApps.remove(reference)
+ skippedVersions.removeValue(forKey: reference)
+ UserDefaults.standard.set(ignoredApps.sorted(), forKey: SettingsKey.ignoredUpdateApps)
UserDefaults.standard.set(skippedVersions, forKey: SettingsKey.skippedUpdateVersions)
}
diff --git a/Peel/Views/Settings/SettingsView.swift b/Peel/Views/Settings/SettingsView.swift
index f63a6659..a1d519bf 100644
--- a/Peel/Views/Settings/SettingsView.swift
+++ b/Peel/Views/Settings/SettingsView.swift
@@ -492,23 +492,23 @@ private struct GeneralSettingsView: View {
extension GeneralSettingsView {
fileprivate struct Muted: Identifiable {
- let identifier: String
+ let reference: String
let app: InstalledApp?
let isIgnored: Bool
let skippedVersion: String?
- var id: String { identifier }
- var name: String { app?.name ?? identifier }
+ var id: String { reference }
+ var name: String { app?.name ?? reference }
}
fileprivate var muted: [Muted] {
- let identifiers = library.ignoredIdentifiers.union(library.skippedVersions.keys)
- return identifiers.map { identifier in
+ let references = library.ignoredApps.union(library.skippedVersions.keys)
+ return references.map { reference in
Muted(
- identifier: identifier,
- app: library.apps.first { $0.bundleIdentifier == identifier },
- isIgnored: library.ignoredIdentifiers.contains(identifier),
- skippedVersion: library.skippedVersions[identifier]
+ reference: reference,
+ app: library.apps.first { $0.reference == reference },
+ isIgnored: library.ignoredApps.contains(reference),
+ skippedVersion: library.skippedVersions[reference]
)
}
.sorted { $0.name.localizedStandardCompare($1.name) == .orderedAscending }
@@ -541,7 +541,7 @@ extension GeneralSettingsView {
Spacer(minLength: 8)
// Checks right away, as the button's title says, rather than at the next scheduled check.
Button {
- library.unmute(item.identifier)
+ library.unmute(item.reference)
if let app = item.app {
Task { await library.checkForUpdates([app], force: true) }
}