Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7284568489 | ||
|
|
8d66e49e07 | ||
|
|
e253a966ab | ||
|
|
fa3e7b0a4a | ||
|
|
c52e68a9d5 | ||
|
|
3c55be174a | ||
|
|
d05bd735b5 | ||
|
|
74606e5046 |
+7
-1
@@ -2,10 +2,14 @@
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<!-- Identity invariants: CFBundleIdentifier stays ai.flowmaster.shotdeck and
|
||||
CFBundleExecutable stays Shotdeck. Changing either one invalidates the
|
||||
user's existing Screen Recording grant. CFBundleName is the user-facing
|
||||
product name only. -->
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>ai.flowmaster.shotdeck</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>Shotdeck</string>
|
||||
<string>Redline</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>Shotdeck</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
@@ -14,6 +18,8 @@
|
||||
<string>0.1.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>AppIcon</string>
|
||||
<key>LSUIElement</key>
|
||||
<true/>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Shotdeck
|
||||
# Redline
|
||||
|
||||
A macOS menu-bar app that captures a remembered screen region, builds a one-screenshot-per-page PDF, AirDrops it to an iPad for markup, then watches for the annotated file to come back.
|
||||
|
||||
@@ -18,5 +18,5 @@ The grant is bound to the bundle identifier `ai.flowmaster.shotdeck` plus the co
|
||||
```bash
|
||||
swift build && swift test
|
||||
./scripts/build-app.sh # signed .app for daily use
|
||||
open .build/Shotdeck.app
|
||||
open .build/Redline.app
|
||||
```
|
||||
|
||||
Binary file not shown.
@@ -1,5 +1,4 @@
|
||||
import AppKit
|
||||
import Carbon.HIToolbox
|
||||
import Foundation
|
||||
import Observation
|
||||
import SwiftUI
|
||||
@@ -37,6 +36,9 @@ public final class AppModel {
|
||||
public private(set) var outboxURL: URL
|
||||
/// Live watch folder; WP-4c updates this alongside `ReturnWatcher.updateWatchFolder`.
|
||||
public private(set) var watchFolderURL: URL
|
||||
/// Currently bound capture combo (the last one Carbon accepted, or the preferred load).
|
||||
private(set) var captureHotkey: HotkeyPreference
|
||||
var hotkeyDisplayString: String { captureHotkey.displayString }
|
||||
|
||||
let paths: AppSupportPaths
|
||||
let spool: SpoolStore
|
||||
@@ -80,6 +82,7 @@ public final class AppModel {
|
||||
self.watchFolderURL = folders.watch
|
||||
self.outboxDisplayName = folders.outbox.lastPathComponent
|
||||
self.watchFolderDisplayName = folders.watch.lastPathComponent
|
||||
self.captureHotkey = HotkeyPreference.load()
|
||||
}
|
||||
|
||||
// MARK: Seam mutators — the only way a WP-4b/4c extension changes state.
|
||||
@@ -146,16 +149,39 @@ public final class AppModel {
|
||||
setStatus((error as? ShotdeckError)?.errorDescription ?? "Could not watch the return folder.")
|
||||
}
|
||||
|
||||
let registered = hotkeys.register(
|
||||
let pref = HotkeyPreference.load()
|
||||
captureHotkey = pref
|
||||
if !bindCaptureHotkey(pref) {
|
||||
setStatus("\(pref.displayString) is already used by another app — capture only works from the menu.")
|
||||
}
|
||||
}
|
||||
|
||||
/// Unregisters `capture` and binds `HotkeyPreference.load()`. If Carbon rejects the new
|
||||
/// combo, restores the previous preference (UserDefaults + Carbon) so the old one keeps working.
|
||||
func reRegisterHotkey() {
|
||||
let previous = captureHotkey
|
||||
let next = HotkeyPreference.load()
|
||||
hotkeys.unregister(id: "capture")
|
||||
if bindCaptureHotkey(next) {
|
||||
captureHotkey = next
|
||||
return
|
||||
}
|
||||
setStatus("That combination is taken — pick another.")
|
||||
previous.save()
|
||||
if bindCaptureHotkey(previous) {
|
||||
captureHotkey = previous
|
||||
}
|
||||
}
|
||||
|
||||
@discardableResult
|
||||
private func bindCaptureHotkey(_ pref: HotkeyPreference) -> Bool {
|
||||
hotkeys.register(
|
||||
id: "capture",
|
||||
keyCode: UInt32(kVK_ANSI_2),
|
||||
modifiers: UInt32(optionKey | shiftKey)
|
||||
keyCode: pref.keyCode,
|
||||
modifiers: pref.modifiers
|
||||
) { [weak self] in
|
||||
Task { await self?.captureNow() }
|
||||
}
|
||||
if !registered {
|
||||
setStatus("⌥⇧2 is already used by another app — capture only works from the menu.")
|
||||
}
|
||||
}
|
||||
|
||||
public func captureNow() async {
|
||||
|
||||
@@ -0,0 +1,151 @@
|
||||
import AppKit
|
||||
import Carbon.HIToolbox
|
||||
import Foundation
|
||||
|
||||
/// User-chosen capture hotkey. `modifiers` are Carbon bits (`cmdKey`, `optionKey`,
|
||||
/// `shiftKey`, `controlKey`), matching `HotkeyCenter.register`.
|
||||
struct HotkeyPreference: Codable, Equatable, Sendable {
|
||||
var keyCode: UInt32
|
||||
var modifiers: UInt32
|
||||
|
||||
static let defaultsKey = "ai.flowmaster.shotdeck.hotkey"
|
||||
|
||||
/// ⌥⇧2 — kVK_ANSI_2 (19) with optionKey|shiftKey.
|
||||
static let `default` = HotkeyPreference(
|
||||
keyCode: 19,
|
||||
modifiers: UInt32(optionKey) | UInt32(shiftKey)
|
||||
)
|
||||
|
||||
static func load(defaults: UserDefaults = .standard) -> HotkeyPreference {
|
||||
guard let data = defaults.data(forKey: defaultsKey),
|
||||
let decoded = try? JSONDecoder().decode(HotkeyPreference.self, from: data),
|
||||
decoded.modifiers != 0
|
||||
else { return .default }
|
||||
return decoded
|
||||
}
|
||||
|
||||
func save(defaults: UserDefaults = .standard) {
|
||||
guard let data = try? JSONEncoder().encode(self) else { return }
|
||||
defaults.set(data, forKey: Self.defaultsKey)
|
||||
}
|
||||
|
||||
/// ⌘⌥⇧⌃ in that order, then a name for common keycodes.
|
||||
var displayString: String {
|
||||
var s = ""
|
||||
if modifiers & UInt32(cmdKey) != 0 { s += "⌘" }
|
||||
if modifiers & UInt32(optionKey) != 0 { s += "⌥" }
|
||||
if modifiers & UInt32(shiftKey) != 0 { s += "⇧" }
|
||||
if modifiers & UInt32(controlKey) != 0 { s += "⌃" }
|
||||
s += Self.keyName(for: keyCode)
|
||||
return s
|
||||
}
|
||||
|
||||
/// `nil` when the event is modifier-only or has no ⌘⌥⇧⌃ flags.
|
||||
static func fromKeyEvent(keyCode: UInt16, modifierFlags: NSEvent.ModifierFlags) -> HotkeyPreference? {
|
||||
switch Int(keyCode) {
|
||||
case kVK_Shift, kVK_RightShift,
|
||||
kVK_Command, kVK_RightCommand,
|
||||
kVK_Option, kVK_RightOption,
|
||||
kVK_Control, kVK_RightControl,
|
||||
kVK_CapsLock, kVK_Function:
|
||||
return nil
|
||||
default:
|
||||
break
|
||||
}
|
||||
var carbon: UInt32 = 0
|
||||
if modifierFlags.contains(.command) { carbon |= UInt32(cmdKey) }
|
||||
if modifierFlags.contains(.option) { carbon |= UInt32(optionKey) }
|
||||
if modifierFlags.contains(.shift) { carbon |= UInt32(shiftKey) }
|
||||
if modifierFlags.contains(.control) { carbon |= UInt32(controlKey) }
|
||||
guard carbon != 0 else { return nil }
|
||||
return HotkeyPreference(keyCode: UInt32(keyCode), modifiers: carbon)
|
||||
}
|
||||
|
||||
private static func keyName(for keyCode: UInt32) -> String {
|
||||
switch Int(keyCode) {
|
||||
case kVK_ANSI_A: return "A"
|
||||
case kVK_ANSI_B: return "B"
|
||||
case kVK_ANSI_C: return "C"
|
||||
case kVK_ANSI_D: return "D"
|
||||
case kVK_ANSI_E: return "E"
|
||||
case kVK_ANSI_F: return "F"
|
||||
case kVK_ANSI_G: return "G"
|
||||
case kVK_ANSI_H: return "H"
|
||||
case kVK_ANSI_I: return "I"
|
||||
case kVK_ANSI_J: return "J"
|
||||
case kVK_ANSI_K: return "K"
|
||||
case kVK_ANSI_L: return "L"
|
||||
case kVK_ANSI_M: return "M"
|
||||
case kVK_ANSI_N: return "N"
|
||||
case kVK_ANSI_O: return "O"
|
||||
case kVK_ANSI_P: return "P"
|
||||
case kVK_ANSI_Q: return "Q"
|
||||
case kVK_ANSI_R: return "R"
|
||||
case kVK_ANSI_S: return "S"
|
||||
case kVK_ANSI_T: return "T"
|
||||
case kVK_ANSI_U: return "U"
|
||||
case kVK_ANSI_V: return "V"
|
||||
case kVK_ANSI_W: return "W"
|
||||
case kVK_ANSI_X: return "X"
|
||||
case kVK_ANSI_Y: return "Y"
|
||||
case kVK_ANSI_Z: return "Z"
|
||||
case kVK_ANSI_0: return "0"
|
||||
case kVK_ANSI_1: return "1"
|
||||
case kVK_ANSI_2: return "2"
|
||||
case kVK_ANSI_3: return "3"
|
||||
case kVK_ANSI_4: return "4"
|
||||
case kVK_ANSI_5: return "5"
|
||||
case kVK_ANSI_6: return "6"
|
||||
case kVK_ANSI_7: return "7"
|
||||
case kVK_ANSI_8: return "8"
|
||||
case kVK_ANSI_9: return "9"
|
||||
case kVK_ANSI_Equal: return "="
|
||||
case kVK_ANSI_Minus: return "-"
|
||||
case kVK_ANSI_RightBracket: return "]"
|
||||
case kVK_ANSI_LeftBracket: return "["
|
||||
case kVK_ANSI_Quote: return "'"
|
||||
case kVK_ANSI_Semicolon: return ";"
|
||||
case kVK_ANSI_Backslash: return "\\"
|
||||
case kVK_ANSI_Comma: return ","
|
||||
case kVK_ANSI_Slash: return "/"
|
||||
case kVK_ANSI_Period: return "."
|
||||
case kVK_ANSI_Grave: return "`"
|
||||
case kVK_Space: return "Space"
|
||||
case kVK_Return: return "Return"
|
||||
case kVK_Tab: return "Tab"
|
||||
case kVK_Delete: return "Delete"
|
||||
case kVK_ForwardDelete: return "Fwd Delete"
|
||||
case kVK_Escape: return "Esc"
|
||||
case kVK_Home: return "Home"
|
||||
case kVK_End: return "End"
|
||||
case kVK_PageUp: return "Page Up"
|
||||
case kVK_PageDown: return "Page Down"
|
||||
case kVK_Help: return "Help"
|
||||
case kVK_LeftArrow: return "←"
|
||||
case kVK_RightArrow: return "→"
|
||||
case kVK_DownArrow: return "↓"
|
||||
case kVK_UpArrow: return "↑"
|
||||
case kVK_F1: return "F1"
|
||||
case kVK_F2: return "F2"
|
||||
case kVK_F3: return "F3"
|
||||
case kVK_F4: return "F4"
|
||||
case kVK_F5: return "F5"
|
||||
case kVK_F6: return "F6"
|
||||
case kVK_F7: return "F7"
|
||||
case kVK_F8: return "F8"
|
||||
case kVK_F9: return "F9"
|
||||
case kVK_F10: return "F10"
|
||||
case kVK_F11: return "F11"
|
||||
case kVK_F12: return "F12"
|
||||
case kVK_F13: return "F13"
|
||||
case kVK_F14: return "F14"
|
||||
case kVK_F15: return "F15"
|
||||
case kVK_F16: return "F16"
|
||||
case kVK_F17: return "F17"
|
||||
case kVK_F18: return "F18"
|
||||
case kVK_F19: return "F19"
|
||||
case kVK_F20: return "F20"
|
||||
default: return "Key \(keyCode)"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -49,7 +49,7 @@ struct MenuBarView: View {
|
||||
|
||||
private var defaultStatusText: String {
|
||||
guard let region = model.region else {
|
||||
return "No region yet — press ⌥⇧2 to pick one."
|
||||
return "No region yet — press \(model.hotkeyDisplayString) to pick one."
|
||||
}
|
||||
let w = Int(region.rect.width)
|
||||
let h = Int(region.rect.height)
|
||||
@@ -89,7 +89,7 @@ struct MenuBarView: View {
|
||||
Button {
|
||||
Task { await model.captureNow() }
|
||||
} label: {
|
||||
actionLabel("Capture now", trailing: "⌥⇧2")
|
||||
actionLabel("Capture now", trailing: model.hotkeyDisplayString)
|
||||
}
|
||||
.disabled(model.isCapturing)
|
||||
|
||||
@@ -128,7 +128,7 @@ struct MenuBarView: View {
|
||||
Button {
|
||||
NSApp.terminate(nil)
|
||||
} label: {
|
||||
actionLabel("Quit Shotdeck")
|
||||
actionLabel("Quit Redline")
|
||||
}
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
|
||||
@@ -18,7 +18,7 @@ extension AppModel: SendCapable {
|
||||
let finalURL = outboxDir.appendingPathComponent(fileName)
|
||||
// Same directory as the final target so the rename below is same-volume (atomic).
|
||||
let tempURL = outboxDir.appendingPathComponent(".shotdeck-\(UUID().uuidString).pdf")
|
||||
let title = "Shotdeck – \(DubaiTime.stamp(workingSession.createdAt))"
|
||||
let title = "Redline – \(DubaiTime.stamp(workingSession.createdAt))"
|
||||
|
||||
do {
|
||||
// D-13: build off the main actor. Only Sendable values cross into the
|
||||
|
||||
@@ -4,6 +4,8 @@ import ShotdeckCore
|
||||
|
||||
struct SettingsView: View {
|
||||
@Environment(AppModel.self) private var model
|
||||
@State private var isRecordingHotkey = false
|
||||
@State private var recorder = HotkeyRecorderBox()
|
||||
|
||||
private let labelWidth: CGFloat = 104
|
||||
|
||||
@@ -16,13 +18,19 @@ struct SettingsView: View {
|
||||
.gridCellColumns(2)
|
||||
}
|
||||
|
||||
GridRow(alignment: .firstTextBaseline) {
|
||||
GridRow(alignment: .center) {
|
||||
fieldLabel("Capture")
|
||||
Text("⌥⇧2 — fixed in this version")
|
||||
.foregroundStyle(.secondary)
|
||||
.lineLimit(1)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.frame(minHeight: 22, alignment: .leading)
|
||||
HStack(spacing: 8) {
|
||||
Button {
|
||||
armHotkeyRecorder()
|
||||
} label: {
|
||||
Text(isRecordingHotkey ? "Press keys…" : model.hotkeyDisplayString)
|
||||
.foregroundStyle(isRecordingHotkey ? .secondary : .primary)
|
||||
.lineLimit(1)
|
||||
}
|
||||
Spacer(minLength: 0)
|
||||
}
|
||||
.frame(minHeight: 22)
|
||||
}
|
||||
|
||||
GridRow {
|
||||
@@ -57,6 +65,35 @@ struct SettingsView: View {
|
||||
.padding(16)
|
||||
.frame(minWidth: 320, idealWidth: 360, maxWidth: 360, alignment: .leading)
|
||||
.controlSize(.small)
|
||||
.onDisappear { disarmHotkeyRecorder() }
|
||||
}
|
||||
|
||||
private func armHotkeyRecorder() {
|
||||
guard !isRecordingHotkey else { return }
|
||||
isRecordingHotkey = true
|
||||
recorder.onKey = { keyCode, flags in
|
||||
handleRecorderKey(keyCode: keyCode, flags: flags)
|
||||
}
|
||||
recorder.arm()
|
||||
}
|
||||
|
||||
private func handleRecorderKey(keyCode: UInt16, flags: NSEvent.ModifierFlags) {
|
||||
if keyCode == 53 { // kVK_Escape
|
||||
disarmHotkeyRecorder()
|
||||
return
|
||||
}
|
||||
guard let pref = HotkeyPreference.fromKeyEvent(keyCode: keyCode, modifierFlags: flags) else {
|
||||
return
|
||||
}
|
||||
pref.save()
|
||||
model.reRegisterHotkey()
|
||||
disarmHotkeyRecorder()
|
||||
}
|
||||
|
||||
private func disarmHotkeyRecorder() {
|
||||
recorder.disarm()
|
||||
recorder.onKey = nil
|
||||
isRecordingHotkey = false
|
||||
}
|
||||
|
||||
private func fieldLabel(_ title: String) -> some View {
|
||||
@@ -80,6 +117,35 @@ struct SettingsView: View {
|
||||
}
|
||||
}
|
||||
|
||||
/// Local keyDown monitor for the Settings capture-hotkey recorder. Callbacks hop onto the
|
||||
/// main actor the same way `RegionPickerController` does — local monitors fire on the
|
||||
/// main run loop during `NSApp.sendEvent`.
|
||||
@MainActor
|
||||
private final class HotkeyRecorderBox {
|
||||
var onKey: ((UInt16, NSEvent.ModifierFlags) -> Void)?
|
||||
private var monitor: Any?
|
||||
|
||||
func arm() {
|
||||
disarm()
|
||||
monitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in
|
||||
guard let self else { return event }
|
||||
let keyCode = event.keyCode
|
||||
let rawFlags = event.modifierFlags.rawValue
|
||||
MainActor.assumeIsolated {
|
||||
self.onKey?(keyCode, NSEvent.ModifierFlags(rawValue: rawFlags))
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func disarm() {
|
||||
if let monitor {
|
||||
NSEvent.removeMonitor(monitor)
|
||||
}
|
||||
monitor = nil
|
||||
}
|
||||
}
|
||||
|
||||
extension AppModel: SettingsWindowPresenting {
|
||||
private static var settingsWindowController: NSWindowController?
|
||||
|
||||
@@ -91,7 +157,7 @@ extension AppModel: SettingsWindowPresenting {
|
||||
}
|
||||
let hosting = NSHostingController(rootView: SettingsView().environment(self))
|
||||
let window = NSWindow(contentViewController: hosting)
|
||||
window.title = "Shotdeck Settings"
|
||||
window.title = "Redline Settings"
|
||||
window.styleMask = [.titled, .closable]
|
||||
window.isReleasedWhenClosed = false
|
||||
window.center()
|
||||
|
||||
@@ -27,7 +27,7 @@ struct ShotdeckApp: App {
|
||||
Text(count).font(.system(size: 11, weight: .semibold))
|
||||
}
|
||||
}
|
||||
.accessibilityLabel("Shotdeck")
|
||||
.accessibilityLabel("Redline")
|
||||
}
|
||||
.menuBarExtraStyle(.window)
|
||||
}
|
||||
@@ -60,7 +60,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
// Safe: temp-dir creation for a path this process controls cannot legitimately fail.
|
||||
let fallback = try! AppSupportPaths(root: fallbackRoot, outbox: tmp, watchFolder: tmp)
|
||||
let model = try! makeModel(paths: fallback)
|
||||
model.setStatus("Shotdeck could not access its storage folder. Captures will not persist.")
|
||||
model.setStatus("Redline could not access its storage folder. Captures will not persist.")
|
||||
return model
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ public enum ShotdeckError: Error, LocalizedError, Sendable {
|
||||
case .screenRecordingNotGranted:
|
||||
return "Screen Recording is turned off. Grant it in System Settings to capture."
|
||||
case .noRegionRemembered:
|
||||
return "No capture region is set. Choose 'Re-select area' from the Shotdeck menu."
|
||||
return "No capture region is set. Choose 'Re-select area' from the Redline menu."
|
||||
case .displayNoLongerConnected:
|
||||
return "The display used for capture is no longer connected."
|
||||
case .captureFailed(let underlying):
|
||||
|
||||
@@ -71,7 +71,7 @@ public struct PDFComposer: Sendable {
|
||||
}
|
||||
|
||||
public static func fileName(for session: CaptureSession) -> String {
|
||||
"Shotdeck-\(DubaiTime.fileStamp(session.createdAt)).pdf"
|
||||
"Redline-\(DubaiTime.fileStamp(session.createdAt)).pdf"
|
||||
}
|
||||
|
||||
private static func writePDF(
|
||||
@@ -86,7 +86,7 @@ public struct PDFComposer: Sendable {
|
||||
}
|
||||
|
||||
let auxiliaryInfo: [String: Any] = [
|
||||
kCGPDFContextCreator as String: "Shotdeck",
|
||||
kCGPDFContextCreator as String: "Redline",
|
||||
kCGPDFContextTitle as String: title,
|
||||
kCGPDFContextSubject as String: sessionID.uuidString.lowercased(),
|
||||
]
|
||||
|
||||
@@ -93,16 +93,19 @@ public enum AnnotationInspector {
|
||||
)
|
||||
}
|
||||
|
||||
/// True when this PDF was produced by Shotdeck. Creator attribute is authoritative;
|
||||
/// True when this PDF was produced by this app. Creator attribute is authoritative;
|
||||
/// the filename fallback applies ONLY when the creator attribute is absent.
|
||||
/// Accepts both the current product name ("Redline") and the legacy name ("Shotdeck")
|
||||
/// so PDFs already on the iPad or in Downloads are still detected.
|
||||
public static func isShotdeckDocument(_ document: PDFDocument) -> Bool {
|
||||
if let creator = document.documentAttributes?[PDFDocumentAttribute.creatorAttribute] as? String {
|
||||
return creator == "Shotdeck" // present creator is authoritative, full stop
|
||||
// Present creator is authoritative, full stop.
|
||||
return creator == "Redline" || creator == "Shotdeck"
|
||||
}
|
||||
// Creator ABSENT (some apps rewrite metadata on save) -> filename fallback only here.
|
||||
guard let name = document.documentURL?.lastPathComponent else { return false }
|
||||
// .lastPathComponent on a file URL is already percent-decoded; do not use .absoluteString.
|
||||
return name.wholeMatch(of: /^Shotdeck-\d{8}-\d{6}( \d+)?\.pdf$/) != nil
|
||||
return name.wholeMatch(of: /^(Redline|Shotdeck)-\d{8}-\d{6}( \d+)?\.pdf$/) != nil
|
||||
// Case-sensitive by construction (Swift Regex literals are case-sensitive by default).
|
||||
// The optional "( \d+)?" is macOS's duplicate-name suffix AirDrop adds when a file of
|
||||
// the same name already exists in the watch folder — the normal case for a return.
|
||||
|
||||
@@ -60,7 +60,7 @@ public actor ReturnWatcher {
|
||||
}
|
||||
|
||||
/// Scans the watch folder once, immediately, without waiting for an event. Every
|
||||
/// recognized, stable, openable Shotdeck PDF present is (re-)inspected and (re-)recorded
|
||||
/// recognized, stable, openable Redline/Shotdeck PDF present is (re-)inspected and (re-)recorded
|
||||
/// into the ledger; returns exactly the documents processed in this call.
|
||||
@discardableResult
|
||||
public func scanNow() async throws -> [ReturnedDocument] {
|
||||
|
||||
@@ -371,6 +371,72 @@ func i19b_presentNonShotdeckCreatorBeatsMatchingFilename() throws {
|
||||
#expect(AnnotationInspector.isShotdeckDocument(reopened) == false)
|
||||
}
|
||||
|
||||
@Test("I-19c Present Redline creator is recognized")
|
||||
func i19c_presentRedlineCreatorIsRecognized() throws {
|
||||
let (paths, cleanup) = try makeCasePaths()
|
||||
defer { try? FileManager.default.removeItem(at: cleanup) }
|
||||
|
||||
let pdfURL = paths.watchFolder.appendingPathComponent("Redline-20260830-134219.pdf")
|
||||
try makePDF(at: pdfURL, pageCount: 1, creator: "Redline")
|
||||
let reopened = try #require(PDFDocument(url: pdfURL))
|
||||
#expect(AnnotationInspector.isShotdeckDocument(reopened) == true)
|
||||
}
|
||||
|
||||
@Test("I-19d Present legacy Shotdeck creator is still recognized")
|
||||
func i19d_presentLegacyShotdeckCreatorIsStillRecognized() throws {
|
||||
let (paths, cleanup) = try makeCasePaths()
|
||||
defer { try? FileManager.default.removeItem(at: cleanup) }
|
||||
|
||||
let pdfURL = paths.watchFolder.appendingPathComponent("Shotdeck-20260830-134220.pdf")
|
||||
try makePDF(at: pdfURL, pageCount: 1, creator: "Shotdeck")
|
||||
let reopened = try #require(PDFDocument(url: pdfURL))
|
||||
#expect(AnnotationInspector.isShotdeckDocument(reopened) == true)
|
||||
}
|
||||
|
||||
@Test("I-19e Absent creator falls back to Redline filename")
|
||||
func i19e_absentCreatorFallsBackToRedlineFilename() throws {
|
||||
let (paths, cleanup) = try makeCasePaths()
|
||||
defer { try? FileManager.default.removeItem(at: cleanup) }
|
||||
|
||||
let pdfURL = paths.watchFolder.appendingPathComponent("Redline-20260830-134221.pdf")
|
||||
try makePDF(at: pdfURL, pageCount: 1, creator: nil)
|
||||
let reopened = try #require(PDFDocument(url: pdfURL))
|
||||
#expect(AnnotationInspector.isShotdeckDocument(reopened) == true)
|
||||
}
|
||||
|
||||
@Test("I-19f Absent creator falls back to legacy Shotdeck filename")
|
||||
func i19f_absentCreatorFallsBackToLegacyShotdeckFilename() throws {
|
||||
let (paths, cleanup) = try makeCasePaths()
|
||||
defer { try? FileManager.default.removeItem(at: cleanup) }
|
||||
|
||||
let pdfURL = paths.watchFolder.appendingPathComponent("Shotdeck-20260830-134222.pdf")
|
||||
try makePDF(at: pdfURL, pageCount: 1, creator: nil)
|
||||
let reopened = try #require(PDFDocument(url: pdfURL))
|
||||
#expect(AnnotationInspector.isShotdeckDocument(reopened) == true)
|
||||
}
|
||||
|
||||
@Test("I-19g Absent creator falls back to Redline duplicate-name suffix")
|
||||
func i19g_absentCreatorFallsBackToRedlineDuplicateNameSuffix() throws {
|
||||
let (paths, cleanup) = try makeCasePaths()
|
||||
defer { try? FileManager.default.removeItem(at: cleanup) }
|
||||
|
||||
let pdfURL = paths.watchFolder.appendingPathComponent("Redline-20260830-134223 2.pdf")
|
||||
try makePDF(at: pdfURL, pageCount: 1, creator: nil)
|
||||
let reopened = try #require(PDFDocument(url: pdfURL))
|
||||
#expect(AnnotationInspector.isShotdeckDocument(reopened) == true)
|
||||
}
|
||||
|
||||
@Test("I-19h Present non-product creator beats a matching Redline filename")
|
||||
func i19h_presentNonProductCreatorBeatsMatchingRedlineFilename() throws {
|
||||
let (paths, cleanup) = try makeCasePaths()
|
||||
defer { try? FileManager.default.removeItem(at: cleanup) }
|
||||
|
||||
let pdfURL = paths.watchFolder.appendingPathComponent("Redline-20260830-134224.pdf")
|
||||
try makePDF(at: pdfURL, pageCount: 1, creator: "Preview")
|
||||
let reopened = try #require(PDFDocument(url: pdfURL))
|
||||
#expect(AnnotationInspector.isShotdeckDocument(reopened) == false)
|
||||
}
|
||||
|
||||
private func expectSinglePageMark(
|
||||
_ subtype: PDFAnnotationSubtype,
|
||||
bounds: CGRect,
|
||||
|
||||
@@ -499,7 +499,7 @@ func documentAttributesRoundTrip() throws {
|
||||
)
|
||||
let document = try openDocument(output)
|
||||
let attributes = try #require(document.documentAttributes)
|
||||
#expect(attributes[PDFDocumentAttribute.creatorAttribute] as? String == "Shotdeck")
|
||||
#expect(attributes[PDFDocumentAttribute.creatorAttribute] as? String == "Redline")
|
||||
#expect(attributes[PDFDocumentAttribute.titleAttribute] as? String == "Ben review — 2026-08-30")
|
||||
#expect(attributes[PDFDocumentAttribute.subjectAttribute] as? String == "deadbeef-dead-4eef-8ead-deadbeef0001")
|
||||
#expect(document.pageCount == 1)
|
||||
|
||||
@@ -109,6 +109,65 @@ func w25_duplicateNameSuffixIsRecognizedByScanNow() async throws {
|
||||
#expect(commented[0].fileURL.resolvingSymlinksInPath().path == pdfURL.resolvingSymlinksInPath().path)
|
||||
}
|
||||
|
||||
@Test("W-25b Redline duplicate-name suffix is the normal AirDrop return (scanNow)")
|
||||
func w25b_redlineDuplicateNameSuffixIsRecognizedByScanNow() async throws {
|
||||
let (paths, cleanup) = try makeCasePaths()
|
||||
defer { try? FileManager.default.removeItem(at: cleanup) }
|
||||
|
||||
let ledger = try ReturnLedger(paths: paths)
|
||||
let watcher = ReturnWatcher(paths: paths, ledger: ledger)
|
||||
let pdfURL = paths.watchFolder.appendingPathComponent("Redline-20260830-134205 2.pdf")
|
||||
|
||||
try makePDF(
|
||||
at: pdfURL,
|
||||
pageCount: 1,
|
||||
creator: nil,
|
||||
subject: "44444444-4444-4444-4444-444444444444",
|
||||
annotations: [(page: 0, annotation: makeAnnotation(
|
||||
.ink, bounds: CGRect(x: 100, y: 100, width: 120, height: 50)
|
||||
))]
|
||||
)
|
||||
|
||||
let found = try await watcher.scanNow()
|
||||
#expect(found.count == 1)
|
||||
let doc = try #require(found.first)
|
||||
#expect(doc.fileURL.lastPathComponent == "Redline-20260830-134205 2.pdf")
|
||||
#expect(doc.fileURL.resolvingSymlinksInPath().path == pdfURL.resolvingSymlinksInPath().path)
|
||||
#expect(doc.pageCount == 1)
|
||||
#expect(doc.annotatedPages == [1])
|
||||
#expect(doc.isCommented == true)
|
||||
|
||||
let commented = try await ledger.commented()
|
||||
#expect(commented.count == 1)
|
||||
#expect(commented[0].fileURL.lastPathComponent == pdfURL.lastPathComponent)
|
||||
#expect(commented[0].fileURL.resolvingSymlinksInPath().path == pdfURL.resolvingSymlinksInPath().path)
|
||||
}
|
||||
|
||||
@Test("W-25c Redline creator is recognized by scanNow")
|
||||
func w25c_redlineCreatorIsRecognizedByScanNow() async throws {
|
||||
let (paths, cleanup) = try makeCasePaths()
|
||||
defer { try? FileManager.default.removeItem(at: cleanup) }
|
||||
|
||||
let ledger = try ReturnLedger(paths: paths)
|
||||
let watcher = ReturnWatcher(paths: paths, ledger: ledger)
|
||||
let pdfURL = paths.watchFolder.appendingPathComponent("Redline-20260830-134230.pdf")
|
||||
|
||||
try makePDF(
|
||||
at: pdfURL,
|
||||
pageCount: 1,
|
||||
creator: "Redline",
|
||||
annotations: [(page: 0, annotation: makeAnnotation(
|
||||
.ink, bounds: CGRect(x: 100, y: 100, width: 120, height: 50)
|
||||
))]
|
||||
)
|
||||
|
||||
let found = try await watcher.scanNow()
|
||||
#expect(found.count == 1)
|
||||
let doc = try #require(found.first)
|
||||
#expect(doc.fileURL.lastPathComponent == "Redline-20260830-134230.pdf")
|
||||
#expect(doc.isCommented == true)
|
||||
}
|
||||
|
||||
@Test("W-26 Creator provenance negative at the scan level")
|
||||
func w26_presentNonShotdeckCreatorIsIgnoredByScanNow() async throws {
|
||||
let (paths, cleanup) = try makeCasePaths()
|
||||
|
||||
@@ -11,7 +11,7 @@ cd "$ROOT"
|
||||
|
||||
IDENTITY="Apple Development: ben@flow-master.ai (QH2H9G2LK5)"
|
||||
BUNDLE_ID="ai.flowmaster.shotdeck"
|
||||
APP_BUNDLE="${ROOT}/.build/Shotdeck.app"
|
||||
APP_BUNDLE="${ROOT}/.build/Redline.app"
|
||||
|
||||
SKIP_SIGN=0
|
||||
for arg in "$@"; do
|
||||
@@ -27,7 +27,7 @@ for arg in "$@"; do
|
||||
esac
|
||||
done
|
||||
|
||||
echo "==> Building Shotdeck (release)"
|
||||
echo "==> Building Redline (release)"
|
||||
swift build -c release --product Shotdeck
|
||||
|
||||
BIN_PATH="$(swift build -c release --product Shotdeck --show-bin-path)/Shotdeck"
|
||||
@@ -43,6 +43,7 @@ mkdir -p "${APP_BUNDLE}/Contents/Resources"
|
||||
cp "${BIN_PATH}" "${APP_BUNDLE}/Contents/MacOS/Shotdeck"
|
||||
chmod +x "${APP_BUNDLE}/Contents/MacOS/Shotdeck"
|
||||
cp "${ROOT}/Info.plist" "${APP_BUNDLE}/Contents/Info.plist"
|
||||
cp "${ROOT}/Resources/AppIcon.icns" "${APP_BUNDLE}/Contents/Resources/AppIcon.icns"
|
||||
|
||||
if [[ "${SKIP_SIGN}" -eq 1 ]]; then
|
||||
echo
|
||||
|
||||
+8
-8
@@ -4,9 +4,9 @@ set -euo pipefail
|
||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$ROOT"
|
||||
|
||||
APP_BUNDLE="${ROOT}/.build/Shotdeck.app"
|
||||
APP_BUNDLE="${ROOT}/.build/Redline.app"
|
||||
STAGING="${ROOT}/.build/dmg-staging"
|
||||
DMG="${ROOT}/.build/Shotdeck.dmg"
|
||||
DMG="${ROOT}/.build/Redline.dmg"
|
||||
MOUNT_POINT="${ROOT}/.build/dmg-mnt"
|
||||
|
||||
SKIP_SIGN=0
|
||||
@@ -23,7 +23,7 @@ for arg in "$@"; do
|
||||
esac
|
||||
done
|
||||
|
||||
echo "==> Building Shotdeck.app"
|
||||
echo "==> Building Redline.app"
|
||||
if [[ "${SKIP_SIGN}" -eq 1 ]]; then
|
||||
./scripts/build-app.sh --skip-sign
|
||||
else
|
||||
@@ -38,12 +38,12 @@ fi
|
||||
echo "==> Staging DMG contents"
|
||||
rm -rf "${STAGING}"
|
||||
mkdir -p "${STAGING}"
|
||||
ditto "${APP_BUNDLE}" "${STAGING}/Shotdeck.app"
|
||||
ditto "${APP_BUNDLE}" "${STAGING}/Redline.app"
|
||||
ln -s /Applications "${STAGING}/Applications"
|
||||
|
||||
echo "==> Creating ${DMG}"
|
||||
mkdir -p "$(dirname "${DMG}")"
|
||||
hdiutil create -volname "Shotdeck" -srcfolder "${STAGING}" -ov -format UDZO "${DMG}"
|
||||
hdiutil create -volname "Redline" -srcfolder "${STAGING}" -ov -format UDZO "${DMG}"
|
||||
|
||||
MOUNTED=0
|
||||
detach_dmg() {
|
||||
@@ -67,8 +67,8 @@ MOUNTED=1
|
||||
echo "==> Mount contents"
|
||||
ls -la "${MOUNT_POINT}"
|
||||
|
||||
if [[ ! -d "${MOUNT_POINT}/Shotdeck.app" ]]; then
|
||||
echo "Verification failed: Shotdeck.app missing from mounted DMG" >&2
|
||||
if [[ ! -d "${MOUNT_POINT}/Redline.app" ]]; then
|
||||
echo "Verification failed: Redline.app missing from mounted DMG" >&2
|
||||
exit 1
|
||||
fi
|
||||
if [[ ! -L "${MOUNT_POINT}/Applications" ]]; then
|
||||
@@ -81,7 +81,7 @@ if [[ "$(readlink "${MOUNT_POINT}/Applications")" != "/Applications" ]]; then
|
||||
fi
|
||||
|
||||
echo "==> codesign --verify --deep"
|
||||
codesign --verify --deep --verbose=2 "${MOUNT_POINT}/Shotdeck.app"
|
||||
codesign --verify --deep --verbose=2 "${MOUNT_POINT}/Redline.app"
|
||||
|
||||
echo "==> Detaching ${MOUNT_POINT}"
|
||||
hdiutil detach "${MOUNT_POINT}"
|
||||
|
||||
@@ -0,0 +1,324 @@
|
||||
#!/usr/bin/env swift
|
||||
import Foundation
|
||||
import CoreGraphics
|
||||
import ImageIO
|
||||
|
||||
// Programmatic Redline app icon.
|
||||
// Draws a 1024×1024 master, writes AppIcon.iconset (16…1024 incl. @2x),
|
||||
// and compiles Resources/AppIcon.icns via iconutil.
|
||||
//
|
||||
// Usage:
|
||||
// swift scripts/make-icon.swift
|
||||
// swift scripts/make-icon.swift --preview /path/to/icon-512.png
|
||||
|
||||
private let masterSize = 1024
|
||||
|
||||
private enum Palette {
|
||||
static let charcoalTop = CGColor(srgbRed: 44.0 / 255.0, green: 44.0 / 255.0, blue: 46.0 / 255.0, alpha: 1)
|
||||
static let charcoalBottom = CGColor(srgbRed: 28.0 / 255.0, green: 28.0 / 255.0, blue: 30.0 / 255.0, alpha: 1) // #1C1C1E
|
||||
static let white = CGColor(srgbRed: 1, green: 1, blue: 1, alpha: 1)
|
||||
static let redline = CGColor(srgbRed: 229.0 / 255.0, green: 72.0 / 255.0, blue: 63.0 / 255.0, alpha: 1) // #E5483F
|
||||
}
|
||||
|
||||
private struct IconsetEntry {
|
||||
let filename: String
|
||||
let pixels: Int
|
||||
}
|
||||
|
||||
private let iconsetEntries: [IconsetEntry] = [
|
||||
IconsetEntry(filename: "icon_16x16.png", pixels: 16),
|
||||
IconsetEntry(filename: "icon_16x16@2x.png", pixels: 32),
|
||||
IconsetEntry(filename: "icon_32x32.png", pixels: 32),
|
||||
IconsetEntry(filename: "icon_32x32@2x.png", pixels: 64),
|
||||
IconsetEntry(filename: "icon_128x128.png", pixels: 128),
|
||||
IconsetEntry(filename: "icon_128x128@2x.png", pixels: 256),
|
||||
IconsetEntry(filename: "icon_256x256.png", pixels: 256),
|
||||
IconsetEntry(filename: "icon_256x256@2x.png", pixels: 512),
|
||||
IconsetEntry(filename: "icon_512x512.png", pixels: 512),
|
||||
IconsetEntry(filename: "icon_512x512@2x.png", pixels: 1024),
|
||||
]
|
||||
|
||||
// MARK: - Geometry
|
||||
|
||||
/// Apple-style continuous-corner rounded square (squircle-like).
|
||||
/// Superellipse |x/a|^n + |y/b|^n = 1 with n≈5, inset 1px so antialiased
|
||||
/// edge pixels are not clipped by the bitmap.
|
||||
private func continuousRoundedSquare(size: CGFloat, exponent n: CGFloat = 5.0, segments: Int = 256) -> CGPath {
|
||||
let inset: CGFloat = 1
|
||||
let a = (size - inset * 2) / 2
|
||||
let cx = size / 2
|
||||
let cy = size / 2
|
||||
let twoOverN = 2 / n
|
||||
let path = CGMutablePath()
|
||||
for i in 0...segments {
|
||||
let theta = CGFloat(i) / CGFloat(segments) * 2 * .pi
|
||||
let ct = cos(theta)
|
||||
let st = sin(theta)
|
||||
let x = cx + (ct < 0 ? -1 : 1) * pow(abs(ct), twoOverN) * a
|
||||
let y = cy + (st < 0 ? -1 : 1) * pow(abs(st), twoOverN) * a
|
||||
if i == 0 {
|
||||
path.move(to: CGPoint(x: x, y: y))
|
||||
} else {
|
||||
path.addLine(to: CGPoint(x: x, y: y))
|
||||
}
|
||||
}
|
||||
path.closeSubpath()
|
||||
return path
|
||||
}
|
||||
|
||||
// MARK: - Drawing
|
||||
|
||||
private func drawMasterIcon(size: Int) -> CGImage {
|
||||
let s = CGFloat(size)
|
||||
let colorSpace = CGColorSpace(name: CGColorSpace.sRGB)!
|
||||
let bitmapInfo = CGBitmapInfo.byteOrder32Big.rawValue | CGImageAlphaInfo.premultipliedLast.rawValue
|
||||
guard let ctx = CGContext(
|
||||
data: nil,
|
||||
width: size,
|
||||
height: size,
|
||||
bitsPerComponent: 8,
|
||||
bytesPerRow: 0,
|
||||
space: colorSpace,
|
||||
bitmapInfo: bitmapInfo
|
||||
) else {
|
||||
fputs("error: failed to create \(size)×\(size) bitmap context\n", stderr)
|
||||
exit(1)
|
||||
}
|
||||
|
||||
ctx.setShouldAntialias(true)
|
||||
ctx.setAllowsAntialiasing(true)
|
||||
ctx.interpolationQuality = .high
|
||||
|
||||
// Flip to top-left origin so "top-to-bottom gradient" is literal.
|
||||
ctx.translateBy(x: 0, y: s)
|
||||
ctx.scaleBy(x: 1, y: -1)
|
||||
|
||||
ctx.clear(CGRect(x: 0, y: 0, width: s, height: s))
|
||||
|
||||
let squircle = continuousRoundedSquare(size: s)
|
||||
|
||||
ctx.saveGState()
|
||||
ctx.addPath(squircle)
|
||||
ctx.clip()
|
||||
|
||||
let gradient = CGGradient(
|
||||
colorsSpace: colorSpace,
|
||||
colors: [Palette.charcoalTop, Palette.charcoalBottom] as CFArray,
|
||||
locations: [0, 1]
|
||||
)!
|
||||
ctx.drawLinearGradient(
|
||||
gradient,
|
||||
start: CGPoint(x: s / 2, y: 0),
|
||||
end: CGPoint(x: s / 2, y: s),
|
||||
options: [.drawsBeforeStartLocation, .drawsAfterEndLocation]
|
||||
)
|
||||
ctx.restoreGState()
|
||||
|
||||
// Viewfinder corner brackets: thick L-strokes, rounded caps/joins, inset ~18%.
|
||||
let inset = s * 0.18
|
||||
let bracketWidth = s * 0.095
|
||||
let arm = s * 0.155
|
||||
let centerline = inset + bracketWidth / 2
|
||||
|
||||
ctx.saveGState()
|
||||
ctx.addPath(squircle)
|
||||
ctx.clip()
|
||||
ctx.setStrokeColor(Palette.white)
|
||||
ctx.setLineWidth(bracketWidth)
|
||||
ctx.setLineCap(.round)
|
||||
ctx.setLineJoin(.round)
|
||||
|
||||
func strokeBracket(cornerX: CGFloat, cornerY: CGFloat, dirX: CGFloat, dirY: CGFloat) {
|
||||
let path = CGMutablePath()
|
||||
path.move(to: CGPoint(x: cornerX + dirX * arm, y: cornerY))
|
||||
path.addLine(to: CGPoint(x: cornerX, y: cornerY))
|
||||
path.addLine(to: CGPoint(x: cornerX, y: cornerY + dirY * arm))
|
||||
ctx.addPath(path)
|
||||
ctx.strokePath()
|
||||
}
|
||||
|
||||
// Top-left, top-right, bottom-left, bottom-right.
|
||||
strokeBracket(cornerX: centerline, cornerY: centerline, dirX: 1, dirY: 1)
|
||||
strokeBracket(cornerX: s - centerline, cornerY: centerline, dirX: -1, dirY: 1)
|
||||
strokeBracket(cornerX: centerline, cornerY: s - centerline, dirX: 1, dirY: -1)
|
||||
strokeBracket(cornerX: s - centerline, cornerY: s - centerline, dirX: -1, dirY: -1)
|
||||
|
||||
// Bold redline slash over the frame, lower-left bracket area → upper-right.
|
||||
let slashWidth = s * 0.078
|
||||
ctx.setStrokeColor(Palette.redline)
|
||||
ctx.setLineWidth(slashWidth)
|
||||
ctx.setLineCap(.round)
|
||||
ctx.setLineJoin(.round)
|
||||
let slashInset = centerline + arm * 0.12
|
||||
let slash = CGMutablePath()
|
||||
slash.move(to: CGPoint(x: slashInset, y: s - slashInset))
|
||||
slash.addLine(to: CGPoint(x: s - slashInset, y: slashInset))
|
||||
ctx.addPath(slash)
|
||||
ctx.strokePath()
|
||||
ctx.restoreGState()
|
||||
|
||||
guard let image = ctx.makeImage() else {
|
||||
fputs("error: failed to materialize master CGImage\n", stderr)
|
||||
exit(1)
|
||||
}
|
||||
return image
|
||||
}
|
||||
|
||||
private func scaledImage(_ image: CGImage, pixels: Int) -> CGImage {
|
||||
if image.width == pixels && image.height == pixels {
|
||||
return image
|
||||
}
|
||||
let colorSpace = CGColorSpace(name: CGColorSpace.sRGB)!
|
||||
let bitmapInfo = CGBitmapInfo.byteOrder32Big.rawValue | CGImageAlphaInfo.premultipliedLast.rawValue
|
||||
guard let ctx = CGContext(
|
||||
data: nil,
|
||||
width: pixels,
|
||||
height: pixels,
|
||||
bitsPerComponent: 8,
|
||||
bytesPerRow: 0,
|
||||
space: colorSpace,
|
||||
bitmapInfo: bitmapInfo
|
||||
) else {
|
||||
fputs("error: failed to create \(pixels)×\(pixels) scale context\n", stderr)
|
||||
exit(1)
|
||||
}
|
||||
ctx.interpolationQuality = .high
|
||||
ctx.setShouldAntialias(true)
|
||||
ctx.draw(image, in: CGRect(x: 0, y: 0, width: pixels, height: pixels))
|
||||
guard let out = ctx.makeImage() else {
|
||||
fputs("error: failed to scale image to \(pixels)px\n", stderr)
|
||||
exit(1)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
private func writePNG(_ image: CGImage, to url: URL) {
|
||||
let dir = url.deletingLastPathComponent()
|
||||
try? FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true)
|
||||
if FileManager.default.fileExists(atPath: url.path) {
|
||||
try? FileManager.default.removeItem(at: url)
|
||||
}
|
||||
guard let dest = CGImageDestinationCreateWithURL(url as CFURL, "public.png" as CFString, 1, nil) else {
|
||||
fputs("error: cannot create PNG destination at \(url.path)\n", stderr)
|
||||
exit(1)
|
||||
}
|
||||
CGImageDestinationAddImage(dest, image, nil)
|
||||
if !CGImageDestinationFinalize(dest) {
|
||||
fputs("error: failed to write PNG \(url.path)\n", stderr)
|
||||
exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Paths / CLI
|
||||
|
||||
private func repoRoot() -> URL {
|
||||
let cwd = URL(fileURLWithPath: FileManager.default.currentDirectoryPath, isDirectory: true)
|
||||
let arg0 = URL(fileURLWithPath: CommandLine.arguments[0])
|
||||
let scriptURL: URL
|
||||
if arg0.path.hasPrefix("/") {
|
||||
scriptURL = arg0.standardizedFileURL
|
||||
} else {
|
||||
scriptURL = cwd.appendingPathComponent(arg0.path).standardizedFileURL
|
||||
}
|
||||
let fromScript = scriptURL.deletingLastPathComponent().deletingLastPathComponent()
|
||||
if FileManager.default.fileExists(atPath: fromScript.appendingPathComponent("Package.swift").path) {
|
||||
return fromScript
|
||||
}
|
||||
if FileManager.default.fileExists(atPath: cwd.appendingPathComponent("Package.swift").path) {
|
||||
return cwd
|
||||
}
|
||||
fputs("error: could not find repo root (Package.swift)\n", stderr)
|
||||
exit(1)
|
||||
}
|
||||
|
||||
private func parsePreviewPath() -> String? {
|
||||
let args = CommandLine.arguments
|
||||
var i = 1
|
||||
var preview: String?
|
||||
while i < args.count {
|
||||
let arg = args[i]
|
||||
if arg == "--preview" {
|
||||
i += 1
|
||||
guard i < args.count else {
|
||||
fputs("error: --preview requires a path\n", stderr)
|
||||
exit(1)
|
||||
}
|
||||
preview = args[i]
|
||||
} else if arg.hasPrefix("--preview=") {
|
||||
preview = String(arg.dropFirst("--preview=".count))
|
||||
} else if arg == "--help" || arg == "-h" {
|
||||
fputs("Usage: swift scripts/make-icon.swift [--preview PATH]\n", stderr)
|
||||
exit(0)
|
||||
} else {
|
||||
fputs("error: unknown argument \(arg)\n", stderr)
|
||||
fputs("Usage: swift scripts/make-icon.swift [--preview PATH]\n", stderr)
|
||||
exit(1)
|
||||
}
|
||||
i += 1
|
||||
}
|
||||
return preview
|
||||
}
|
||||
|
||||
private func runIconutil(iconset: URL, icns: URL) {
|
||||
let proc = Process()
|
||||
proc.executableURL = URL(fileURLWithPath: "/usr/bin/iconutil")
|
||||
proc.arguments = ["-c", "icns", iconset.path, "-o", icns.path]
|
||||
proc.standardOutput = FileHandle.standardOutput
|
||||
proc.standardError = FileHandle.standardError
|
||||
do {
|
||||
try proc.run()
|
||||
proc.waitUntilExit()
|
||||
} catch {
|
||||
fputs("error: failed to launch iconutil: \(error)\n", stderr)
|
||||
exit(1)
|
||||
}
|
||||
if proc.terminationStatus != 0 {
|
||||
fputs("error: iconutil exited \(proc.terminationStatus)\n", stderr)
|
||||
exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Main
|
||||
|
||||
let root = repoRoot()
|
||||
let resources = root.appendingPathComponent("Resources", isDirectory: true)
|
||||
let icnsURL = resources.appendingPathComponent("AppIcon.icns")
|
||||
let previewPath = parsePreviewPath()
|
||||
let fm = FileManager.default
|
||||
|
||||
print("==> Drawing \(masterSize)×\(masterSize) master")
|
||||
let master = drawMasterIcon(size: masterSize)
|
||||
|
||||
let iconset = fm.temporaryDirectory.appendingPathComponent("Redline-AppIcon-\(UUID().uuidString).iconset", isDirectory: true)
|
||||
|
||||
do {
|
||||
try fm.createDirectory(at: iconset, withIntermediateDirectories: true)
|
||||
try fm.createDirectory(at: resources, withIntermediateDirectories: true)
|
||||
|
||||
print("==> Writing AppIcon.iconset")
|
||||
for entry in iconsetEntries {
|
||||
let img = scaledImage(master, pixels: entry.pixels)
|
||||
writePNG(img, to: iconset.appendingPathComponent(entry.filename))
|
||||
}
|
||||
|
||||
if fm.fileExists(atPath: icnsURL.path) {
|
||||
try fm.removeItem(at: icnsURL)
|
||||
}
|
||||
|
||||
print("==> Compiling \(icnsURL.path)")
|
||||
runIconutil(iconset: iconset, icns: icnsURL)
|
||||
|
||||
try? fm.removeItem(at: iconset)
|
||||
} catch {
|
||||
try? fm.removeItem(at: iconset)
|
||||
fputs("error: \(error)\n", stderr)
|
||||
exit(1)
|
||||
}
|
||||
|
||||
if let previewPath {
|
||||
let previewURL = URL(fileURLWithPath: previewPath)
|
||||
print("==> Writing 512px preview \(previewURL.path)")
|
||||
writePNG(scaledImage(master, pixels: 512), to: previewURL)
|
||||
}
|
||||
|
||||
print("App icon: \(icnsURL.path)")
|
||||
Executable
+287
@@ -0,0 +1,287 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
# One-command Redline release: bump Info.plist, commit, signed build, zip,
|
||||
# DMG, appcast, upload to mmd01, verify the public URLs.
|
||||
# Hidden flag: --test — upload under .../redline/test/ and skip the git commit.
|
||||
|
||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "${ROOT}"
|
||||
|
||||
PLIST="${ROOT}/Info.plist"
|
||||
PLISTBUDDY="/usr/libexec/PlistBuddy"
|
||||
REMOTE_HOST="mmd01"
|
||||
REMOTE_BASE="/opt/mmd-installer-content/cowork/redline"
|
||||
PUBLIC_BASE="https://get.baobab-ts.com/cowork/redline"
|
||||
SIGN_IDENTITY="Apple Development: ben@flow-master.ai (QH2H9G2LK5)"
|
||||
|
||||
usage() {
|
||||
echo "Usage: $0 <version> [\"notes\"]" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
TEST_MODE=0
|
||||
VERSION=""
|
||||
NOTES=""
|
||||
NOTES_SET=0
|
||||
for arg in "$@"; do
|
||||
case "${arg}" in
|
||||
--test)
|
||||
TEST_MODE=1
|
||||
;;
|
||||
--help|-h)
|
||||
usage
|
||||
;;
|
||||
--*)
|
||||
echo "Unknown argument: ${arg}" >&2
|
||||
usage
|
||||
;;
|
||||
*)
|
||||
if [[ -z "${VERSION}" ]]; then
|
||||
VERSION="${arg}"
|
||||
elif [[ "${NOTES_SET}" -eq 0 ]]; then
|
||||
NOTES="${arg}"
|
||||
NOTES_SET=1
|
||||
else
|
||||
echo "Unexpected extra argument: ${arg}" >&2
|
||||
usage
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [[ -z "${VERSION}" ]]; then
|
||||
usage
|
||||
fi
|
||||
|
||||
if [[ ! "${VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+([+-][A-Za-z0-9.-]+)*$ ]]; then
|
||||
echo "Version '${VERSION}' is not a semver (e.g. 1.2.3 or 0.0.0-test)." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ "${VERSION}" == *'/'* || "${VERSION}" == *'..'* ]]; then
|
||||
echo "Version contains illegal path characters: ${VERSION}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ "${TEST_MODE}" -eq 1 ]]; then
|
||||
REMOTE_DIR="${REMOTE_BASE}/test"
|
||||
PUBLIC_DIR="${PUBLIC_BASE}/test"
|
||||
else
|
||||
REMOTE_DIR="${REMOTE_BASE}"
|
||||
PUBLIC_DIR="${PUBLIC_BASE}"
|
||||
fi
|
||||
|
||||
ZIP_NAME="Redline-${VERSION}.zip"
|
||||
DMG_NAME="Redline-${VERSION}.dmg"
|
||||
ZIP_PATH="${ROOT}/.build/${ZIP_NAME}"
|
||||
DMG_PATH="${ROOT}/.build/Redline.dmg"
|
||||
APPCAST_PATH="${ROOT}/.build/appcast.json"
|
||||
ZIP_URL="${PUBLIC_DIR}/${ZIP_NAME}"
|
||||
APPCAST_URL="${PUBLIC_DIR}/appcast.json"
|
||||
|
||||
if [[ "${TEST_MODE}" -eq 1 ]]; then
|
||||
echo "==> Publish Redline ${VERSION} (test)"
|
||||
else
|
||||
echo "==> Publish Redline ${VERSION}"
|
||||
fi
|
||||
echo " remote: ${REMOTE_HOST}:${REMOTE_DIR}/"
|
||||
echo " public: ${PUBLIC_DIR}/"
|
||||
|
||||
if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
|
||||
echo "Not inside a git work tree." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Tracked files must match HEAD. Untracked files are ignored so this script
|
||||
# can be dry-run (--test) before it is itself committed.
|
||||
if [[ -n "$(git status --porcelain -uno)" ]]; then
|
||||
echo "git tree is not clean; commit or stash before publishing." >&2
|
||||
git status --porcelain -uno >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ ! -x "${PLISTBUDDY}" ]]; then
|
||||
echo "PlistBuddy not found at ${PLISTBUDDY}" >&2
|
||||
exit 1
|
||||
fi
|
||||
if [[ ! -f "${PLIST}" ]]; then
|
||||
echo "Info.plist not found at ${PLIST}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
restore_plist() {
|
||||
git checkout -- "${PLIST}" >/dev/null 2>&1 || true
|
||||
}
|
||||
|
||||
if [[ "${TEST_MODE}" -eq 1 ]]; then
|
||||
trap restore_plist EXIT
|
||||
fi
|
||||
|
||||
CURRENT_BUILD="$("${PLISTBUDDY}" -c 'Print :CFBundleVersion' "${PLIST}")"
|
||||
if [[ ! "${CURRENT_BUILD}" =~ ^[0-9]+$ ]]; then
|
||||
echo "CFBundleVersion is not an integer: ${CURRENT_BUILD}" >&2
|
||||
exit 1
|
||||
fi
|
||||
NEW_BUILD=$((CURRENT_BUILD + 1))
|
||||
|
||||
echo "==> Bumping Info.plist"
|
||||
echo " CFBundleShortVersionString -> ${VERSION}"
|
||||
echo " CFBundleVersion ${CURRENT_BUILD} -> ${NEW_BUILD}"
|
||||
"${PLISTBUDDY}" -c "Set :CFBundleShortVersionString ${VERSION}" "${PLIST}"
|
||||
"${PLISTBUDDY}" -c "Set :CFBundleVersion ${NEW_BUILD}" "${PLIST}"
|
||||
|
||||
if [[ "${TEST_MODE}" -eq 0 ]]; then
|
||||
echo "==> Committing version bump on $(git rev-parse --abbrev-ref HEAD)"
|
||||
git add "${PLIST}"
|
||||
git commit -m "release: v${VERSION}"
|
||||
else
|
||||
echo "==> --test: skipping git commit of version bump"
|
||||
fi
|
||||
|
||||
# Restricted HOMEs (agent sandboxes) hide the login keychain from codesign.
|
||||
# Re-run signed steps with the account's real home when the identity is missing.
|
||||
signing_home() {
|
||||
if security find-identity -v -p codesigning 2>/dev/null | grep -Fq "${SIGN_IDENTITY}"; then
|
||||
echo "${HOME}"
|
||||
return
|
||||
fi
|
||||
local rh
|
||||
rh="$(dscl . -read "/Users/$(id -un)" NFSHomeDirectory 2>/dev/null | awk '{print $2}')"
|
||||
if [[ -n "${rh}" && -d "${rh}" ]]; then
|
||||
echo "${rh}"
|
||||
else
|
||||
echo "${HOME}"
|
||||
fi
|
||||
}
|
||||
|
||||
run_signed() {
|
||||
local sign_home
|
||||
sign_home="$(signing_home)"
|
||||
if [[ "${sign_home}" != "${HOME}" ]]; then
|
||||
echo "==> Using HOME=${sign_home} so codesign can see the login keychain"
|
||||
fi
|
||||
HOME="${sign_home}" "$@"
|
||||
}
|
||||
|
||||
echo "==> Building signed Redline.app"
|
||||
run_signed ./scripts/build-app.sh
|
||||
|
||||
if [[ ! -d "${ROOT}/.build/Redline.app" ]]; then
|
||||
echo "Signed app missing at ${ROOT}/.build/Redline.app" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "==> Zipping Redline.app -> ${ZIP_PATH}"
|
||||
mkdir -p "${ROOT}/.build"
|
||||
(
|
||||
cd "${ROOT}/.build"
|
||||
rm -f "${ZIP_NAME}"
|
||||
ditto -c -k --keepParent Redline.app "${ZIP_NAME}"
|
||||
)
|
||||
|
||||
if [[ ! -s "${ZIP_PATH}" ]]; then
|
||||
echo "Zip was not created at ${ZIP_PATH}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "==> Building manual installer DMG"
|
||||
run_signed ./scripts/make-dmg.sh
|
||||
|
||||
if [[ ! -s "${DMG_PATH}" ]]; then
|
||||
echo "DMG was not created at ${DMG_PATH}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
SHA256="$(shasum -a 256 "${ZIP_PATH}" | awk '{print $1}')"
|
||||
ZIP_BYTES="$(stat -f%z "${ZIP_PATH}")"
|
||||
PUBDATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
|
||||
|
||||
echo "==> Zip SHA256: ${SHA256}"
|
||||
echo " Zip bytes: ${ZIP_BYTES}"
|
||||
|
||||
echo "==> Writing ${APPCAST_PATH}"
|
||||
python3 - "${VERSION}" "${ZIP_URL}" "${SHA256}" "${NOTES}" "${PUBDATE}" "${APPCAST_PATH}" <<'PY'
|
||||
import json
|
||||
import sys
|
||||
|
||||
version, zip_url, sha256, notes, pub_date, out_path = sys.argv[1:]
|
||||
payload = {
|
||||
"version": version,
|
||||
"zipURL": zip_url,
|
||||
"sha256": sha256,
|
||||
"notes": notes,
|
||||
"pubDate": pub_date,
|
||||
}
|
||||
with open(out_path, "w", encoding="utf-8") as fh:
|
||||
json.dump(payload, fh, indent=2)
|
||||
fh.write("\n")
|
||||
PY
|
||||
|
||||
echo "==> Uploading to ${REMOTE_HOST}:${REMOTE_DIR}/"
|
||||
ssh -o BatchMode=yes "${REMOTE_HOST}" "mkdir -p '${REMOTE_DIR}'"
|
||||
rsync -e "ssh -o BatchMode=yes" -av "${ZIP_PATH}" "${REMOTE_HOST}:${REMOTE_DIR}/${ZIP_NAME}"
|
||||
rsync -e "ssh -o BatchMode=yes" -av "${DMG_PATH}" "${REMOTE_HOST}:${REMOTE_DIR}/Redline.dmg"
|
||||
rsync -e "ssh -o BatchMode=yes" -av "${DMG_PATH}" "${REMOTE_HOST}:${REMOTE_DIR}/${DMG_NAME}"
|
||||
rsync -e "ssh -o BatchMode=yes" -av "${APPCAST_PATH}" "${REMOTE_HOST}:${REMOTE_DIR}/appcast.json"
|
||||
ssh -o BatchMode=yes "${REMOTE_HOST}" \
|
||||
"chmod 644 \
|
||||
'${REMOTE_DIR}/${ZIP_NAME}' \
|
||||
'${REMOTE_DIR}/Redline.dmg' \
|
||||
'${REMOTE_DIR}/${DMG_NAME}' \
|
||||
'${REMOTE_DIR}/appcast.json'"
|
||||
|
||||
echo "==> Verifying public appcast ${APPCAST_URL}"
|
||||
APPCAST_BODY=""
|
||||
ok=0
|
||||
attempt=1
|
||||
while [[ "${attempt}" -le 15 ]]; do
|
||||
if APPCAST_BODY="$(curl -fsS "${APPCAST_URL}")"; then
|
||||
echo "${APPCAST_BODY}"
|
||||
if grep -F -q "${VERSION}" <<<"${APPCAST_BODY}"; then
|
||||
echo "OK: appcast contains ${VERSION}"
|
||||
ok=1
|
||||
break
|
||||
fi
|
||||
echo "appcast fetched but does not contain '${VERSION}' (attempt ${attempt})" >&2
|
||||
else
|
||||
echo "appcast fetch failed (attempt ${attempt})" >&2
|
||||
fi
|
||||
attempt=$((attempt + 1))
|
||||
sleep 2
|
||||
done
|
||||
if [[ "${ok}" -ne 1 ]]; then
|
||||
echo "Public appcast verification failed for ${APPCAST_URL}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "==> Verifying public zip HEAD ${ZIP_URL}"
|
||||
ok=0
|
||||
attempt=1
|
||||
HEAD_OUT=""
|
||||
while [[ "${attempt}" -le 15 ]]; do
|
||||
HEAD_OUT="$(curl -sS -D - -o /dev/null -I "${ZIP_URL}" || true)"
|
||||
echo "${HEAD_OUT}"
|
||||
HTTP_CODE="$(awk 'BEGIN{c=""} toupper($1) ~ /^HTTP\//{c=$2} END{print c}' <<<"${HEAD_OUT}" | tr -d '\r')"
|
||||
CONTENT_LENGTH="$(awk 'tolower($1)=="content-length:" {gsub("\r","",$2); print $2}' <<<"${HEAD_OUT}" | tail -n 1)"
|
||||
if [[ "${HTTP_CODE}" == "200" && "${CONTENT_LENGTH}" == "${ZIP_BYTES}" ]]; then
|
||||
echo "OK: zip HTTP ${HTTP_CODE}, Content-Length ${CONTENT_LENGTH} matches local ${ZIP_BYTES}"
|
||||
ok=1
|
||||
break
|
||||
fi
|
||||
echo "zip HEAD mismatch (attempt ${attempt}): HTTP '${HTTP_CODE}', Content-Length '${CONTENT_LENGTH}', local '${ZIP_BYTES}'" >&2
|
||||
attempt=$((attempt + 1))
|
||||
sleep 2
|
||||
done
|
||||
if [[ "${ok}" -ne 1 ]]; then
|
||||
echo "Public zip verification failed for ${ZIP_URL}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "Published v${VERSION}"
|
||||
echo " appcast: ${APPCAST_URL}"
|
||||
echo " zip: ${ZIP_URL}"
|
||||
echo " sha256: ${SHA256}"
|
||||
echo " dmg: ${PUBLIC_DIR}/${DMG_NAME}"
|
||||
echo " dmg: ${PUBLIC_DIR}/Redline.dmg"
|
||||
Reference in New Issue
Block a user