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
Know from the start when Terminal's profiles can't be read
Țugui Dragoș04e4f1ea19ed
diff --git a/Peel/Model/TerminalLibrary.swift b/Peel/Model/TerminalLibrary.swiftindex c468ae78..810d6b1f 100644--- a/Peel/Model/TerminalLibrary.swift+++ b/Peel/Model/TerminalLibrary.swift@@ -55,11 +55,17 @@ final class TerminalLibrary {isTerminalOpen = settings.isTerminalOpenquietsLogin = HushLogin.isOn(in: home)shellSessions = ShellSessions.inTerminal(settings, home: home)+ areProfilesUnreadable = settings.profiles() == niloptions = ledger.options(in: settings)isManaged = settings.isManagedshowsWindowSwitch = TerminalWindows.switchMatters()}+ /// Lets go of the last refusal, as the page goes: its reason was shown where the switch went back.+ func forgetRefusal() {+ wasRefused = false+ }+func perform(_ action: Action) {guard !settings.isTerminalOpen else {waitingForTerminal = action@@ -71,9 +77,8 @@ final class TerminalLibrary {case .set(let option, let isOn): ledger.set(option, to: isOn, in: settings)}defaults.set(ledger.stored, forKey: Self.ledgerKey)- wasRefused = outcome == .refused- areProfilesUnreadable = outcome == .unreadablerefresh()+ wasRefused = outcome == .refused}func quitTerminal(andThen action: Action) async {diff --git a/Peel/Views/Terminal/TerminalPage.swift b/Peel/Views/Terminal/TerminalPage.swiftindex 21df9e1c..83bad18b 100644--- a/Peel/Views/Terminal/TerminalPage.swift+++ b/Peel/Views/Terminal/TerminalPage.swift@@ -49,6 +49,7 @@ struct TerminalPage: View {}.onDisappear {tweaks.forgetRefusals()+ terminal.forgetRefusal()}.onReceive(NotificationCenter.default.publisher(for: NSApplication.didBecomeActiveNotification)) { _ inTask { await refresh() }@@ -228,6 +229,10 @@ private struct TerminalSettingsForm: View {StatusLabel(title: Text("Locked by a profile"), systemImage: "lock", tint: .accentColor).font(.caption).foregroundStyle(.secondary)+ } else if terminal.areProfilesUnreadable {+ StatusLabel(title: Text("Terminal’s profiles couldn’t be read"), tint: .accentColor)+ .font(.caption)+ .foregroundStyle(.secondary)} else if terminal.options == nil {Text("Choose one of Peel’s themes to change these settings.").font(.caption)@@ -236,10 +241,6 @@ private struct TerminalSettingsForm: View {StatusLabel(title: Text("macOS refused it"), tint: .accentColor).font(.caption).foregroundStyle(.secondary)- } else if terminal.areProfilesUnreadable {- StatusLabel(title: Text("Terminal’s profiles couldn’t be read"), tint: .accentColor)- .font(.caption)- .foregroundStyle(.secondary)}}}diff --git a/PeelTests/TerminalLibrariesTests.swift b/PeelTests/TerminalLibrariesTests.swiftindex 159a6fc9..3362ea3f 100644--- a/PeelTests/TerminalLibrariesTests.swift+++ b/PeelTests/TerminalLibrariesTests.swift@@ -77,6 +77,46 @@ struct TerminalLibrariesTests {#expect(try size(of: library.file) == bytes)}+ @Test func theTerminalTabKnowsFromTheStartWhenTerminalsProfilesCannotBeRead() throws {+ let home = try madeUpHome()+ defer { try? FileManager.default.removeItem(at: home) }+ let suite = "org.example.peel-tests.\(UUID().uuidString)"+ let defaults = try #require(UserDefaults(suiteName: suite))+ defer { defaults.removePersistentDomain(forName: suite) }+ let terminal = FakeTerminalSettings()+ let theme = TerminalThemeCatalog.all[0]+ terminal.names = [.newWindows: theme.profileName, .startup: theme.profileName]+ terminal.storedProfiles = nil++ let library = TerminalLibrary(settings: terminal, defaults: defaults, home: home)++ #expect(library.areProfilesUnreadable)+ #expect(library.themeInUse == theme)+ #expect(library.options == nil)+ #expect(!library.wasRefused)++ terminal.storedProfiles = [theme.profileName: ["name": theme.profileName]]+ library.refresh()+ #expect(!library.areProfilesUnreadable)+ #expect(library.options == [])+ }++ @Test func aRefusalIsForgottenWhenThePageGoes() throws {+ let home = try madeUpHome()+ defer { try? FileManager.default.removeItem(at: home) }+ let suite = "org.example.peel-tests.\(UUID().uuidString)"+ let defaults = try #require(UserDefaults(suiteName: suite))+ defer { defaults.removePersistentDomain(forName: suite) }+ let terminal = FakeTerminalSettings()+ let library = TerminalLibrary(settings: terminal, defaults: defaults, home: home)+ terminal.storedProfiles = nil++ library.perform(.use(TerminalThemeCatalog.all[0]))+ #expect(library.areProfilesUnreadable)+ library.forgetRefusal()+ #expect(!library.wasRefused)+ }+@Test func aGitChangeSavesTheLedgerInTheStoreItWasGiven() async throws {let home = try madeUpHome()defer { try? FileManager.default.removeItem(at: home) }