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.

Let the rescan after Remove Downloads be stopped

Țugui Dragoșbf67caa652ec
diff --git a/Peel/Model/CloudLibrary.swift b/Peel/Model/CloudLibrary.swift
index 0db245a0..efcd73a0 100644
--- a/Peel/Model/CloudLibrary.swift
+++ b/Peel/Model/CloudLibrary.swift
@@ -126,11 +126,24 @@ final class CloudLibrary {
freeingTask = task
let done = await task.value
freeingTask = nil
+ leaveOut(done.freed)
await refresh()
refusals = done.refused
return done.freed.map(\.size).cappedSum
}
+ /// Takes what was freed off the list at once, since the rescan after it can be stopped.
+ private func leaveOut(_ freed: [CloudFile]) {
+ let gone = Set(freed.map(\.url))
+ guard !gone.isEmpty, let files else { return }
+ let left = files.filter { !gone.contains($0.url) }
+ let kept = Set(left.map(\.url))
+ folders = CloudFolder.ordered(folders.compactMap { $0.keeping(kept) })
+ searchable = CloudFolder.searchable(left, in: folders)
+ self.files = left
+ selectedURLs.subtract(gone)
+ }
+
func stopFreeing() {
freeingTask?.cancel()
}
diff --git a/Peel/Views/Cloud/CloudView.swift b/Peel/Views/Cloud/CloudView.swift
index ee40558f..b8a900a8 100644
--- a/Peel/Views/Cloud/CloudView.swift
+++ b/Peel/Views/Cloud/CloudView.swift
@@ -201,7 +201,7 @@ struct CloudView: View {
.navigationTitle(Text(Tool.cloud.title))
.toolbar {
ToolbarItem {
- RescanButton(isRunning: $isRescanning, isDisabled: cloud.isFreeing, scan: cloud.scanRun) {
+ RescanButton(isRunning: $isRescanning, isDisabled: cloud.freeing.isMoving, scan: cloud.scanRun) {
await cloud.refresh()
}
}
diff --git a/PeelTests/CloudLibraryTests.swift b/PeelTests/CloudLibraryTests.swift
index c9261c88..07ae0f22 100644
--- a/PeelTests/CloudLibraryTests.swift
+++ b/PeelTests/CloudLibraryTests.swift
@@ -94,6 +94,44 @@ struct CloudLibraryTests {
#expect(cloud.refusals.map(\.url) == [kept.url])
}
+ @Test func aRescanStoppedAfterRemovingDownloadsListsNothingThatWasRemoved() async {
+ let freed = Self.download("Freed.mov")
+ let kept = Self.download("Kept.mov")
+ let everything = CloudStorage.folders(of: [freed, kept], home: URL(filePath: "/org.example"))
+ let (rescan, rescans) = AsyncStream.makeStream(of: Void.self)
+ let asked = Asked()
+ let cloud = CloudLibrary(
+ scan: { _, _, _ in
+ asked.scans += 1
+ if asked.scans > 1 {
+ rescans.yield()
+ try? await Task.sleep(for: .seconds(30))
+ }
+ return CloudScan(files: [freed, kept], folders: everything)
+ },
+ removeDownloads: { _, _ in CloudFreeing(freed: [freed]) }
+ )
+ await cloud.refresh()
+ cloud.selectedURLs = [freed.url]
+
+ let removal = Task { await cloud.freeSelected() }
+ var waiting = rescan.makeAsyncIterator()
+ await waiting.next()
+
+ #expect(cloud.isFreeing)
+ #expect(!cloud.freeing.isMoving)
+ #expect(cloud.files == [kept])
+ #expect(cloud.folders.flatMap(\.files) == [kept])
+ #expect(cloud.files(matching: "Freed").isEmpty)
+ #expect(cloud.selectedURLs.isEmpty)
+
+ cloud.scanRun.stop()
+
+ #expect(await removal.value == freed.size)
+ #expect(cloud.files == [kept])
+ #expect(!cloud.isFreeing)
+ }
+
@Test func stopsRemovingDownloadsWhenAsked() async {
let download = Self.download("Film.mov")
let (started, starts) = AsyncStream.makeStream(of: Void.self)