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 Tweaks rename screenshots

Țugui Dragoș0df31a4474ae
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstrings
index 3a1d9ef7..de00b2b0 100644
--- a/Localization/Peel/Localizable.xcstrings
+++ b/Localization/Peel/Localizable.xcstrings
@@ -7721,6 +7721,218 @@
}
}
},
+ "A name can’t have a slash or a colon in it." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Název nemůže obsahovat lomítko ani dvojtečku."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ein Name darf weder einen Schrägstrich noch einen Doppelpunkt enthalten."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Un nombre no puede contener una barra “/” ni dos puntos “:”."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Un nom ne peut contenir ni barre oblique ni deux-points."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Un nome non può contenere una barra né i due punti."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "名前にスラッシュまたはコロンを含めることはできません。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "이름에는 슬래시나 콜론을 포함할 수 없습니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Een naam mag geen schuine streep of dubbele punt bevatten."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Nazwa nie może zawierać ukośnika ani dwukropka."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Um nome não pode ter barra nem dois-pontos."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Un nume nu poate conține o bară oblică „/” sau două puncte „:”."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Имя не может содержать косую черту или двоеточие."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ett namn får inte innehålla snedstreck eller kolon."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ad, eğik çizgi veya iki nokta üst üste içeremez."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Назва не може містити скісну риску або двокрапку."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "名称中不能包含斜线或冒号。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "名稱不能包含斜線或冒號。"
+ }
+ }
+ }
+ },
+ "A name can’t start with a period, or the screenshots would be hidden." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Název nemůže začínat tečkou, jinak by snímky obrazovky byly skryté."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ein Name darf nicht mit einem Punkt beginnen, sonst wären die Bildschirmfotos ausgeblendet."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Un nombre no puede empezar por un punto, porque las capturas de pantalla quedarían ocultas."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Un nom ne peut pas commencer par un point, sinon les captures d’écran seraient masquées."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Un nome non può iniziare con un punto, altrimenti gli screenshot sarebbero nascosti."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "名前をピリオドで始めることはできません。ピリオドで始めると、スクリーンショットが非表示になります。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "이름은 마침표로 시작할 수 없습니다. 마침표로 시작하면 스크린샷이 숨겨집니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Een naam mag niet met een punt beginnen, anders zouden de schermafbeeldingen verborgen zijn."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Nazwa nie może zaczynać się od kropki, bo w przeciwnym razie zrzuty ekranu byłyby ukryte."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Um nome não pode começar com um ponto, senão as capturas de tela ficariam ocultas."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Un nume nu poate începe cu un punct „.”, altfel capturile de ecran ar fi ascunse."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Имя не может начинаться с точки, иначе снимки экрана будут скрыты."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ett namn får inte börja med en punkt, annars skulle skärmavbilderna bli gömda."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ad, nokta ile başlayamaz, yoksa ekran resimleri gizlenir."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Назва не може починатися з крапки, інакше знімки екрана були б приховані."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "名称不能以句点开头,否则截屏会被隐藏。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "名稱不能以句點開頭,否則截圖會隱藏起來。"
+ }
+ }
+ }
+ },
"A package Homebrew is in the middle of installing may be left half installed, and may need installing again." : {
"localizations" : {
"cs" : {
@@ -101016,6 +101228,112 @@
}
}
},
+ "Put back the screenshot name" : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Vrátit zpět název snímků obrazovky"
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Vorherigen Namen für Bildschirmfotos wiederherstellen"
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Restaurar el nombre de las capturas de pantalla"
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Remettre le nom des captures d’écran"
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ripristina il nome degli screenshot"
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "スクリーンショットの名前を戻す"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "스크린샷 이름 되돌려 놓기"
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Zet de naam van schermafbeeldingen terug"
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Przywróć nazwę zrzutów ekranu"
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Colocar de volta o nome das capturas de tela"
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Puneți înapoi numele pentru capturi de ecran"
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Восстановить имя для снимков экрана"
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Lägg tillbaka namnet för skärmavbilder"
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ekran resmi adını yerine koy"
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Повернути назад назву знімків екрана"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "恢复原来的截屏名称"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "還原截圖名稱"
+ }
+ }
+ }
+ },
"Put back the settings saved for %@ on %@?" : {
"localizations" : {
"cs" : {
@@ -124489,6 +124807,112 @@
}
}
},
+ "That name is too long for a file name." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Tento název je pro název souboru příliš dlouhý."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Dieser Name ist für einen Dateinamen zu lang."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ese nombre es demasiado largo para un nombre de archivo."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ce nom est trop long pour un nom de fichier."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Questo nome è troppo lungo per il nome di un file."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "その名前はファイル名としては長すぎます。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "해당 이름은 파일 이름으로 사용하기에 너무 깁니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Die naam is te lang voor een bestandsnaam."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ta nazwa jest zbyt długa jak na nazwę pliku."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Esse nome é longo demais para um nome de arquivo."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Acest nume este prea lung pentru un nume de fișier."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Это имя слишком длинное для имени файла."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Det namnet är för långt för ett filnamn."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Bu ad, bir dosya adı için çok uzun."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ця назва задовга для назви файлу."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "该名称太长,无法用作文件名。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "這個名稱太長,無法用作檔案名稱。"
+ }
+ }
+ }
+ },
"That would hide too much from Peel. Choose the folders inside it that matter to you.\n\n%@" : {
"localizations" : {
"cs" : {
@@ -145552,6 +145976,112 @@
}
}
},
+ "What screenshots are named" : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Jak se jmenují snímky obrazovky"
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Wie Bildschirmfotos heißen"
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Cómo se llaman las capturas de pantalla"
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Nom des captures d’écran"
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Come vengono chiamati gli screenshot"
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "スクリーンショットの名前"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "스크린샷 이름"
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Hoe schermafbeeldingen heten"
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Jak są nazywane zrzuty ekranu"
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Como as capturas de tela são nomeadas"
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Cum sunt denumite capturile de ecran"
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Как называются снимки экрана"
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Vad skärmavbilder heter"
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ekran resimlerine verilen ad"
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Як називаються знімки екрана"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "截屏的名称"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "截圖的名稱"
+ }
+ }
+ }
+ },
"What stayed in the last removal is where it was, but it isn’t listed here." : {
"localizations" : {
"cs" : {
@@ -166624,6 +167154,112 @@
}
}
},
+ "macOS starts their names with Screenshot. Type another name to use instead." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Systém macOS začíná jejich názvy slovy „Snímek obrazovky“. Zadejte jiný název, který se použije místo nich."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS setzt „Bildschirmfoto“ an den Anfang ihrer Namen. Gib einen anderen Namen ein, der stattdessen verwendet wird."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS les pone nombres que empiezan por “Captura de pantalla”. Escribe otro nombre para usarlo en su lugar."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS commence leur nom par « Capture d’écran ». Saisissez un autre nom à utiliser à la place."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS fa iniziare il loro nome con Screenshot. Digita un altro nome da usare al suo posto."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOSは、スクリーンショットの名前を“スクリーンショット”で始めます。代わりに使う名前を入力してください。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS는 스크린샷 이름을 ‘스크린샷’으로 시작합니다. 대신 사용할 다른 이름을 입력하십시오."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS laat hun namen beginnen met 'Schermafbeelding'. Typ een andere naam om die in plaats daarvan te gebruiken."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS zaczyna ich nazwy od słów „Zrzut ekranu”. Wpisz inną nazwę, aby jej używać zamiast tych słów."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "O macOS começa o nome delas com “Captura de Tela”. Digite outro nome para usar no lugar."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS le dă nume care încep cu „Captură de ecran”. Introduceți alt nume care să fie folosit în schimb."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS начинает их имена со слов «Снимок экрана». Введите другое имя, чтобы использовать его вместо этих слов."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS börjar deras namn med Skärmavbild. Skriv ett annat namn att använda i stället."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS onların adlarını Ekran Resmi ile başlatır. Bunun yerine kullanılacak başka bir ad yazın."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS починає їхні назви словами «Знімок екрана». Введіть іншу назву, щоб використовувати її натомість."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS会让它们的名称以“截屏”开头。你可以键入其他名称来代替它。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS會以「截圖」作為截圖名稱的開頭。請輸入要改用的其他名稱。"
+ }
+ }
+ }
+ },
"macOS still counts this package as installed, but nothing it put on disk is left." : {
"localizations" : {
"cs" : {
diff --git a/Packages/PeelCore/Sources/PeelCore/Tweaks/ScreenshotName.swift b/Packages/PeelCore/Sources/PeelCore/Tweaks/ScreenshotName.swift
new file mode 100644
index 00000000..d1a4d58e
--- /dev/null
+++ b/Packages/PeelCore/Sources/PeelCore/Tweaks/ScreenshotName.swift
@@ -0,0 +1,23 @@
+import Foundation
+
+public enum ScreenshotName {
+ public enum Problem: Sendable, Equatable {
+ case separator
+ case hidden
+ case tooLong
+ }
+
+ static let longestName = 200
+
+ public static func problem(with name: String) -> Problem? {
+ if name.contains("/") || name.contains(":") { return .separator }
+ if name.hasPrefix(".") { return .hidden }
+ if name.utf8.count > longestName { return .tooLong }
+ return nil
+ }
+
+ public static var macOSDefault: String? {
+ Bundle(path: "/System/Library/CoreServices/screencaptureui.app")?
+ .localizedString(forKey: "Screenshot", value: nil, table: "Localizable")
+ }
+}
diff --git a/Packages/PeelCore/Sources/PeelCore/Tweaks/Tweak.swift b/Packages/PeelCore/Sources/PeelCore/Tweaks/Tweak.swift
index aade78e4..3beda08b 100644
--- a/Packages/PeelCore/Sources/PeelCore/Tweaks/Tweak.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Tweaks/Tweak.swift
@@ -15,6 +15,7 @@ public struct Tweak: Sendable, Hashable, Identifiable {
case aSwitchForThisAppAlone(Value)
/// A folder the user picks, written as an absolute path.
case folder
+ case name
}
public enum Restart: String, Sendable, Hashable {
@@ -60,12 +61,13 @@ public struct Tweak: Sendable, Hashable, Identifiable {
/// A tweak's current state, as read from the preferences.
public struct TweakState: Sendable, Hashable {
- /// True when the key holds the value this tweak writes. For a folder tweak, true when the key holds a path.
+ /// True when the key holds the value this tweak writes. For a folder or a name tweak, true when the key holds
+ /// a path or a name.
public let isOn: Bool
/// True when the value is managed, for example by a configuration profile, so Peel can't change it.
public let isManaged: Bool
- /// For a folder tweak, the path it holds.
- public let path: String?
+ /// For a folder tweak, the path it holds; for a name tweak, the name.
+ public let text: String?
- public static let unset = TweakState(isOn: false, isManaged: false, path: nil)
+ public static let unset = TweakState(isOn: false, isManaged: false, text: nil)
}
diff --git a/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakCatalog.swift b/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakCatalog.swift
index e528b3ca..61b6c560 100644
--- a/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakCatalog.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakCatalog.swift
@@ -129,6 +129,16 @@ public enum TweakCatalog {
hasASystemControl: false,
documentation: .undocumented
),
+ Tweak(
+ id: "screenshot-name",
+ domain: "com.apple.screencapture",
+ key: "name",
+ kind: .name,
+ restart: .none,
+ group: .screenshots,
+ hasASystemControl: false,
+ documentation: .undocumented
+ ),
Tweak(
id: "screenshot-jpg",
domain: "com.apple.screencapture",
diff --git a/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakLedger.swift b/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakLedger.swift
index 68ac53f9..e013e7f0 100644
--- a/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakLedger.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakLedger.swift
@@ -3,7 +3,7 @@ import Foundation
/// The reads and writes `TweakLedger` needs. `TweakStore` provides them through CFPreferences.
public protocol TweakStoring {
func storedValue(of tweak: Tweak) -> Any?
- func turnOn(_ tweak: Tweak, path: String?) -> Bool
+ func turnOn(_ tweak: Tweak, text: String?) -> Bool
/// Writes `value` back, or removes the key when there is none, which hands the setting back to macOS.
func restore(_ value: Any?, for tweak: Tweak) -> Bool
}
@@ -48,10 +48,10 @@ public struct TweakLedger {
}
}
- public mutating func turnOn(_ tweak: Tweak, path: String? = nil, in store: some TweakStoring) -> Outcome {
+ public mutating func turnOn(_ tweak: Tweak, text: String? = nil, in store: some TweakStoring) -> Outcome {
let before = store.storedValue(of: tweak)
let wasPeels = holdsPeelsChange(tweak, stored: before)
- guard store.turnOn(tweak, path: path) else { return .refused }
+ guard store.turnOn(tweak, text: text) else { return .refused }
let after = store.storedValue(of: tweak)
// A key that already held the value was not changed by Peel, so turning it off later removes the key,
// as for any setting made outside Peel.
@@ -102,7 +102,7 @@ public struct TweakLedger {
guard !state.isManaged else { return false }
switch tweak.kind {
case .aSwitch, .aSwitchForThisAppAlone: return state.isOn
- case .folder: return holdsPeelsChange(tweak, stored: state.path)
+ case .folder, .name: return holdsPeelsChange(tweak, stored: state.text)
}
}
diff --git a/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakStore.swift b/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakStore.swift
index e0c505d6..39a3750d 100644
--- a/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakStore.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakStore.swift
@@ -45,18 +45,18 @@ public struct TweakStore: Sendable, TweakStoring {
let isManaged = Self.isForced(key, in: tweak.domain)
let read = switch tweak.kind {
case .aSwitchForThisAppAlone: Self.copyStored(key, from: tweak.domain)
- case .aSwitch, .folder: Self.copy(key, from: tweak.domain)
+ case .aSwitch, .folder, .name: Self.copy(key, from: tweak.domain)
}
guard let current = read else {
- return TweakState(isOn: false, isManaged: isManaged, path: nil)
+ return TweakState(isOn: false, isManaged: isManaged, text: nil)
}
switch tweak.kind {
case .aSwitch(let wanted), .aSwitchForThisAppAlone(let wanted):
- return TweakState(isOn: Self.matches(current, wanted), isManaged: isManaged, path: nil)
- case .folder:
- let path = current as? String
- return TweakState(isOn: path?.isEmpty == false, isManaged: isManaged, path: path)
+ return TweakState(isOn: Self.matches(current, wanted), isManaged: isManaged, text: nil)
+ case .folder, .name:
+ let text = current as? String
+ return TweakState(isOn: text?.isEmpty == false, isManaged: isManaged, text: text)
}
}
@@ -83,12 +83,12 @@ public struct TweakStore: Sendable, TweakStoring {
write(value as CFPropertyList?, for: tweak)
}
- /// Writes the value that turns `tweak` on, or `path` for a folder tweak.
+ /// Writes the value that turns `tweak` on, or `text`, the path or the name, for a folder or a name tweak.
@discardableResult
- public func turnOn(_ tweak: Tweak, path: String? = nil) -> Bool {
+ public func turnOn(_ tweak: Tweak, text: String? = nil) -> Bool {
let value: CFPropertyList? = switch tweak.kind {
case .aSwitch(let wanted), .aSwitchForThisAppAlone(let wanted): Self.property(wanted)
- case .folder: path.map { $0 as CFString }
+ case .folder, .name: text.map { $0 as CFString }
}
guard let value else { return false }
return write(value, for: tweak)
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/ScreenshotNameTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/ScreenshotNameTests.swift
new file mode 100644
index 00000000..bb668ea3
--- /dev/null
+++ b/Packages/PeelCore/Tests/PeelCoreTests/ScreenshotNameTests.swift
@@ -0,0 +1,26 @@
+import Foundation
+@testable import PeelCore
+import Testing
+
+struct ScreenshotNameTests {
+ @Test func aNameIsAFileNameMacOSCanWriteAndShow() {
+ #expect(ScreenshotName.problem(with: "ss") == nil)
+ #expect(ScreenshotName.problem(with: "Captură de ecran") == nil)
+ #expect(ScreenshotName.problem(with: "a/b") == .separator)
+ #expect(ScreenshotName.problem(with: "a:b") == .separator)
+ #expect(ScreenshotName.problem(with: ".shot") == .hidden)
+ #expect(ScreenshotName.problem(with: String(repeating: "ă", count: 101)) == .tooLong)
+ #expect(ScreenshotName.problem(with: String(repeating: "a", count: 200)) == nil)
+ }
+
+ @Test func readsTheNameMacOSGivesScreenshots() throws {
+ let name = try #require(ScreenshotName.macOSDefault)
+ #expect(!name.isEmpty)
+ }
+
+ @Test func screenshotsCanBeGivenAName() throws {
+ let tweak = try #require(TweakCatalog.all.first { $0.domain == "com.apple.screencapture" && $0.key == "name" })
+ #expect(tweak.kind == .name)
+ #expect(tweak.group == .screenshots)
+ }
+}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/TweakLedgerTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/TweakLedgerTests.swift
index cc5655a4..368631f8 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/TweakLedgerTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/TweakLedgerTests.swift
@@ -9,9 +9,9 @@ private final class FakeStore: TweakStoring {
func storedValue(of tweak: Tweak) -> Any? { values[tweak.id] }
- func turnOn(_ tweak: Tweak, path: String?) -> Bool {
+ func turnOn(_ tweak: Tweak, text: String?) -> Bool {
guard !refusesWrites else { return false }
- values[tweak.id] = path ?? true
+ values[tweak.id] = text ?? true
return true
}
@@ -103,7 +103,7 @@ struct TweakLedgerTests {
var ledger = TweakLedger()
_ = ledger.turnOn(byPeel, in: store)
store.values[byHand.id] = true
- let on = TweakState(isOn: true, isManaged: false, path: nil)
+ let on = TweakState(isOn: true, isManaged: false, text: nil)
let unset = TweakState.unset
#expect(ledger.isOn(byPeel, state: on))
@@ -124,17 +124,30 @@ struct TweakLedgerTests {
@Test func turningAllOffLeavesWhatNoRowWouldChange() throws {
let folder = try #require(TweakCatalog.all.first { $0.kind == .folder })
let aSwitch = TweakCatalog.all[0]
- let chosenByHand = TweakState(isOn: true, isManaged: false, path: "/Users/me/Shots")
+ let chosenByHand = TweakState(isOn: true, isManaged: false, text: "/Users/me/Shots")
var ledger = TweakLedger()
#expect(!ledger.isOn(folder, state: chosenByHand))
- #expect(!ledger.isOn(aSwitch, state: TweakState(isOn: true, isManaged: true, path: nil)))
+ #expect(!ledger.isOn(aSwitch, state: TweakState(isOn: true, isManaged: true, text: nil)))
let store = FakeStore()
- _ = ledger.turnOn(folder, path: "/Users/me/Peel", in: store)
- #expect(ledger.isOn(folder, state: TweakState(isOn: true, isManaged: false, path: "/Users/me/Peel")))
+ _ = ledger.turnOn(folder, text: "/Users/me/Peel", in: store)
+ #expect(ledger.isOn(folder, state: TweakState(isOn: true, isManaged: false, text: "/Users/me/Peel")))
#expect(!ledger.isOn(folder, state: chosenByHand), "a folder chosen since is the person's")
}
+ @Test func aNamePutBackIsTheNameFromBefore() throws {
+ let name = try #require(TweakCatalog.all.first { $0.kind == .name })
+ let store = FakeStore()
+ store.values[name.id] = "ss"
+ var ledger = TweakLedger()
+
+ #expect(!ledger.isOn(name, state: TweakState(isOn: true, isManaged: false, text: "ss")))
+ #expect(ledger.turnOn(name, text: "shot", in: store) == .changed)
+ #expect(ledger.isOn(name, state: TweakState(isOn: true, isManaged: false, text: "shot")))
+ #expect(ledger.turnOff(name, in: store) == .changed)
+ #expect(store.values[name.id] as? String == "ss")
+ }
+
/// A key the person changed in macOS after Peel did holds their choice now, never written over with what was
/// there before Peel: the folder chosen later stays, and Peel forgets its change.
@Test func aChoiceMadeOutsidePeelSinceIsNeverWrittenOver() throws {
@@ -142,7 +155,7 @@ struct TweakLedgerTests {
let store = FakeStore()
store.values[folder.id] = "/Users/me/Old"
var ledger = TweakLedger()
- _ = ledger.turnOn(folder, path: "/Users/me/Peel", in: store)
+ _ = ledger.turnOn(folder, text: "/Users/me/Peel", in: store)
store.values[folder.id] = "/Users/me/New"
#expect(!ledger.holdsPeelsChange(folder, stored: store.values[folder.id]))
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/TweakTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/TweakTests.swift
index f5230b86..6783fd2c 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/TweakTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/TweakTests.swift
@@ -72,8 +72,8 @@ struct TweakTests {
switch tweak.kind {
case .aSwitch(let value), .aSwitchForThisAppAlone(let value):
#expect(TweakStore.matches(TweakStore.property(value), value), "\(tweak.id) does not read back as what it writes")
- case .folder:
- #expect(tweak.group == .screenshots, "\(tweak.id) is a folder somewhere unexpected")
+ case .folder, .name:
+ #expect(tweak.group == .screenshots, "\(tweak.id) is a folder or a name somewhere unexpected")
}
}
}
@@ -122,7 +122,7 @@ struct TweakTests {
// A tweak reads as on only when a value is stored for this user, a profile sets it, or it has a path.
for tweak in TweakCatalog.all {
let live = store.state(of: tweak)
- #expect(!live.isOn || live.isManaged || store.storedValue(of: tweak) != nil || live.path != nil, "\(tweak.id) reads as on with nothing stored")
+ #expect(!live.isOn || live.isManaged || store.storedValue(of: tweak) != nil || live.text != nil, "\(tweak.id) reads as on with nothing stored")
}
}
diff --git a/Peel/Model/TweakLibrary.swift b/Peel/Model/TweakLibrary.swift
index f33227cb..d5e7ee50 100644
--- a/Peel/Model/TweakLibrary.swift
+++ b/Peel/Model/TweakLibrary.swift
@@ -78,8 +78,12 @@ final class TweakLibrary {
Task { isOn ? await turnOn(tweak) : await reset(tweak) }
}
- func turnOn(_ tweak: Tweak, path: String? = nil) async {
- await finish(tweak, after: ledger.turnOn(tweak, path: path, in: store))
+ func turnOn(_ tweak: Tweak, text: String? = nil) async {
+ await finish(tweak, after: ledger.turnOn(tweak, text: text, in: store))
+ }
+
+ func rename(_ tweak: Tweak, to name: String) async {
+ name.isEmpty ? await reset(tweak) : await turnOn(tweak, text: name)
}
/// Turns `tweak` off. A setting Peel changed gets back the value it had before. A setting changed by hand
@@ -109,7 +113,7 @@ final class TweakLibrary {
guard FileManager.default.fileExists(atPath: path, isDirectory: &isDirectory), isDirectory.boolValue,
FileManager.default.isWritableFile(atPath: path)
else { return }
- await turnOn(tweak, path: path)
+ await turnOn(tweak, text: path)
}
/// The settings Peel could not write, so each row can say so instead of letting the switch spring back
diff --git a/Peel/Views/Tweaks/TweakDetailView.swift b/Peel/Views/Tweaks/TweakDetailView.swift
index 10ae7bcd..264b5be3 100644
--- a/Peel/Views/Tweaks/TweakDetailView.swift
+++ b/Peel/Views/Tweaks/TweakDetailView.swift
@@ -27,6 +27,7 @@ struct TweakDetailContent: View {
struct TweakRow: View {
@Environment(TweakLibrary.self) private var tweaks
let tweak: Tweak
+ @State private var nameProblem: ScreenshotName.Problem?
var body: some View {
let state = tweaks.state(of: tweak)
@@ -46,12 +47,17 @@ struct TweakRow: View {
)
}
// A folder tweak holds a path rather than on or off, so the path is the row's second line.
- if let path = state.path {
+ if tweak.kind == .folder, let path = state.text {
Text(verbatim: path)
.font(.caption.monospaced())
.foregroundStyle(.secondary)
.lineLimit(1)
.truncationMode(.middle)
+ } else if let nameProblem {
+ Text(nameProblem.message)
+ .font(.caption)
+ .foregroundStyle(Color.accentColor)
+ .fixedSize(horizontal: false, vertical: true)
} else if let restart = tweak.restart.note {
// Shown on the row, not only in the note: some switches restart Finder or the Dock at once,
// and the user should know that before using one.
@@ -147,6 +153,83 @@ struct TweakRow: View {
.accessibilityLabel(Text("Choose the folder for screenshots"))
}
.motion(value: tweaks.isChangedByPeel(tweak))
+ case .name:
+ Group {
+ if tweaks.isChangedByPeel(tweak) {
+ Button("Put Back") {
+ Task { await tweaks.reset(tweak) }
+ }
+ .buttonStyle(.bordered)
+ .controlSize(.small)
+ .disabled(state.isManaged)
+ .accessibilityLabel(Text("Put back the screenshot name"))
+ .transition(.opacity)
+ }
+ TweakNameField(tweak: tweak, state: state, problem: $nameProblem)
+ }
+ .motion(value: tweaks.isChangedByPeel(tweak))
+ }
+ }
+}
+
+private struct TweakNameField: View {
+ @Environment(TweakLibrary.self) private var tweaks
+ let tweak: Tweak
+ let state: TweakState
+ @Binding var problem: ScreenshotName.Problem?
+ @State private var draft: String?
+ @FocusState private var isFocused: Bool
+
+ var body: some View {
+ TextField(text: text, prompt: ScreenshotName.macOSDefault.map { Text(verbatim: $0) }) {
+ Text(tweak.words.title)
+ }
+ .labelsHidden()
+ .textFieldStyle(.roundedBorder)
+ .frame(width: 160)
+ .focused($isFocused)
+ .onSubmit(commit)
+ .onChange(of: isFocused) { _, focused in
+ if !focused { commit() }
+ }
+ .onDisappear(perform: commit)
+ .disabled(state.isManaged)
+ }
+
+ private var text: Binding<String> {
+ Binding(
+ get: { draft ?? state.text ?? "" },
+ set: {
+ draft = $0
+ problem = nil
+ }
+ )
+ }
+
+ private func commit() {
+ guard let draft else { return }
+ let name = draft.trimmingCharacters(in: .whitespaces)
+ guard name != state.text ?? "" else {
+ self.draft = nil
+ return
+ }
+ if let found = ScreenshotName.problem(with: name) {
+ problem = found
+ return
+ }
+ Task {
+ await tweaks.rename(tweak, to: name)
+ self.draft = nil
+ }
+ }
+}
+
+extension ScreenshotName.Problem {
+ var message: LocalizedStringResource {
+ switch self {
+ case .separator: "A name can’t have a slash or a colon in it."
+ case .hidden: "A name can’t start with a period, or the screenshots would be hidden."
+ case .tooLong: "That name is too long for a file name."
}
}
}
diff --git a/Peel/Views/Tweaks/TweakText.swift b/Peel/Views/Tweaks/TweakText.swift
index 74c8ec21..321ef747 100644
--- a/Peel/Views/Tweaks/TweakText.swift
+++ b/Peel/Views/Tweaks/TweakText.swift
@@ -76,6 +76,10 @@ extension Tweak {
title: "Screenshot names without the date",
detail: "The name leaves out the date and time."
),
+ "screenshot-name": Words(
+ title: "What screenshots are named",
+ detail: "macOS starts their names with Screenshot. Type another name to use instead."
+ ),
"screenshot-jpg": Words(
title: "Save screenshots as JPEG",
detail: "Smaller files than PNG, with slightly less detail."