Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.
Swift cache-cleanercleanerclideveloper-toolsdisk-cleanupdisk-spaceduplicate-finderhomebrewliquid-glassmac-cleanermacosmacos-appmacos-golden-gatemacos-tahoemacos-tweaksswiftswiftuiterminal-themesuninstalluninstaller
Fit Intel Software's words to each case
Țugui Dragoș792539f3cd3a
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstringsindex 98038e19..d812c644 100644--- a/Localization/Peel/Localizable.xcstrings+++ b/Localization/Peel/Localizable.xcstrings@@ -17578,6 +17578,112 @@}}},+ "App last opened" : {+ "localizations" : {+ "cs" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Aplikace naposledy otevřena"+ }+ },+ "de" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "App zuletzt geöffnet"+ }+ },+ "es" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Última apertura de la app"+ }+ },+ "fr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Dernière ouverture de l’app"+ }+ },+ "it" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Ultima apertura dell’app"+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "アプリを最後に開いた日"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "앱 최근 사용일"+ }+ },+ "nl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "App laatst geopend"+ }+ },+ "pl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Aplikację ostatnio otwarto"+ }+ },+ "pt" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Última abertura do app"+ }+ },+ "ro" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Ultima deschidere a aplicației"+ }+ },+ "ru" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Последнее открытие приложения"+ }+ },+ "sv" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Appen senast öppnad"+ }+ },+ "tr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Uygulamanın son açılışı"+ }+ },+ "uk" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Програму востаннє відкрито"+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "App上次打开时间"+ }+ },+ "zh-Hant" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "App上次打開日期"+ }+ }+ }+ },"App removed" : {"comment" : "A label for a number that is not part of this text. It appears under the number on Home, and beside it in the menu bar panel. This singular form is used only when the number is exactly 1. Every other count, 0 included, uses \"Apps removed\".","localizations" : {@@ -27043,6 +27149,112 @@}}},+ "Choose an item to see why it would need Rosetta on an Apple silicon Mac." : {+ "localizations" : {+ "cs" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Zvolte položku a uvidíte, proč by na Macu s čipem Apple potřebovala prostředí Rosetta."+ }+ },+ "de" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Wähle ein Objekt, um zu sehen, warum es auf einem Mac mit Apple Chip Rosetta benötigen würde."+ }+ },+ "es" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Elige un ítem para ver por qué necesitaría Rosetta en un Mac con chip de Apple."+ }+ },+ "fr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Choisissez un élément pour voir pourquoi il aurait besoin de Rosetta sur un Mac équipé d’une puce Apple."+ }+ },+ "it" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Scegli un elemento per vedere perché richiederebbe Rosetta su un Mac con chip Apple."+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "項目を選ぶと、Appleシリコン搭載のMacでRosettaが必要になる理由が表示されます。"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "항목을 선택하면 Apple silicon Mac에서 Rosetta가 필요한 이유를 볼 수 있습니다."+ }+ },+ "nl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Kies een onderdeel om te zien waarom het op een Mac met Apple silicon Rosetta nodig zou hebben."+ }+ },+ "pl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Wybierz pozycję, aby zobaczyć, dlaczego wymagałaby Rosetty na Macu z układem scalonym Apple."+ }+ },+ "pt" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Escolha um item para ver por que ele precisaria do Rosetta em um Mac com Apple silicon."+ }+ },+ "ro" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Alegeți un articol pentru a vedea de ce ar avea nevoie de Rosetta pe un Mac cu cip Apple."+ }+ },+ "ru" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Выберите объект, чтобы узнать, почему ему понадобилась бы Rosetta на Mac с чипом Apple."+ }+ },+ "sv" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Välj ett objekt för att se varför det skulle behöva Rosetta på en Mac med Apple Silicon."+ }+ },+ "tr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Apple Silicon çipli bir Mac’te neden Rosetta gerektireceğini görmek için bir öğe seçin."+ }+ },+ "uk" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Виберіть елемент, щоб побачити, чому на Mac з Apple Silicon він потребував би Rosetta."+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "选取一个项目,查看它在搭载Apple芯片的Mac上为何需要Rosetta。"+ }+ },+ "zh-Hant" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "選擇一個項目,以查看它在配備Apple晶片的Mac上為何會需要Rosetta。"+ }+ }+ }+ },"Choose completions from a menu" : {"localizations" : {"cs" : {@@ -61386,108 +61598,108 @@}}},- "Inside Universal Apps" : {+ "Inside Other Apps" : {"localizations" : {"cs" : {"stringUnit" : {"state" : "translated",- "value" : "Uvnitř univerzálních aplikací"+ "value" : "Uvnitř jiných aplikací"}},"de" : {"stringUnit" : {"state" : "translated",- "value" : "In Universal-Apps"+ "value" : "In anderen Apps"}},"es" : {"stringUnit" : {"state" : "translated",- "value" : "Dentro de apps universales"+ "value" : "Dentro de otras apps"}},"fr" : {"stringUnit" : {"state" : "translated",- "value" : "Dans des apps universelles"+ "value" : "Dans d’autres apps"}},"it" : {"stringUnit" : {"state" : "translated",- "value" : "Dentro le app universali"+ "value" : "Dentro altre app"}},"ja" : {"stringUnit" : {"state" : "translated",- "value" : "Universalアプリの内部"+ "value" : "ほかのアプリの内部"}},"ko" : {"stringUnit" : {"state" : "translated",- "value" : "Universal 앱 내부"+ "value" : "다른 앱 내부"}},"nl" : {"stringUnit" : {"state" : "translated",- "value" : "In universele apps"+ "value" : "In andere apps"}},"pl" : {"stringUnit" : {"state" : "translated",- "value" : "Wewnątrz aplikacji uniwersalnych"+ "value" : "Wewnątrz innych aplikacji"}},"pt" : {"stringUnit" : {"state" : "translated",- "value" : "Dentro de Apps Universais"+ "value" : "Dentro de Outros Apps"}},"ro" : {"stringUnit" : {"state" : "translated",- "value" : "În aplicații universale"+ "value" : "În alte aplicații"}},"ru" : {"stringUnit" : {"state" : "translated",- "value" : "Внутри универсальных приложений"+ "value" : "Внутри других приложений"}},"sv" : {"stringUnit" : {"state" : "translated",- "value" : "Inuti universella appar"+ "value" : "Inuti andra appar"}},"tr" : {"stringUnit" : {"state" : "translated",- "value" : "Evrensel Uygulamaların İçinde"+ "value" : "Diğer Uygulamaların İçinde"}},"uk" : {"stringUnit" : {"state" : "translated",- "value" : "Усередині універсальних програм"+ "value" : "Усередині інших програм"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "通用App内部"+ "value" : "其他App内部"}},"zh-Hant" : {"stringUnit" : {"state" : "translated",- "value" : "通用App內部"+ "value" : "其他App內部"}}}@@ -232545,6 +232757,112 @@}}},+ "started by %@" : {+ "localizations" : {+ "cs" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "spouští se ze souboru %@"+ }+ },+ "de" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "gestartet von „%@“"+ }+ },+ "es" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "iniciado por %@"+ }+ },+ "fr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "lancé par %@"+ }+ },+ "it" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "avviato da %@"+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "%@によって起動"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "%@에 의해 시작됨"+ }+ },+ "nl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "gestart door %@"+ }+ },+ "pl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "uruchamiana przez %@"+ }+ },+ "pt" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "iniciado por %@"+ }+ },+ "ro" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "pornit de %@"+ }+ },+ "ru" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "запускается файлом %@"+ }+ },+ "sv" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "startas av %@"+ }+ },+ "tr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "%@ tarafından başlatılır"+ }+ },+ "uk" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "запускається через «%@»"+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "由“%@”启动"+ }+ },+ "zh-Hant" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "由「%@」啟動"+ }+ }+ }+ },"to free" : {"localizations" : {"cs" : {diff --git a/Packages/PeelCore/Sources/PeelCore/Apps/IntelInspector.swift b/Packages/PeelCore/Sources/PeelCore/Apps/IntelInspector.swiftindex 4be331c3..e2e7ff23 100644--- a/Packages/PeelCore/Sources/PeelCore/Apps/IntelInspector.swift+++ b/Packages/PeelCore/Sources/PeelCore/Apps/IntelInspector.swift@@ -44,23 +44,20 @@ public struct IntelScan: Sendable {}public enum IntelInspector {- /// Folders searched in both the user's Library and the system's, because printer drivers and audio plug-ins- /// can be installed for one user or for everyone. The macOS 27 release notes point to these folders for- /// Intel plug-ins that may not appear in System Settings: `~/Library/Audio/Plug-Ins/*`,- /// `~/Library/Printers/`, and `~/Library/ColorPickers/`.- static let driverFolders = [- "Image Capture/Devices",- "Image Capture/TWAIN Data Sources",- printers,- "Audio/Plug-Ins",- "ColorPickers",- ]+ /// The folders of drivers, which serve a device, searched in both the user's Library and the system's, because a+ /// driver can be installed for one user or for everyone.+ static let driverFolders = ["Image Capture/Devices", "Image Capture/TWAIN Data Sources", printers]++ /// The other folders the macOS 27 release notes point to for Intel plug-ins that may not appear in System+ /// Settings, `~/Library/Audio/Plug-Ins/*` and `~/Library/ColorPickers/`, in both Libraries. What the Plug-ins page+ /// doesn't list there, such as an ARA plug-in, is a plug-in all the same.+ static let plugInFolders = ["Audio/Plug-Ins", "ColorPickers"]/// A printer driver keeps programs of its own beside its bundles: the filters and the tools its PPD names, as/// CUPS's PPD specification shows with `/Library/Printers/vendor/Tools/lowinktool`.static let printers = "Printers"- static func driverDirectories(_ environment: SearchEnvironment, folders: [String] = driverFolders) -> [String] {+ static func libraryDirectories(_ environment: SearchEnvironment, folders: [String]) -> [String] {[environment.homeDirectory.appending(path: "Library", directoryHint: .isDirectory),environment.rootDirectory.appending(path: "Library", directoryHint: .isDirectory)].flatMap { library in folders.map { library.appending(path: $0).path(percentEncoded: false) } }@@ -171,19 +168,21 @@ public enum IntelInspector {))}- for url in bundles(in: driverDirectories(environment), unreadable: &unreadable)- where !Task.isCancelled && !exclusions.excludes(url) {- guard isIntelOnly(bundle: url, unreadable: &unreadable), isNew(url) else { continue }- findings.append(IntelFinding(- url: url,- kind: .driver,- name: url.lastPathComponent,- owner: nil,- size: await measure(url),- ))+ for (folders, kind) in [(driverFolders, IntelFinding.Kind.driver), (plugInFolders, .plugin)] {+ for url in bundles(in: libraryDirectories(environment, folders: folders), unreadable: &unreadable)+ where !Task.isCancelled && !exclusions.excludes(url) {+ guard isIntelOnly(bundle: url, unreadable: &unreadable), isNew(url) else { continue }+ findings.append(IntelFinding(+ url: url,+ kind: kind,+ name: url.lastPathComponent,+ owner: nil,+ size: await measure(url),+ ))+ }}- let printerDirectories = driverDirectories(environment, folders: [printers])+ let printerDirectories = libraryDirectories(environment, folders: [printers])for url in programs(in: printerDirectories, unreadable: &unreadable)where !Task.isCancelled && !exclusions.excludes(url) {guard isIntelOnly(executable: url, unreadable: &unreadable), isNew(url) else { continue }diff --git a/Packages/PeelCore/Tests/PeelCoreTests/IntelInspectorTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/IntelInspectorTests.swiftindex 364cb17c..dbe5842e 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/IntelInspectorTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/IntelInspectorTests.swift@@ -185,7 +185,8 @@ struct IntelInspectorTests {)#expect(Set(scan.findings.map(\.name)) == ["Melody.bundle", "Vendor.plugin"])- #expect(scan.findings.allSatisfy { $0.kind == .driver })+ #expect(scan.findings.first { $0.name == "Melody.bundle" }?.kind == .plugin, "an ARA plug-in serves no device")+ #expect(scan.findings.first { $0.name == "Vendor.plugin" }?.kind == .driver)}@Test func findsAnIntelTWAINDataSource() async throws {diff --git a/Peel/Model/IntelLibrary.swift b/Peel/Model/IntelLibrary.swiftindex 02818eb7..f91b3b9f 100644--- a/Peel/Model/IntelLibrary.swift+++ b/Peel/Model/IntelLibrary.swift@@ -61,7 +61,7 @@ extension IntelFinding.Kind {var title: LocalizedStringResource {switch self {case .app: "Apps"- case .insideApp: "Inside Universal Apps"+ case .insideApp: "Inside Other Apps"case .plugin: "Plug-ins"case .driver: "Drivers"case .backgroundItem: "Background Items"@@ -121,10 +121,16 @@ extension IntelFinding {}}- /// What the row says under the name: what the finding belongs to, or a plug-in's format, since one plug-in is- /// often installed in several formats under one name.+ /// What the row says under the name: what the finding belongs to, the job file that starts a background item, or+ /// a plug-in's format, since one plug-in is often installed in several formats under one name.var subtitle: LocalizedStringResource? {- owner.map { "in \($0)" } ?? pluginCategory?.title+ guard let owner else { return pluginCategory?.title }+ return kind == .backgroundItem ? "started by \(owner)" : "in \(owner)"+ }++ /// Whether the Plug-ins page lists it: a plug-in found in one of that page's folders, which carries its format.+ var isOnThePlugInsPage: Bool {+ kind == .plugin && pluginCategory != nil}/// Whether an app that loads the plug-in decides whether it loads, as for a plug-in loaded inside the app.diff --git a/Peel/Views/ContentView.swift b/Peel/Views/ContentView.swiftindex 79c9a241..df825ba9 100644--- a/Peel/Views/ContentView.swift+++ b/Peel/Views/ContentView.swift@@ -422,7 +422,11 @@ struct ContentView: View {IntelDetailView(finding: finding).id(finding.id)} else {- DetailPlaceholder(tool: .intel, summary: intel.summary, instruction: "Choose an item to see why it still needs Rosetta.")+ // Two literals, so the string catalog finds both.+ let instruction: LocalizedStringResource = HostArchitecture.isAppleSilicon+ ? "Choose an item to see why it still needs Rosetta."+ : "Choose an item to see why it would need Rosetta on an Apple silicon Mac."+ DetailPlaceholder(tool: .intel, summary: intel.summary, instruction: instruction)}}diff --git a/Peel/Views/Intel/IntelDetailView.swift b/Peel/Views/Intel/IntelDetailView.swiftindex fd3901c5..7d4c5af6 100644--- a/Peel/Views/Intel/IntelDetailView.swift+++ b/Peel/Views/Intel/IntelDetailView.swift@@ -88,8 +88,10 @@ struct IntelDetailView: View {}}if let lastOpened = lastOpened(of: app) {- LabeledContent("Last opened") {+ LabeledContent {Text(lastOpened, format: .relative(presentation: .named))+ } label: {+ finding.kind == .insideApp ? Text("App last opened") : Text("Last opened")}}if let app, let status = library.shownUpdateStatus(of: app) {@@ -109,7 +111,7 @@ struct IntelDetailView: View {Section {HStack {// Show in Finder is centered when alone, and goes first when a Review button is beside it.- if app == nil, finding.kind != .plugin {+ if app == nil, !finding.isOnThePlugInsPage {Spacer()}Button("Show in Finder", systemImage: "folder") {@@ -128,7 +130,7 @@ struct IntelDetailView: View {} else {review.buttonStyle(.borderedProminent)}- } else if finding.kind == .plugin {+ } else if finding.isOnThePlugInsPage {Button("Review in Plug-ins", systemImage: "powerplug") {plugins.selection = finding.urlNavigator.shared.requestedTool = .plugins@@ -145,8 +147,8 @@ struct IntelDetailView: View {.toolbar(removing: .title)}- /// The advice in the note beside the What to Do About It heading. A driver or a tool in `/usr/local` is- /// left to the software that installed it, which knows what else goes with it.+ /// The advice in the note beside the What to Do About It heading. A driver, a tool in `/usr/local`, or a plug-in+ /// the Plug-ins page doesn't list is left to the software that installed it, which knows what else goes with it.private var advice: LocalizedStringResource {switch finding.kind {case .driver, .commandLineTool:@@ -156,7 +158,9 @@ struct IntelDetailView: View {case .insideApp:"Peel only reports here. This part comes with the app and can’t be removed on its own. An update of the app may replace it."case .plugin:- "Peel only reports here. To remove it, go to Plug-ins."+ finding.isOnThePlugInsPage+ ? "Peel only reports here. To remove it, go to Plug-ins."+ : "Peel only reports here. The software that installed it may have an uninstaller of its own."case .backgroundItem:"Peel only reports here. Background Items moves a job’s configuration file, not the program it runs: that goes with the software that installed it."}@@ -170,8 +174,8 @@ struct IntelDetailView: View {Text(verbatim: finding.name).pageTitle().help(Text(verbatim: finding.name))- if let owner = finding.owner {- Text("in \(owner)")+ if finding.owner != nil, let subtitle = finding.subtitle {+ Text(subtitle).font(.callout).foregroundStyle(.secondary)}