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.

Say why Space couldn't measure the AI models

Țugui Dragoșf5b66f27849d
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstrings
index 3c6ea730..4ac58068 100644
--- a/Localization/Peel/Localizable.xcstrings
+++ b/Localization/Peel/Localizable.xcstrings
@@ -12695,6 +12695,112 @@
}
}
},
+ "A folder of theirs has permissions of its own that keep your account out." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Jedna z jejich složek má vlastní oprávnění, která do ní váš účet nepustí."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Einer ihrer Ordner hat eigene Zugriffsrechte, die deinen Benutzeraccount aussperren."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Una de sus carpetas tiene permisos propios, que no dejan entrar a tu cuenta."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "L’un de leurs dossiers a ses propres permissions, qui empêchent votre compte d’y accéder."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Una delle loro cartelle ha permessi propri che impediscono al tuo account di accedervi."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "それらのフォルダの1つは、フォルダ自体のアクセス権により、お使いのアカウントではアクセスできません。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "이들의 폴더 중 하나는 자체 사용 권한 때문에 이 계정으로 들어갈 수 없습니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Een van hun mappen heeft eigen bevoegdheden die je account buitensluiten."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Jeden z ich folderów ma własne uprawnienia, które nie dają Twojemu kontu dostępu."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Uma das pastas deles tem permissões próprias que não deixam esta conta entrar."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Unul dintre dosarele lor are permisiuni proprii care nu permit accesul contului dvs."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "У одной из их папок есть собственные права доступа, которые не пускают в нее Вашу учетную запись."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "En av deras mappar har egna behörigheter som stänger ute ditt konto."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Bunlara ait bir klasörün, hesabınızın içeri girmesini engelleyen kendi izinleri var."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Одна з їхніх папок має власні привілеї, які не пускають до неї ваш обліковий запис."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "其中一个文件夹有自己的权限设置,不允许你的账户进入。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "其中一個檔案夾有自己的權限,讓你的帳號無法進入。"
+ }
+ }
+ }
+ },
"A full Git interface inside Terminal." : {
"localizations" : {
"cs" : {
@@ -98812,6 +98918,112 @@
}
}
},
+ "Measuring a folder of theirs took too long." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Měření jedné z jejich složek trvalo příliš dlouho."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Das Messen eines ihrer Ordner hat zu lange gedauert."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Se ha tardado demasiado en medir una de sus carpetas."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "La mesure de l’un de leurs dossiers a pris trop de temps."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Misurare una delle loro cartelle ha richiesto troppo tempo."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "それらのフォルダの1つは、計測に時間がかかりすぎました。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "이들의 폴더 중 하나를 측정하는 데 너무 오래 걸렸습니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Het meten van een van hun mappen duurde te lang."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Mierzenie jednego z ich folderów trwało zbyt długo."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "A medição de uma das pastas deles demorou demais."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Măsurarea unuia dintre dosarele lor a durat prea mult."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Измерение одной из их папок заняло слишком много времени."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Det tog för lång tid att mäta en av deras mappar."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Bunlara ait bir klasörü ölçmek çok uzun sürdü."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Вимірювання однієї з їхніх папок тривало надто довго."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "测量其中一个文件夹耗时过长。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "測量其中一個檔案夾耗時過久。"
+ }
+ }
+ }
+ },
"Media" : {
"localizations" : {
"cs" : {
@@ -264967,6 +265179,112 @@
}
}
},
+ "macOS kept Peel out of a folder of theirs." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Systém macOS nepustil Peel do jedné z jejich složek."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS hat Peel aus einem ihrer Ordner ausgesperrt."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS no ha dejado entrar a Peel en una de sus carpetas."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS a empêché Peel d’accéder à l’un de leurs dossiers."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS ha impedito a Peel di accedere a una delle loro cartelle."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOSにより、Peelはそれらのフォルダの1つにアクセスできませんでした。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS가 이들의 폴더 중 하나에 Peel이 들어가지 못하게 했습니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS hield Peel buiten een van hun mappen."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS nie dał aplikacji Peel dostępu do jednego z ich folderów."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "O macOS não deixou o Peel entrar em uma das pastas deles."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS nu i‑a permis aplicației Peel accesul la unul dintre dosarele lor."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS не пустила Peel в одну из их папок."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS höll Peel utanför en av deras mappar."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS, Peel’in bunlara ait bir klasöre girmesine izin vermedi."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS не пустила Peel до однієї з їхніх папок."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS不允许Peel进入其中一个文件夹。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS不讓Peel進入其中一個檔案夾。"
+ }
+ }
+ }
+ },
"macOS lets Peel put back another developer’s app only with App Management. Allow Peel in System Settings > Privacy & Security > App Management, then try again." : {
"localizations" : {
"cs" : {
diff --git a/Packages/PeelCore/Sources/PeelCore/Developer/DeveloperCaches.swift b/Packages/PeelCore/Sources/PeelCore/Developer/DeveloperCaches.swift
index aae0da38..38b7390f 100644
--- a/Packages/PeelCore/Sources/PeelCore/Developer/DeveloperCaches.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Developer/DeveloperCaches.swift
@@ -75,6 +75,13 @@ public struct DeveloperEnvironment: Sendable, Hashable, Identifiable {
public var id: URL { url }
+ /// Why its size isn't known, or nil once it is measured.
+ public var whyNotMeasured: HoldBack? {
+ guard size == nil else { return nil }
+ if closedByPermissions { return .closedByPermissions }
+ return couldNotBeRead ? .couldNotBeRead : .notMeasured
+ }
+
/// Whether Peel recommends this location, which Select Recommended selects and `peel caches --remove` moves:
/// only content that tools make or fetch again, or logs, and only once measured.
public var isRecommended: Bool { keptBecause == nil }
@@ -83,10 +90,7 @@ public struct DeveloperEnvironment: Sendable, Hashable, Identifiable {
/// a secret seen inside first, then what isn't known, since it may hide anything else, then the rest.
public var keptBecause: Kept? {
if let heldBack, heldBack.isASecret { return .heldBack(heldBack) }
- if size == nil {
- if closedByPermissions { return .heldBack(.closedByPermissions) }
- return .heldBack(couldNotBeRead ? .couldNotBeRead : .notMeasured)
- }
+ if let whyNotMeasured { return .heldBack(whyNotMeasured) }
if let heldBack { return .heldBack(heldBack) }
switch kind {
case .buildData, .downloads, .cache, .logs: break
diff --git a/Peel/Model/SpaceLibrary.swift b/Peel/Model/SpaceLibrary.swift
index cbdd5f37..b4442870 100644
--- a/Peel/Model/SpaceLibrary.swift
+++ b/Peel/Model/SpaceLibrary.swift
@@ -22,6 +22,8 @@ final class SpaceLibrary: RowSelection {
/// What the AI models and datasets the Developer page lists take, measured once the areas show; nil while there
/// are none, and before the first measurement.
private(set) var models: SizeTotal?
+ /// Why the folders of those Peel couldn't measure weren't measured, each reason once.
+ private(set) var modelsNotMeasured: Set<HoldBack> = []
@ObservationIgnored private var modelsMeasurement = 0
@ObservationIgnored private var quitCheck: Task<Void, Never>?
/// How many plans of each area have started, so that a plan that started earlier and ended later is dropped: it can
@@ -199,6 +201,7 @@ final class SpaceLibrary: RowSelection {
let found = await findModels(ExclusionsStore.shared.exclusions)
guard !Task.isCancelled, measurement == modelsMeasurement else { return }
models = found.isEmpty ? nil : SizeTotal(found.map(\.size))
+ modelsNotMeasured = Set(found.compactMap(\.whyNotMeasured))
}
}
diff --git a/Peel/Views/Space/SpaceList.swift b/Peel/Views/Space/SpaceList.swift
index df3527c0..ea207a4f 100644
--- a/Peel/Views/Space/SpaceList.swift
+++ b/Peel/Views/Space/SpaceList.swift
@@ -160,11 +160,21 @@ struct SpaceList: View {
.padding(.vertical, 6)
}
+ private static let whyNotMeasured: [HoldBack] = [.notMeasured, .couldNotBeRead, .closedByPermissions]
+
private func modelsLine(_ total: SizeTotal) -> Text {
switch total.reading {
case .exactly(let size): Text("AI models and datasets take \(size.byteCount) on this Mac.")
case .atLeast(let size): Text("AI models and datasets take over \(size.byteCount) on this Mac.")
- case .unknown: Text("Peel couldn’t measure the AI models and datasets on this Mac.")
+ case .unknown:
+ Text(verbatim: ([String(localized: "Peel couldn’t measure the AI models and datasets on this Mac.")]
+ + Self.whyNotMeasured.filter(space.modelsNotMeasured.contains).map {
+ switch $0 {
+ case .couldNotBeRead: String(localized: "macOS kept Peel out of a folder of theirs.")
+ case .closedByPermissions: String(localized: "A folder of theirs has permissions of its own that keep your account out.")
+ default: String(localized: "Measuring a folder of theirs took too long.")
+ }
+ }).joined(separator: " "))
}
}
}
diff --git a/PeelTests/SpaceLibraryTests.swift b/PeelTests/SpaceLibraryTests.swift
index 7470a450..6904741c 100644
--- a/PeelTests/SpaceLibraryTests.swift
+++ b/PeelTests/SpaceLibraryTests.swift
@@ -27,6 +27,25 @@ struct SpaceLibraryTests {
await space.measureModels()
#expect(space.models == SizeTotal(known: 3_000, isComplete: true))
+ #expect(space.modelsNotMeasured.isEmpty)
+ }
+
+ @Test func keepsWhyAModelsFolderWasntMeasured() async {
+ func location(_ name: String, closed: Bool = false, unread: Bool = false) -> DeveloperEnvironment.Location {
+ var location = DeveloperEnvironment.Location(
+ url: URL(filePath: "/tmp/org.example.\(name)"), kind: .models, size: nil, source: "https://example.com"
+ )
+ location.couldNotBeRead = unread || closed
+ location.closedByPermissions = closed
+ return location
+ }
+ let models = [location("slow"), location("closed", closed: true), location("unread", unread: true)]
+ let space = SpaceLibrary(measuringModels: { _ in models })
+
+ await space.measureModels()
+
+ #expect(space.models?.reading == .unknown)
+ #expect(space.modelsNotMeasured == [.notMeasured, .closedByPermissions, .couldNotBeRead])
}
@Test func aPlanThatStartedEarlierAndEndedLaterIsDropped() async throws {