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.

Open the first selected page when the Select menu selects on every page

Țugui Dragoș8a98c0c9f822
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef41734c..939753d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -195,6 +195,9 @@ its changes the way [Keep a Changelog](https://keepachangelog.com/) suggests.
- With many pages selected, the Move to Trash question no longer runs past the bottom of the screen and takes its
buttons with it: it names the first few pages and counts the items of the others, which "Selected on N pages" lists.
+- The Select menu in the toolbar of Orphaned Files, Space, Developer, Build Artifacts, and Installers opens the first
+ page it selected on when no page is open, so what it selected shows, with Move to Trash, rather than nothing changing
+ until a page is chosen.
#### Duplicates and File Search
diff --git a/GUIDE.md b/GUIDE.md
index 377a09ca..7d34b993 100644
--- a/GUIDE.md
+++ b/GUIDE.md
@@ -200,8 +200,9 @@ What you select on Orphaned Files, Space, Developer, Build Artifacts, Installers
Search stays selected while you look at the others, and Move to Trash on any of them moves it all at once, as one
entry in History. These pages select nothing for you, but for the copies Duplicates selects after a scan you start. A
page counts once you have opened it, or once the Select menu in a tool's toolbar, which selects on every page the
-tool lists, has selected something there. The bar at the foot of the page says how many pages that is, and lists
-them. Move to Trash asks first, naming the first few pages and how many items the others hold.
+tool lists, has selected something there, and opens the first of those pages when none is open. The bar at the
+foot of the page says how many pages that is, and lists them. Move to Trash asks first, naming the first few pages
+and how many items the others hold.
## Look after your Mac
diff --git a/Peel/Views/Developer/DeveloperList.swift b/Peel/Views/Developer/DeveloperList.swift
index acf55fd6..479b7a52 100644
--- a/Peel/Views/Developer/DeveloperList.swift
+++ b/Peel/Views/Developer/DeveloperList.swift
@@ -39,7 +39,12 @@ struct DeveloperList: View {
SelectOnEveryPage(
pages: SelectablePages(listed.map { ($0.page, $0.selectableRows) }),
selection: developer
- )
+ ) { page in
+ guard developer.selection == nil, let environment = listed.first(where: { $0.page == page }) else {
+ return
+ }
+ developer.selection = environment.id
+ }
}
ToolbarItem {
RescanButton(isRunning: $isRescanning, isDisabled: developer.isRemoving, scan: developer.scanRun) {
diff --git a/Peel/Views/Installers/InstallerList.swift b/Peel/Views/Installers/InstallerList.swift
index 706b045d..2dd78b40 100644
--- a/Peel/Views/Installers/InstallerList.swift
+++ b/Peel/Views/Installers/InstallerList.swift
@@ -69,7 +69,12 @@ struct InstallerList: View {
(kind.page, installers.items(in: kind).selectableRows(canUseHelper: helper.canAct))
}),
selection: installers
- )
+ ) { page in
+ guard installers.selection == nil, let kind = filtered.first(where: { $0.page == page }) else {
+ return
+ }
+ installers.selection = kind
+ }
}
ToolbarItem {
RescanButton(
diff --git a/Peel/Views/Orphans/OrphanList.swift b/Peel/Views/Orphans/OrphanList.swift
index d7137943..be60af37 100644
--- a/Peel/Views/Orphans/OrphanList.swift
+++ b/Peel/Views/Orphans/OrphanList.swift
@@ -107,7 +107,13 @@ struct OrphanList: View {
SelectOnEveryPage(
pages: SelectablePages(filtered.map { ($0.page, $0.selectableRows(canUseHelper: helper.canAct)) }),
selection: orphans
- )
+ ) { page in
+ // Needs an Administrator lists what can't move, so it has no bar either.
+ guard orphans.selection == nil || orphans.selection == .forAnAdministrator,
+ let group = filtered.first(where: { $0.page == page })
+ else { return }
+ orphans.selection = .group(group.id)
+ }
}
ToolbarItem {
RescanButton(
diff --git a/Peel/Views/Projects/ProjectList.swift b/Peel/Views/Projects/ProjectList.swift
index 55c81bee..b13940ff 100644
--- a/Peel/Views/Projects/ProjectList.swift
+++ b/Peel/Views/Projects/ProjectList.swift
@@ -150,7 +150,12 @@ struct ProjectList: View {
SelectOnEveryPage(
pages: SelectablePages(filtered.map { ($0.page, $0.artifacts.selectableRows) }),
selection: projects
- )
+ ) { page in
+ guard projects.selection == nil, let group = filtered.first(where: { $0.page == page }) else {
+ return
+ }
+ projects.selection = group.id
+ }
}
ToolbarItem {
RescanButton(
diff --git a/Peel/Views/SelectOnEveryPage.swift b/Peel/Views/SelectOnEveryPage.swift
index 13dc7147..fd4ece4b 100644
--- a/Peel/Views/SelectOnEveryPage.swift
+++ b/Peel/Views/SelectOnEveryPage.swift
@@ -9,12 +9,16 @@ struct SelectOnEveryPage: View {
let selection: any RowSelection
var reading: (() async -> Bool)?
var isDisabled = false
+ /// Opens a page of the list when none with a bar is open, so what the menu selected shows, with Move to Trash.
+ let open: (CarriedSelection.Page) -> Void
var body: some View {
SelectMenu(
pages: pages.selectablePageCount,
list: pages.rows,
- selection: SeeingPages(selection: selection, pages: pages, carrier: carrier),
+ selection: SeeingPages(
+ selection: selection, pages: pages, hasSeen: carrier.hasSeen, saw: carrier.saw, open: open
+ ),
reading: reading,
isDisabled: isDisabled
)
@@ -22,26 +26,41 @@ struct SelectOnEveryPage: View {
}
/// The menu reads as selected only what Move to Trash would move: a row on a page not seen yet stays where it is.
-private final class SeeingPages: RowSelection {
+final class SeeingPages: RowSelection {
private let selection: any RowSelection
private let pages: SelectablePages<CarriedSelection.Page, URL>
- private let carrier: SelectionCarrier
+ private let hasSeen: (CarriedSelection.Page) -> Bool
+ private let saw: (CarriedSelection.Page) -> Void
+ private let open: (CarriedSelection.Page) -> Void
- init(selection: any RowSelection, pages: SelectablePages<CarriedSelection.Page, URL>, carrier: SelectionCarrier) {
+ init(
+ selection: any RowSelection,
+ pages: SelectablePages<CarriedSelection.Page, URL>,
+ hasSeen: @escaping (CarriedSelection.Page) -> Bool,
+ saw: @escaping (CarriedSelection.Page) -> Void,
+ open: @escaping (CarriedSelection.Page) -> Void
+ ) {
self.selection = selection
self.pages = pages
- self.carrier = carrier
+ self.hasSeen = hasSeen
+ self.saw = saw
+ self.open = open
}
var selectedURLs: Set<URL> {
- get { pages.counted(selection.selectedURLs, seen: carrier.hasSeen) }
+ get { pages.counted(selection.selectedURLs, seen: hasSeen) }
set { select(newValue) }
}
+ /// Selects `new`, counts every page it reaches as seen, and opens the first of them in the list's order.
func select(_ new: Set<URL>) {
selection.select(new)
- for page in pages.pages(selectedIn: selection.selectedURLs) {
- carrier.saw(page)
+ let selected = pages.pages(selectedIn: selection.selectedURLs)
+ for page in selected {
+ saw(page)
+ }
+ if let first = selected.first {
+ open(first)
}
}
}
diff --git a/Peel/Views/Space/SpaceList.swift b/Peel/Views/Space/SpaceList.swift
index 3e43fe56..0492d760 100644
--- a/Peel/Views/Space/SpaceList.swift
+++ b/Peel/Views/Space/SpaceList.swift
@@ -83,7 +83,10 @@ struct SpaceList: View {
reading: shown.contains { !$0.isReadOnly && space.plans[$0.id] == nil }
? { await space.planEvery(shown) } : nil,
isDisabled: space.isScanning
- )
+ ) { page in
+ guard space.selection == nil, let item = shown.first(where: { $0.page == page }) else { return }
+ space.selection = item.id
+ }
}
ToolbarItem {
RescanButton(isRunning: $isRescanning, isDisabled: space.isRemoving, scan: space.scanRun) {
diff --git a/PeelTests/SelectOnEveryPageTests.swift b/PeelTests/SelectOnEveryPageTests.swift
new file mode 100644
index 00000000..b5e09b47
--- /dev/null
+++ b/PeelTests/SelectOnEveryPageTests.swift
@@ -0,0 +1,34 @@
+import Foundation
+@testable import Peel
+import PeelCore
+import Testing
+
+@MainActor
+struct SelectOnEveryPageTests {
+ private final class Rows: RowSelection {
+ var selectedURLs: Set<URL> = []
+ func select(_ selection: Set<URL>) { selectedURLs = selection }
+ }
+
+ @Test func opensTheFirstPageItSelectedOnInTheListsOrder() {
+ let names = ["a", "b", "c"]
+ let items = names.map { URL(filePath: "/Users/me/Library/Caches/org.example.\($0)") }
+ let pages = names.map { CarriedSelection.Page(tool: "orphans", scope: "org.example.\($0)") }
+ let selectable = SelectablePages(zip(pages, items).map { page, item in
+ (page, SelectableRows(rows: [item], selectable: [item], recommended: []))
+ })
+ var opened: [CarriedSelection.Page] = []
+ var seen: Set<CarriedSelection.Page> = []
+ let seeing = SeeingPages(
+ selection: Rows(), pages: selectable,
+ hasSeen: { seen.contains($0) }, saw: { seen.insert($0) }, open: { opened.append($0) }
+ )
+
+ seeing.select([items[2], items[1]])
+ #expect(opened == [pages[1]])
+ #expect(seen == [pages[1], pages[2]])
+
+ seeing.select([])
+ #expect(opened == [pages[1]], "a selection of nothing opens nothing")
+ }
+}