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.

Name each package as macOS does, and find it by name or file

Țugui Dragoș561a1f35cc66
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstrings
index b5619f16..54275920 100644
--- a/Localization/Peel/Localizable.xcstrings
+++ b/Localization/Peel/Localizable.xcstrings
@@ -26068,108 +26068,109 @@
}
}
},
- "Choose a package to see what it installed." : {
+ "Choose a package to see what it installed. macOS keeps a receipt of the files each package put in place, and forgetting one moves only that receipt to the Trash." : {
+ "comment" : "In the detail column of Package Receipts while no package is chosen.",
"localizations" : {
"cs" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Zvolte balíček a uvidíte, co nainstaloval."
+ "value" : "Zvolte balíček a uvidíte, co nainstaloval. Systém macOS uchovává pro každý balíček záznam o souborech, které rozmístil, a když záznam zapomenete, přesune se do koše jen tento záznam."
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Wähle ein Paket, um zu sehen, was es installiert hat."
+ "value" : "Wähle ein Paket, um zu sehen, was es installiert hat. macOS bewahrt eine Quittung über die Dateien auf, die jedes Paket abgelegt hat, und das Vergessen einer Quittung legt nur diese Quittung in den Papierkorb."
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Elige un paquete para ver lo que instaló."
+ "value" : "Elige un paquete para ver lo que instaló. macOS guarda un recibo de los archivos que colocó cada paquete, y al olvidar uno, solo se traslada a la papelera ese recibo."
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Choisissez un paquet pour voir ce qu’il a installé."
+ "value" : "Choisissez un paquet pour voir ce qu’il a installé. macOS conserve un reçu des fichiers que chaque paquet a mis en place, et en oublier un ne place que ce reçu dans la corbeille."
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Scegli un pacchetto per vedere cosa ha installato."
+ "value" : "Scegli un pacchetto per vedere cosa ha installato. macOS conserva una ricevuta dei file installati da ogni pacchetto, e dimenticarne una sposta nel Cestino solo quella ricevuta."
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
- "value" : "パッケージを選ぶと、インストールされたものが表示されます。"
+ "value" : "パッケージを選ぶと、インストールされたものが表示されます。macOSは、各パッケージが配置したファイルのレシートを保持しています。レシートをゴミ箱に入れても、ゴミ箱に入るのはそのレシートだけです。"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
- "value" : "패키지를 선택하면 패키지가 설치한 항목을 볼 수 있습니다."
+ "value" : "패키지를 선택하면 패키지가 설치한 항목을 볼 수 있습니다. macOS는 각 패키지가 배치한 파일의 수신 정보를 보관하며, 수신 정보를 제거하면 해당 수신 정보만 휴지통으로 이동합니다."
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Kies een pakket om te zien wat het heeft geïnstalleerd."
+ "value" : "Kies een pakket om te zien wat het heeft geïnstalleerd. macOS bewaart een installatiebewijs van de bestanden die elk pakket op hun plek heeft gezet, en als je er een vergeet, wordt alleen dat installatiebewijs naar de prullenmand verplaatst."
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Wybierz pakiet, aby zobaczyć, co zainstalował."
+ "value" : "Wybierz pakiet, aby zobaczyć, co zainstalował. macOS przechowuje dla każdego pakietu potwierdzenie instalacji z listą plików, które ten pakiet rozmieścił, a zapomnienie któregoś z potwierdzeń przenosi do Kosza tylko to jedno potwierdzenie."
}
},
"pt" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Escolha um pacote para ver o que ele instalou."
+ "value" : "Escolha um pacote para ver o que ele instalou. O macOS guarda um recibo dos arquivos que cada pacote colocou no lugar, e esquecer um recibo move só esse recibo para o Lixo."
}
},
"ro" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Alegeți un pachet pentru a vedea ce a instalat."
+ "value" : "Alegeți un pachet pentru a vedea ce a instalat. macOS păstrează o recipisă a fișierelor plasate de fiecare pachet, iar dacă uitați una, doar acea recipisă este mutată în Coș."
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Выберите пакет, чтобы увидеть, что он установил."
+ "value" : "Выберите пакет, чтобы увидеть, что он установил. macOS хранит для каждого пакета квитанцию со списком файлов, которые он разместил, и, если забыть квитанцию, в Корзину переместится только она."
}
},
"sv" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Välj ett paket för att se vad det installerade."
+ "value" : "Välj ett paket för att se vad det installerade. macOS sparar ett kvitto över de filer som varje paket har placerat, och om du glömmer ett kvitto flyttas bara det kvittot till papperskorgen."
}
},
"tr" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Neler yüklediğini görmek için bir paket seçin."
+ "value" : "Neler yüklediğini görmek için bir paket seçin. macOS, her paketin yerleştirdiği dosyaların makbuzunu tutar; bir makbuzu unutmak yalnızca o makbuzu Çöp Sepeti’ne taşır."
}
},
"uk" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Виберіть пакет, щоб побачити, що він інсталював."
+ "value" : "Виберіть пакет, щоб побачити, що він інсталював. macOS зберігає квитанцію з переліком файлів, які розмістив кожен пакет, і якщо забути одну з них, у Смітник буде переміщено лише цю квитанцію."
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
- "value" : "选取一个软件包,查看它安装了什么。"
+ "value" : "选取一个软件包,查看它安装了什么。macOS会为每个软件包放置到位的文件保留回执,移除某个回执只会将该回执移到废纸篓。"
}
},
"zh-Hant" : {
"stringUnit" : {
"state" : "translated",
- "value" : "選擇一個套件以查看它安裝了什麼。"
+ "value" : "選擇一個套件以查看它安裝了什麼。macOS會為每個套件所放置的檔案保留一份收據,移除收據只會將該收據丟到「垃圾桶」。"
}
}
}
diff --git a/Packages/PeelCore/Sources/PeelCore/Packages/InstallHistory.swift b/Packages/PeelCore/Sources/PeelCore/Packages/InstallHistory.swift
new file mode 100644
index 00000000..43779516
--- /dev/null
+++ b/Packages/PeelCore/Sources/PeelCore/Packages/InstallHistory.swift
@@ -0,0 +1,23 @@
+import Foundation
+
+/// The names macOS gives the packages it installed, from the history System Information shows under Installations.
+enum InstallHistory {
+ /// The newest name for each package identifier in `Library/Receipts/InstallHistory.plist` on `volume`.
+ static func names(onVolume volume: URL) -> [String: String] {
+ let url = volume.appending(path: "Library/Receipts/InstallHistory.plist")
+ guard let data = BoundedRead.data(at: url, maximum: 16 * 1_048_576),
+ let entries = (try? PropertyListSerialization.propertyList(from: data, format: nil)) as? [[String: Any]]
+ else { return [:] }
+ var newest: [String: (name: String, date: Date)] = [:]
+ for entry in entries {
+ guard let name = entry["displayName"] as? String, !name.isEmpty,
+ let identifiers = entry["packageIdentifiers"] as? [String]
+ else { continue }
+ let date = entry["date"] as? Date ?? .distantPast
+ for identifier in identifiers where date >= newest[identifier]?.date ?? .distantPast {
+ newest[identifier] = (name, date)
+ }
+ }
+ return newest.mapValues(\.name)
+ }
+}
diff --git a/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipt.swift b/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipt.swift
index 200244a1..2e6c7b3d 100644
--- a/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipt.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipt.swift
@@ -57,6 +57,8 @@ public struct PackageReceipt: Sendable, Hashable, Identifiable {
public var installedApps: [String] = []
/// Whether one of those apps is excluded in Settings, which leaves its receipt alone too.
public var installedAppIsExcluded = false
+ /// The name macOS gave the package when it installed it, such as "AdGuard", if its install history keeps one.
+ public var name: String?
public var id: String { identifier }
@@ -73,3 +75,12 @@ public struct PackageReceipt: Sendable, Hashable, Identifiable {
isFileListKnown && !nothingLeftOnDisk && items.allSatisfy(\.isLeftAlone)
}
}
+
+extension PackageReceipt {
+ /// Whether `query` matches the identifier, the name macOS gave the package, or where one of its files is, since few
+ /// know a package by its identifier.
+ public func matches(_ query: String) -> Bool {
+ SearchText.matches(identifier, query) || name.map { SearchText.matches($0, query) } == true
+ || items.contains { SearchText.matches($0.url.path(percentEncoded: false), query) }
+ }
+}
diff --git a/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipts.swift b/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipts.swift
index da4a9b36..b1ee15f6 100644
--- a/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipts.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipts.swift
@@ -117,8 +117,15 @@ public enum PackageReceipts {
}
return results
}
+ let names = InstallHistory.names(onVolume: environment.rootDirectory)
return PackageScan(
- receipts: receipts.sorted { $0.identifier.localizedStandardCompare($1.identifier) == .orderedAscending }
+ receipts: receipts
+ .map { receipt in
+ var named = receipt
+ named.name = names[receipt.identifier]
+ return named
+ }
+ .sorted { $0.identifier.localizedStandardCompare($1.identifier) == .orderedAscending }
)
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/PackageReceiptsTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/PackageReceiptsTests.swift
index 2391d4c6..4e7ea790 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/PackageReceiptsTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/PackageReceiptsTests.swift
@@ -345,6 +345,34 @@ struct PackageReceiptsTests {
#expect(forgotten.failures.map(\.reason) == [.guarded(.excluded), .guarded(.excluded)])
}
+ @Test func namesAPackageAsMacOSsInstallHistoryDoes() throws {
+ let directory = try TemporaryDirectory()
+ let history: [[String: Any]] = [
+ ["displayName": "Mixer 1", "date": Date(timeIntervalSince1970: 1_000), "packageIdentifiers": ["org.example.mixer.pkg"]],
+ ["displayName": "Mixer", "date": Date(timeIntervalSince1970: 2_000), "packageIdentifiers": ["org.example.mixer.pkg"]],
+ ["displayName": "macOS 26.7.1", "date": Date(timeIntervalSince1970: 3_000)],
+ ["displayName": "", "date": Date(timeIntervalSince1970: 4_000), "packageIdentifiers": ["org.example.blank.pkg"]],
+ ]
+ try directory.file(
+ "Library/Receipts/InstallHistory.plist",
+ contents: PropertyListSerialization.data(fromPropertyList: history, format: .xml, options: 0)
+ )
+
+ #expect(InstallHistory.names(onVolume: directory.url) == ["org.example.mixer.pkg": "Mixer"])
+ #expect(InstallHistory.names(onVolume: directory.url.appending(path: "nowhere")).isEmpty)
+
+ var receipt = PackageReceipt(
+ identifier: "org.example.mixer.pkg", version: nil, installDate: nil, volume: directory.url,
+ items: [PackageReceipt.Item(url: URL(filePath: "/Library/Application Support/Soundworks/Mixer"), size: 1, requiresPrivileges: false)],
+ nothingLeftOnDisk: false
+ )
+ receipt.name = "Tunewell"
+ #expect(receipt.matches("mixer.pkg"))
+ #expect(receipt.matches("Tunewell"), "the name macOS gave it")
+ #expect(receipt.matches("Soundworks"), "where its files are")
+ #expect(!receipt.matches("Logitech"))
+ }
+
@Test func leavesAnAppToFinderWhenMacOSInstalledItsSystemExtension() async throws {
let directory = try TemporaryDirectory()
let volume = PathPattern.canonical(directory.url)
diff --git a/Peel/Views/ContentView.swift b/Peel/Views/ContentView.swift
index df825ba9..1c64ce7b 100644
--- a/Peel/Views/ContentView.swift
+++ b/Peel/Views/ContentView.swift
@@ -481,7 +481,7 @@ struct ContentView: View {
PackageDetailView(receipt: receipt)
.id(receipt.id)
} else {
- DetailPlaceholder(tool: .packages, summary: packages.summary, instruction: "Choose a package to see what it installed.")
+ DetailPlaceholder(tool: .packages, summary: packages.summary, instruction: "Choose a package to see what it installed. macOS keeps a receipt of the files each package put in place, and forgetting one moves only that receipt to the Trash.")
}
}
diff --git a/Peel/Views/Packages/PackageDetailView.swift b/Peel/Views/Packages/PackageDetailView.swift
index 0541632c..df12c864 100644
--- a/Peel/Views/Packages/PackageDetailView.swift
+++ b/Peel/Views/Packages/PackageDetailView.swift
@@ -168,6 +168,9 @@ struct PackageDetailView: View {
.help(Text(verbatim: receipt.identifier))
} details: {
FlowLayout {
+ if let name = receipt.name {
+ Badge(title: Text(verbatim: name), systemImage: "tag")
+ }
if let version = receipt.version {
Badge(title: Text("Version \(version)"), systemImage: "number")
}
diff --git a/Peel/Views/Packages/PackageList.swift b/Peel/Views/Packages/PackageList.swift
index 9b01d2bb..ea0c3704 100644
--- a/Peel/Views/Packages/PackageList.swift
+++ b/Peel/Views/Packages/PackageList.swift
@@ -18,6 +18,9 @@ struct PackageList: View {
.lineLimit(1)
.truncationMode(.middle)
HStack(spacing: 6) {
+ if let name = receipt.name {
+ Text(verbatim: name)
+ }
if receipt.nothingLeftOnDisk {
Text("Receipt only")
} else if !receipt.installedApps.isEmpty {
@@ -103,6 +106,6 @@ struct PackageList: View {
private var filteredReceipts: [PackageReceipt] {
let receipts = packages.receipts ?? []
guard !searchText.isEmpty else { return receipts }
- return receipts.filter { SearchText.matches($0.identifier, searchText) }
+ return receipts.filter { $0.matches(searchText) }
}
}