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.

Put back a screenshot folder that is on a disk not connected

Țugui Dragoș36fd09d0ff17
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4250e2f..604108a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -112,7 +112,8 @@ its changes the way [Keep a Changelog](https://keepachangelog.com/) suggests.
- A number written as text, as `defaults write` stores it with no type flag, reads as the number it spells, so a wait
before the hidden Dock slides out set that way no longer shows as off.
- Put Back on the screenshot folder leaves the setting to macOS, and says so, when the folder from before isn't there
- anymore, is in the Trash, or can't be written to, instead of writing back a folder screenshots can't be saved in.
+ anymore, is in the Trash, or can't be written to, instead of writing back a folder screenshots can't be saved in. A
+ folder on a disk that isn't connected is put back as it was, for when the disk is back.
- The folder for screenshots is written without a slash at its end.
- A write macOS refused keeps its word under the row until that tweak's next write lands, whatever other rows change.
diff --git a/Packages/PeelCore/Sources/PeelCore/Tweaks/ScreenshotFolder.swift b/Packages/PeelCore/Sources/PeelCore/Tweaks/ScreenshotFolder.swift
index d4f3797e..25655528 100644
--- a/Packages/PeelCore/Sources/PeelCore/Tweaks/ScreenshotFolder.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Tweaks/ScreenshotFolder.swift
@@ -14,6 +14,13 @@ public enum ScreenshotFolder {
PathPattern.comparablePath(of: folder)
}
+ /// Whether the folder a setting named before Peel changed it can no longer take screenshots. One on a disk that is
+ /// not connected can't be told, and takes them again once the disk is back.
+ public static func cannotTakeScreenshots(_ path: String, home: URL = .homeDirectory) -> Bool {
+ let folder = URL(filePath: path, directoryHint: .isDirectory)
+ return !folder.isOnADiskNotConnected && problem(with: folder, home: home) != nil
+ }
+
public static func problem(with folder: URL, home: URL = .homeDirectory) -> Problem? {
var isDirectory: ObjCBool = false
let path = folder.path(percentEncoded: false)
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/ScreenshotFolderTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/ScreenshotFolderTests.swift
index a2222db4..c646fc0c 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/ScreenshotFolderTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/ScreenshotFolderTests.swift
@@ -28,6 +28,17 @@ struct ScreenshotFolderTests {
}
/// The setting is the folder's path as the person would write it, with no slash at the end.
+ @Test func aFolderFromBeforeOnADiskThatIsNotConnectedMayStillTakeScreenshots() throws {
+ let directory = try TemporaryDirectory()
+ let away = "/Volumes/PeelTests-\(UUID().uuidString)/Screenshots"
+
+ #expect(!ScreenshotFolder.cannotTakeScreenshots(away, home: directory.url))
+ let gone = directory.url.appending(path: "Gone").path(percentEncoded: false)
+ #expect(ScreenshotFolder.cannotTakeScreenshots(gone, home: directory.url))
+ let shots = try directory.directory("Shots")
+ #expect(!ScreenshotFolder.cannotTakeScreenshots(shots.path(percentEncoded: false), home: directory.url))
+ }
+
@Test func writesTheFolderWithoutATrailingSlash() throws {
let directory = try TemporaryDirectory()
let shots = try directory.directory("Shots")
diff --git a/Peel/Model/TweakLibrary.swift b/Peel/Model/TweakLibrary.swift
index 379f2aec..610d6c43 100644
--- a/Peel/Model/TweakLibrary.swift
+++ b/Peel/Model/TweakLibrary.swift
@@ -145,7 +145,7 @@ final class TweakLibrary {
/// folder from before that has become one is not put back: the key goes instead, and macOS saves on the Desktop.
private func leaveToMacOSAFolderThatCannotTakeScreenshots(_ tweak: Tweak) {
guard tweak.kind == .folder, let before = ledger.previousValues[tweak.id] as? String,
- ScreenshotFolder.problem(with: URL(filePath: before, directoryHint: .isDirectory), home: home) != nil
+ ScreenshotFolder.cannotTakeScreenshots(before, home: home)
else { return }
ledger.forgetPreviousValue(of: tweak)
foldersLeftToMacOS.insert(tweak.id)
diff --git a/PeelTests/TweakLibraryTests.swift b/PeelTests/TweakLibraryTests.swift
index 6e1e8f35..9bb72b2f 100644
--- a/PeelTests/TweakLibraryTests.swift
+++ b/PeelTests/TweakLibraryTests.swift
@@ -127,6 +127,21 @@ struct TweakLibraryTests {
#expect(library.foldersLeftToMacOS.isEmpty)
}
+ @Test func putBackReturnsAScreenshotFolderOnADiskThatIsNotConnected() async throws {
+ let store = FakeTweakStore()
+ let (library, made) = try makeLibrary(store: store)
+ defer { made.forget() }
+ let folder = try #require(TweakCatalog.all.first { $0.kind == .folder })
+ let away = "/Volumes/PeelTests-\(UUID().uuidString)/Screenshots"
+ store.values[folder.id] = away
+ await library.turnOn(folder, text: "/Users/Shared")
+
+ await library.reset(folder)
+
+ #expect(store.values[folder.id] as? String == away)
+ #expect(library.foldersLeftToMacOS.isEmpty)
+ }
+
@Test func twoRefusedSwitchesBothSaySo() async throws {
let store = FakeTweakStore()
let (library, made) = try makeLibrary(store: store)