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.

Draw nothing under an app's name when there is nothing to say

Țugui Dragoș6b294e29a2d7
diff --git a/Peel/Model/AppRowCaption.swift b/Peel/Model/AppRowCaption.swift
new file mode 100644
index 00000000..41e1ff7d
--- /dev/null
+++ b/Peel/Model/AppRowCaption.swift
@@ -0,0 +1,35 @@
+import Foundation
+import PeelCore
+
+/// What an app's row in Applications says under its name while no update waits for it: when it was last opened, or
+/// when it arrived if the list is sorted by that, else its version. Nil when it knows none of them, so the name stands
+/// alone beside the icon rather than above an empty line.
+enum AppRowCaption: Equatable {
+ case opened(Date)
+ case added(Date)
+ case version(String)
+ case neverOpened
+
+ init?(app: InstalledApp, sort: AppSort) {
+ switch sort {
+ case .lastOpened, .name, .size:
+ if let date = app.lastUsedDate {
+ self = .opened(date)
+ } else if let version = app.version {
+ self = .version(version)
+ } else if app.isUseRecorded {
+ self = .neverOpened
+ } else {
+ return nil
+ }
+ case .dateAdded:
+ if let date = app.dateAdded {
+ self = .added(date)
+ } else if let version = app.version {
+ self = .version(version)
+ } else {
+ return nil
+ }
+ }
+ }
+}
diff --git a/Peel/Views/AppList.swift b/Peel/Views/AppList.swift
index 5326b57f..d28998a9 100644
--- a/Peel/Views/AppList.swift
+++ b/Peel/Views/AppList.swift
@@ -324,27 +324,12 @@ private struct AppRow: View {
} else {
Text("Update to \(update.latest)")
}
- } else {
- caption
- }
- }
-
- /// Every other row says when it was last opened, or when it arrived if that is what the list is sorted by.
- private var caption: Text {
- switch sort {
- case .lastOpened, .name, .size:
- if let lastUsedDate = app.lastUsedDate {
- Text("Opened \(lastUsedDate, format: .relative(presentation: .named))")
- } else if let version = app.version {
- Text(verbatim: version)
- } else {
- app.isUseRecorded ? Text("Never opened") : Text(verbatim: "")
- }
- case .dateAdded:
- if let dateAdded = app.dateAdded {
- Text("Added \(dateAdded, format: .relative(presentation: .named))")
- } else {
- Text(verbatim: app.version ?? "")
+ } else if let caption = AppRowCaption(app: app, sort: sort) {
+ switch caption {
+ case .opened(let lastUsedDate): Text("Opened \(lastUsedDate, format: .relative(presentation: .named))")
+ case .added(let dateAdded): Text("Added \(dateAdded, format: .relative(presentation: .named))")
+ case .version(let version): Text(verbatim: version)
+ case .neverOpened: Text("Never opened")
}
}
}
diff --git a/PeelTests/AppRowCaptionTests.swift b/PeelTests/AppRowCaptionTests.swift
new file mode 100644
index 00000000..4e3141d1
--- /dev/null
+++ b/PeelTests/AppRowCaptionTests.swift
@@ -0,0 +1,30 @@
+import Foundation
+@testable import Peel
+import PeelCore
+import Testing
+
+struct AppRowCaptionTests {
+ private func app(
+ lastUsed: Date? = nil, version: String? = nil, isUseRecorded: Bool = true, added: Date? = nil
+ ) -> InstalledApp {
+ InstalledApp(
+ url: URL(filePath: "/Applications/Tide.app"), bundleIdentifier: "org.example.tide", name: "Tide",
+ version: version, lastUsedDate: lastUsed, isUseRecorded: isUseRecorded, dateAdded: added
+ )
+ }
+
+ @Test func saysNothingWhenItKnowsNothing() {
+ #expect(AppRowCaption(app: app(isUseRecorded: false), sort: .lastOpened) == nil)
+ #expect(AppRowCaption(app: app(isUseRecorded: false), sort: .name) == nil)
+ #expect(AppRowCaption(app: app(), sort: .dateAdded) == nil)
+ }
+
+ @Test func saysWhatItKnows() {
+ let date = Date(timeIntervalSince1970: 1_800_000_000)
+ #expect(AppRowCaption(app: app(lastUsed: date, version: "2.0"), sort: .size) == .opened(date))
+ #expect(AppRowCaption(app: app(version: "2.0"), sort: .lastOpened) == .version("2.0"))
+ #expect(AppRowCaption(app: app(), sort: .name) == .neverOpened)
+ #expect(AppRowCaption(app: app(version: "2.0", added: date), sort: .dateAdded) == .added(date))
+ #expect(AppRowCaption(app: app(version: "2.0"), sort: .dateAdded) == .version("2.0"))
+ }
+}