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 on Home that the helper isn't answering, and to repair it

Țugui Dragoș88b0db4449a2
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstrings
index 05491efe..a54cea30 100644
--- a/Localization/Peel/Localizable.xcstrings
+++ b/Localization/Peel/Localizable.xcstrings
@@ -113570,6 +113570,112 @@
}
}
},
+ "Peel’s helper isn’t answering" : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Pomocník Peelu neodpovídá"
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Das Hilfsprogramm von Peel antwortet nicht"
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "El asistente de Peel no responde"
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "L’utilitaire de Peel ne répond pas"
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "L’assistente di Peel non risponde"
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peelのヘルパーが応答しません"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel 보조 프로그램이 응답하지 않음"
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Het hulpprogramma van Peel reageert niet"
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Pomocnik Peel nie odpowiada"
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "O auxiliar do Peel não está respondendo"
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Instrumentul de ajutor Peel nu răspunde"
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Помощник Peel не отвечает"
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peels hjälpprogram svarar inte"
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel’in yardımcısı yanıt vermiyor"
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Помічник Peel не відповідає"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel的帮助程序没有响应"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel的輔助程式沒有回應"
+ }
+ }
+ }
+ },
"Peel’s helper isn’t answering. Repair it in Settings." : {
"localizations" : {
"cs" : {
@@ -123690,6 +123796,112 @@
}
}
},
+ "Repair it below. Until then, Peel can’t move anything that needs an administrator." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Opravte ho níže. Do té doby Peel nemůže přesunout nic, co vyžaduje oprávnění správce."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Repariere es unten. Bis dahin kann Peel nichts verschieben, was einen Administrator benötigt."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Repáralo más abajo. Hasta entonces, Peel no puede trasladar nada que necesite un administrador."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Réparez-le ci-dessous. En attendant, Peel ne peut déplacer aucun élément qui nécessite un administrateur."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Riparalo qui sotto. Fino a quel momento, Peel non può spostare nulla che richieda un amministratore."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "以下で修復してください。修復するまで、Peelは管理者が必要な項目を移動できません。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "아래에서 복구하십시오. 복구하기 전까지 Peel은 관리자가 필요한 항목을 이동할 수 없습니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Herstel het hieronder. Tot die tijd kan Peel niets verplaatsen waarvoor een beheerder nodig is."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Napraw go poniżej. Do tego czasu Peel nie może przenieść niczego, co wymaga uprawnień administratora."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Repare-o abaixo. Até lá, o Peel não consegue mover nada que requeira um administrador."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Reparați‑l mai jos. Până atunci, Peel nu poate muta nimic din ce necesită un administrator."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Исправьте его ниже. До тех пор Peel не сможет перемещать ничего, для чего нужен администратор."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Reparera det nedan. Innan dess kan Peel inte flytta något som kräver en administratör."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Onu aşağıdan onarın. O zamana kadar Peel, yönetici gerektiren hiçbir şeyi taşıyamaz."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Полагодьте його нижче. До того часу Peel не може перемістити нічого, для чого потрібен адміністратор."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "请在下方修复。在此之前,Peel无法移动任何需要管理员权限的项目。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "請在下方修復。在此之前,Peel無法移動任何需要管理者權限的項目。"
+ }
+ }
+ }
+ },
"Replaced" : {
"localizations" : {
"cs" : {
@@ -133704,6 +133916,112 @@
}
}
},
+ "Set up %@ below, and repair the helper." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Níže nastavte: %@. Opravte také pomocníka."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Richte unten %@ ein und repariere das Hilfsprogramm."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Configura %@ más abajo, y repara el asistente."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Configurez %@ ci-dessous, et réparez l’utilitaire."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Configura qui sotto: %@. Ripara anche l’assistente."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "以下で%@を設定し、ヘルパーを修復してください。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "아래에서 %@을(를) 설정하고 보조 프로그램을 복구하십시오."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Stel hieronder %@ in en herstel het hulpprogramma."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Skonfiguruj poniżej: %@, a także napraw pomocnika."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Configure %@ abaixo e repare o auxiliar."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Configurați %@ mai jos și reparați instrumentul de ajutor."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Настройте ниже: %@. Также исправьте помощника."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ställ in %@ nedan och reparera hjälpprogrammet."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Aşağıdan ayarlayın: %@. Yardımcıyı da onarın."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Налаштуйте нижче: %@. Також полагодьте помічника."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "请在下方设置%@,并修复帮助程序。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "請在下方設定%@,並修復輔助程式。"
+ }
+ }
+ }
+ },
"Set up %@ below." : {
"localizations" : {
"cs" : {
diff --git a/Packages/PeelCore/Sources/PeelCore/Home/MissingPermissionsNotice.swift b/Packages/PeelCore/Sources/PeelCore/Home/MissingPermissionsNotice.swift
new file mode 100644
index 00000000..9bb1ea3e
--- /dev/null
+++ b/Packages/PeelCore/Sources/PeelCore/Home/MissingPermissionsNotice.swift
@@ -0,0 +1,15 @@
+/// What Home asks the person to do about the required permissions that are missing. A helper that is installed but
+/// doesn't answer is repaired, not set up.
+public enum MissingPermissionsNotice: Sendable, Equatable {
+ case setUp
+ case repairTheHelper
+ case setUpAndRepairTheHelper
+
+ public init(helper: PrivilegedHelper.Standing, othersMissing: Bool) {
+ self = switch (helper == .notAnswering, othersMissing) {
+ case (false, _): .setUp
+ case (true, false): .repairTheHelper
+ case (true, true): .setUpAndRepairTheHelper
+ }
+ }
+}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/MissingPermissionsNoticeTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/MissingPermissionsNoticeTests.swift
new file mode 100644
index 00000000..d5c9d08a
--- /dev/null
+++ b/Packages/PeelCore/Tests/PeelCoreTests/MissingPermissionsNoticeTests.swift
@@ -0,0 +1,16 @@
+@testable import PeelCore
+import Testing
+
+struct MissingPermissionsNoticeTests {
+ @Test func aHelperThatIsInstalledButNotAnsweringIsRepairedNotSetUp() {
+ #expect(MissingPermissionsNotice(helper: .notAnswering, othersMissing: false) == .repairTheHelper)
+ #expect(MissingPermissionsNotice(helper: .notAnswering, othersMissing: true) == .setUpAndRepairTheHelper)
+ }
+
+ @Test func whatIsNotThereIsSetUp() {
+ for helper in [PrivilegedHelper.Standing.ready, .notInstalled, .waitingForApproval, .notThisAccount] {
+ #expect(MissingPermissionsNotice(helper: helper, othersMissing: true) == .setUp)
+ #expect(MissingPermissionsNotice(helper: helper, othersMissing: false) == .setUp)
+ }
+ }
+}
diff --git a/Peel/Views/Home/HomePermissionsView.swift b/Peel/Views/Home/HomePermissionsView.swift
index 537535da..8d95f088 100644
--- a/Peel/Views/Home/HomePermissionsView.swift
+++ b/Peel/Views/Home/HomePermissionsView.swift
@@ -224,10 +224,22 @@ struct HomePermissionsContent: View {
.buttonStyle(.sticker(fill: Album.redFill, size: 11.5))
}
} else if home.needsAttention {
- let missing = home.missingRequired.map { String(localized: $0.title) }.formatted(.list(type: .and))
+ let notice = MissingPermissionsNotice(
+ helper: home.helperStanding,
+ othersMissing: home.missingRequired.contains { $0 != .helper }
+ )
+ let toSetUp = home.missingRequired.filter { notice == .setUp || $0 != .helper }
+ let missing = toSetUp.map { String(localized: $0.title) }.formatted(.list(type: .and))
+ let detail = switch notice {
+ case .setUp: Text("Set up \(missing) below.")
+ case .repairTheHelper: Text("Repair it below. Until then, Peel can’t move anything that needs an administrator.")
+ case .setUpAndRepairTheHelper: Text("Set up \(missing) below, and repair the helper.")
+ }
Notice(
- title: Text("Peel can’t see or remove everything yet"),
- detail: Text("Set up \(missing) below."),
+ title: notice == .repairTheHelper
+ ? Text("Peel’s helper isn’t answering")
+ : Text("Peel can’t see or remove everything yet"),
+ detail: detail,
isAlbum: true
) {
if home.needsRelaunchForFullDiskAccess {