Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0506ce04e9 | ||
|
|
eaa5bd5884 | ||
|
|
6ab398c3f2 | ||
|
|
eb1af5bf18 | ||
|
|
49c6a41033 | ||
|
|
706726a3d4 | ||
|
|
e1f569cc3e | ||
|
|
4da02e243f | ||
|
|
8b53a727e3 | ||
|
|
fdec105174 | ||
|
|
12128b016d | ||
|
|
a32cd03581 | ||
|
|
8a12ed0a54 | ||
|
|
bfdc6fde9d | ||
|
|
9884c844d4 | ||
|
|
365220ade8 | ||
|
|
064e410e30 | ||
|
|
a79a569a7d | ||
|
|
3abb8dc6ca | ||
|
|
8d68c836cd | ||
|
|
04d1e73532 | ||
|
|
d7984add2d | ||
|
|
723cd7dcea | ||
|
|
70231574c9 | ||
|
|
8121738188 | ||
|
|
6484fde530 | ||
|
|
bd11ba96c5 | ||
|
|
ef0d8712f7 | ||
|
|
20de467e87 | ||
|
|
209921f084 | ||
|
|
2937d2d5e0 | ||
|
|
80a128b667 | ||
|
|
78cc7d5b1a | ||
|
|
6449c72b3b | ||
|
|
299d55e884 | ||
|
|
380b704f8a | ||
|
|
8338216f23 | ||
|
|
f0e9b41d90 | ||
|
|
36071aed84 | ||
|
|
5e61cd735c | ||
|
|
461f4e4d75 | ||
|
|
4e7c575455 | ||
|
|
c01653e9aa | ||
|
|
7284568489 | ||
|
|
8d66e49e07 | ||
|
|
e253a966ab | ||
|
|
fa3e7b0a4a | ||
|
|
c52e68a9d5 | ||
|
|
3c55be174a | ||
|
|
d05bd735b5 | ||
|
|
74606e5046 | ||
|
|
517a4e4fdc | ||
|
|
6c0b6e3068 | ||
|
|
f2088bbed8 | ||
|
|
31013802d7 | ||
|
|
e1de0ad519 | ||
|
|
bb6c1cd0b4 | ||
|
|
9278f703e0 | ||
|
|
3b269102a0 | ||
|
|
c54471ee2e | ||
|
|
79fa9ee1da | ||
|
|
672f8d495f | ||
|
|
66657ac532 |
+9
-7
@@ -2,22 +2,24 @@
|
|||||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
<plist version="1.0">
|
<plist version="1.0">
|
||||||
<dict>
|
<dict>
|
||||||
|
<key>CFBundleExecutable</key>
|
||||||
|
<string>Shotdeck</string>
|
||||||
|
<key>CFBundleIconFile</key>
|
||||||
|
<string>AppIcon</string>
|
||||||
<key>CFBundleIdentifier</key>
|
<key>CFBundleIdentifier</key>
|
||||||
<string>ai.flowmaster.shotdeck</string>
|
<string>ai.flowmaster.shotdeck</string>
|
||||||
<key>CFBundleName</key>
|
<key>CFBundleName</key>
|
||||||
<string>Shotdeck</string>
|
<string>Redline</string>
|
||||||
<key>CFBundleExecutable</key>
|
|
||||||
<string>Shotdeck</string>
|
|
||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>0.1.0</string>
|
<string>0.3.0</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>1</string>
|
<string>3</string>
|
||||||
<key>LSUIElement</key>
|
|
||||||
<true/>
|
|
||||||
<key>LSMinimumSystemVersion</key>
|
<key>LSMinimumSystemVersion</key>
|
||||||
<string>14.0</string>
|
<string>14.0</string>
|
||||||
|
<key>LSUIElement</key>
|
||||||
|
<true/>
|
||||||
<key>NSHumanReadableCopyright</key>
|
<key>NSHumanReadableCopyright</key>
|
||||||
<string>Copyright © 2026 Flowmaster FZC LLC. All rights reserved.</string>
|
<string>Copyright © 2026 Flowmaster FZC LLC. All rights reserved.</string>
|
||||||
</dict>
|
</dict>
|
||||||
|
|||||||
@@ -27,5 +27,14 @@ let package = Package(
|
|||||||
dependencies: ["ShotdeckCore"],
|
dependencies: ["ShotdeckCore"],
|
||||||
swiftSettings: [.swiftLanguageMode(.v6)]
|
swiftSettings: [.swiftLanguageMode(.v6)]
|
||||||
),
|
),
|
||||||
|
// Exercises the real Shotdeck-app-target wiring (AppDelegate.makeLaunchModel(),
|
||||||
|
// AppModel.bootstrap()) via @testable import — logic ShotdeckCoreTests cannot
|
||||||
|
// reach because it only depends on ShotdeckCore, not the Shotdeck executable
|
||||||
|
// target itself. See ReturnWatcherLaunchWiringTests.swift.
|
||||||
|
.testTarget(
|
||||||
|
name: "ShotdeckTests",
|
||||||
|
dependencies: ["Shotdeck", "ShotdeckCore"],
|
||||||
|
swiftSettings: [.swiftLanguageMode(.v6)]
|
||||||
|
),
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -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.
|
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
|
```bash
|
||||||
swift build && swift test
|
swift build && swift test
|
||||||
./scripts/build-app.sh # signed .app for daily use
|
./scripts/build-app.sh # signed .app for daily use
|
||||||
open .build/Shotdeck.app
|
open .build/Redline.app
|
||||||
```
|
```
|
||||||
|
|||||||
Binary file not shown.
+312
-10
@@ -1,5 +1,4 @@
|
|||||||
import AppKit
|
import AppKit
|
||||||
import Carbon.HIToolbox
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import Observation
|
import Observation
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
@@ -15,6 +14,11 @@ public protocol SettingsWindowPresenting: AnyObject {
|
|||||||
func presentSettingsWindow()
|
func presentSettingsWindow()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
public protocol SubmissionsWindowPresenting: AnyObject {
|
||||||
|
func presentSubmissionsWindow()
|
||||||
|
}
|
||||||
|
|
||||||
@MainActor
|
@MainActor
|
||||||
public protocol ReturnsSectionProviding: AnyObject {
|
public protocol ReturnsSectionProviding: AnyObject {
|
||||||
@ViewBuilder func returnsSection() -> AnyView
|
@ViewBuilder func returnsSection() -> AnyView
|
||||||
@@ -28,15 +32,39 @@ public final class AppModel {
|
|||||||
public private(set) var screenRecordingGranted: Bool
|
public private(set) var screenRecordingGranted: Bool
|
||||||
public private(set) var allReturns: [ReturnedDocument] = []
|
public private(set) var allReturns: [ReturnedDocument] = []
|
||||||
public private(set) var commentedReturns: [ReturnedDocument] = []
|
public private(set) var commentedReturns: [ReturnedDocument] = []
|
||||||
|
/// Retained past sessions (newest first) — what the Past submissions window lists.
|
||||||
|
public private(set) var pastSessions: [CaptureSession] = []
|
||||||
public private(set) var statusLine: String?
|
public private(set) var statusLine: String?
|
||||||
public private(set) var isCapturing: Bool = false
|
public private(set) var isCapturing: Bool = false
|
||||||
public private(set) var isSending: Bool = false
|
public private(set) var isSending: Bool = false
|
||||||
|
/// True while "Start new session" is between its guard and its store call — the
|
||||||
|
/// synchronous flag both this action and send() check BEFORE their first await, so
|
||||||
|
/// the two can never interleave a session close with an in-flight compose (a
|
||||||
|
/// SwiftUI `.disabled` render-time guard alone does not stop a queued Task).
|
||||||
|
public private(set) var isStartingNewSession: Bool = false
|
||||||
public private(set) var outboxDisplayName: String
|
public private(set) var outboxDisplayName: String
|
||||||
public private(set) var watchFolderDisplayName: String
|
public private(set) var watchFolderDisplayName: String
|
||||||
|
/// Live transport choice; WP-onedrive reads this to pick the send path and to drive
|
||||||
|
/// the Settings "Send via" picker and the menu's "Send…" label.
|
||||||
|
public private(set) var transport: SendTransport
|
||||||
|
/// Ground truth for the Settings OneDrive row: nil means "no OneDrive folder found".
|
||||||
|
/// Views read this instead of calling `OneDriveLocator.resolveOneDriveFolder()`
|
||||||
|
/// directly, so state (and testing with a fake home) flows through the model like
|
||||||
|
/// everything else — never a View reaching past the model for real UserDefaults/home.
|
||||||
|
public private(set) var resolvedOneDriveFolder: URL?
|
||||||
/// Live outbox; WP-4b reads this (not `paths.outbox`) so Settings folder changes take effect.
|
/// Live outbox; WP-4b reads this (not `paths.outbox`) so Settings folder changes take effect.
|
||||||
public private(set) var outboxURL: URL
|
public private(set) var outboxURL: URL
|
||||||
/// Live watch folder; WP-4c updates this alongside `ReturnWatcher.updateWatchFolder`.
|
/// Live watch folder; WP-4c updates this alongside `ReturnWatcher.updateWatchFolder`.
|
||||||
public private(set) var watchFolderURL: URL
|
public private(set) var watchFolderURL: URL
|
||||||
|
/// Absolute URL of the PDF composed this run, if any. Used by "Reveal last PDF".
|
||||||
|
public private(set) var lastComposedPDFURL: URL?
|
||||||
|
/// Currently bound capture combo (the last one Carbon accepted, or the preferred load).
|
||||||
|
private(set) var captureHotkey: HotkeyPreference
|
||||||
|
var hotkeyDisplayString: String { captureHotkey.displayString }
|
||||||
|
/// Staged update offered in the menu. Set only after checksum + payload validation.
|
||||||
|
public private(set) var updateAvailable: (version: String, notes: String)?
|
||||||
|
/// True for the duration of any appcast check (manual or scheduled).
|
||||||
|
public private(set) var isCheckingForUpdates: Bool = false
|
||||||
|
|
||||||
let paths: AppSupportPaths
|
let paths: AppSupportPaths
|
||||||
let spool: SpoolStore
|
let spool: SpoolStore
|
||||||
@@ -46,6 +74,7 @@ public final class AppModel {
|
|||||||
let picker: RegionPickerController
|
let picker: RegionPickerController
|
||||||
let ledger: ReturnLedger
|
let ledger: ReturnLedger
|
||||||
let watcher: ReturnWatcher
|
let watcher: ReturnWatcher
|
||||||
|
let updateChecker: UpdateChecker
|
||||||
|
|
||||||
public init(
|
public init(
|
||||||
paths: AppSupportPaths,
|
paths: AppSupportPaths,
|
||||||
@@ -72,20 +101,47 @@ public final class AppModel {
|
|||||||
captures: [],
|
captures: [],
|
||||||
pdfFileName: nil
|
pdfFileName: nil
|
||||||
)
|
)
|
||||||
self.region = nil
|
self.region = Self.loadPersistedRegion()
|
||||||
self.screenRecordingGranted = ScreenCapturer.isScreenRecordingGranted
|
self.screenRecordingGranted = ScreenCapturer.isScreenRecordingGranted
|
||||||
// Seeded from FolderSettings.resolve() via resolvedAppSupportPaths — never .standard().
|
// Seeded from TransportSettings.effectiveFolders() — the one place that combines
|
||||||
let folders = FolderSettings.resolve()
|
// the transport choice with FolderSettings/OneDriveLocator. Never call
|
||||||
|
// FolderSettings.resolve() directly outside that function.
|
||||||
|
let folders = TransportSettings.effectiveFolders()
|
||||||
self.outboxURL = folders.outbox
|
self.outboxURL = folders.outbox
|
||||||
self.watchFolderURL = folders.watch
|
self.watchFolderURL = folders.watch
|
||||||
self.outboxDisplayName = folders.outbox.lastPathComponent
|
self.outboxDisplayName = folders.outbox.lastPathComponent
|
||||||
self.watchFolderDisplayName = folders.watch.lastPathComponent
|
self.watchFolderDisplayName = folders.watch.lastPathComponent
|
||||||
|
self.transport = folders.transport
|
||||||
|
self.resolvedOneDriveFolder = OneDriveLocator.resolveOneDriveFolder()
|
||||||
|
self.captureHotkey = HotkeyPreference.load()
|
||||||
|
self.updateChecker = UpdateChecker()
|
||||||
|
self.updateChecker.onChecked = { [weak self] in
|
||||||
|
guard let self else { return }
|
||||||
|
self.updateAvailable = self.updateChecker.availableUpdate
|
||||||
|
if let message = self.updateChecker.statusMessage {
|
||||||
|
self.setStatus(message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
self.updateChecker.onCheckingChanged = { [weak self] checking in
|
||||||
|
self?.isCheckingForUpdates = checking
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// CFBundleShortVersionString of the running app.
|
||||||
|
public var appVersion: String { UpdateChecker.currentVersion() }
|
||||||
|
/// Version recorded in the app-managed rollback copy, when one exists.
|
||||||
|
public var previousVersion: String? { updateChecker.previousVersion() }
|
||||||
|
/// Most recent status text — shared with the general status line by design
|
||||||
|
/// (Redline has one status channel, not a separate update-only one).
|
||||||
|
public var updateStatusMessage: String? { statusLine }
|
||||||
|
|
||||||
// MARK: Seam mutators — the only way a WP-4b/4c extension changes state.
|
// MARK: Seam mutators — the only way a WP-4b/4c extension changes state.
|
||||||
|
|
||||||
func setStatus(_ text: String?) { statusLine = text }
|
func setStatus(_ text: String?) { statusLine = text }
|
||||||
func setSending(_ value: Bool) { isSending = value }
|
func setSending(_ value: Bool) { isSending = value }
|
||||||
|
/// Fixture seam (same family as setSending): lets tests/PanelSnapshot stage the
|
||||||
|
/// in-flight-start state that production only ever reaches inside startNewSession().
|
||||||
|
func setStartingNewSession(_ value: Bool) { isStartingNewSession = value }
|
||||||
func setCapturing(_ value: Bool) { isCapturing = value }
|
func setCapturing(_ value: Bool) { isCapturing = value }
|
||||||
func replaceSession(_ new: CaptureSession) { session = new }
|
func replaceSession(_ new: CaptureSession) { session = new }
|
||||||
func replaceRegion(_ new: CaptureRegion?) { region = new }
|
func replaceRegion(_ new: CaptureRegion?) { region = new }
|
||||||
@@ -93,6 +149,7 @@ public final class AppModel {
|
|||||||
allReturns = all
|
allReturns = all
|
||||||
commentedReturns = commented
|
commentedReturns = commented
|
||||||
}
|
}
|
||||||
|
func setPastSessions(_ value: [CaptureSession]) { pastSessions = value }
|
||||||
func setFolderDisplayNames(outbox: String, watch: String) {
|
func setFolderDisplayNames(outbox: String, watch: String) {
|
||||||
outboxDisplayName = outbox
|
outboxDisplayName = outbox
|
||||||
watchFolderDisplayName = watch
|
watchFolderDisplayName = watch
|
||||||
@@ -102,6 +159,59 @@ public final class AppModel {
|
|||||||
watchFolderURL = watch
|
watchFolderURL = watch
|
||||||
setFolderDisplayNames(outbox: outbox.lastPathComponent, watch: watch.lastPathComponent)
|
setFolderDisplayNames(outbox: outbox.lastPathComponent, watch: watch.lastPathComponent)
|
||||||
}
|
}
|
||||||
|
func setTransport(_ value: SendTransport) { transport = value }
|
||||||
|
func setResolvedOneDriveFolder(_ value: URL?) { resolvedOneDriveFolder = value }
|
||||||
|
|
||||||
|
/// Bumped by chooseTransport/chooseOneDriveFolder (SettingsView.swift) before each
|
||||||
|
/// spawns its async watcher-reconcile Task; that Task checks its own snapshot
|
||||||
|
/// against the live value before every mutating step, so rapid toggling always
|
||||||
|
/// lets the LAST choice win instead of applying stale, superseded work. Not
|
||||||
|
/// `@Observable`-relevant state — pure internal bookkeeping, never read by a View.
|
||||||
|
var reconcileGeneration = 0
|
||||||
|
/// The MOST RECENT watcher-reconcile Task spawned by chooseTransport/
|
||||||
|
/// chooseOneDriveFolder, if one is still (or was just) in flight. send() awaits
|
||||||
|
/// this BEFORE snapshotting transport/folder, so a toggle immediately followed by
|
||||||
|
/// Send can never race ahead of the reconcile it depends on (the watcher's
|
||||||
|
/// recordUncommented flag briefly lagging the just-chosen transport, for example).
|
||||||
|
/// `Task<Void, Never>` never throws; awaiting an already-completed task's `.value`
|
||||||
|
/// returns immediately. Not `@Observable`-relevant — pure internal bookkeeping.
|
||||||
|
var pendingReconcileTask: Task<Void, Never>?
|
||||||
|
func rememberLastComposedPDF(_ url: URL) { lastComposedPDFURL = url }
|
||||||
|
|
||||||
|
/// True when a last-composed PDF path is known this run, or the newest
|
||||||
|
/// `Redline-*.pdf` in the outbox exists on disk.
|
||||||
|
var canRevealLastPDF: Bool { revealablePDFURL() != nil }
|
||||||
|
|
||||||
|
public func revealLastPDF() {
|
||||||
|
guard let url = revealablePDFURL() else { return }
|
||||||
|
NSWorkspace.shared.activateFileViewerSelecting([url])
|
||||||
|
}
|
||||||
|
|
||||||
|
func revealablePDFURL() -> URL? {
|
||||||
|
if let last = lastComposedPDFURL, FileManager.default.fileExists(atPath: last.path) {
|
||||||
|
return last
|
||||||
|
}
|
||||||
|
return newestOutboxRedlinePDF()
|
||||||
|
}
|
||||||
|
|
||||||
|
func newestOutboxRedlinePDF() -> URL? {
|
||||||
|
let fm = FileManager.default
|
||||||
|
let items = (try? fm.contentsOfDirectory(
|
||||||
|
at: outboxURL,
|
||||||
|
includingPropertiesForKeys: [.contentModificationDateKey],
|
||||||
|
options: [.skipsHiddenFiles]
|
||||||
|
)) ?? []
|
||||||
|
let matches = items.filter {
|
||||||
|
$0.lastPathComponent.hasPrefix("Redline-") && $0.pathExtension.lowercased() == "pdf"
|
||||||
|
}
|
||||||
|
return matches.max { a, b in
|
||||||
|
let da = (try? a.resourceValues(forKeys: [.contentModificationDateKey])
|
||||||
|
.contentModificationDate) ?? .distantPast
|
||||||
|
let db = (try? b.resourceValues(forKeys: [.contentModificationDateKey])
|
||||||
|
.contentModificationDate) ?? .distantPast
|
||||||
|
return da < db
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public var iconState: MenuIconState {
|
public var iconState: MenuIconState {
|
||||||
if !screenRecordingGranted { return .recordingMissing }
|
if !screenRecordingGranted { return .recordingMissing }
|
||||||
@@ -134,6 +244,34 @@ public final class AppModel {
|
|||||||
}
|
}
|
||||||
|
|
||||||
do {
|
do {
|
||||||
|
setPastSessions(try await spool.archivedSessions())
|
||||||
|
} catch {
|
||||||
|
setStatus((error as? ShotdeckError)?.errorDescription ?? "Could not load past sessions.")
|
||||||
|
}
|
||||||
|
|
||||||
|
// OneDrive mode: outbox == watch folder, so a freshly written, unmarked PDF must
|
||||||
|
// never show up as a return; only a document that already carries a mark does.
|
||||||
|
// Also make sure the resolved OneDrive folder actually exists before the
|
||||||
|
// watcher starts watching it (bootstrap is the other creation trigger besides
|
||||||
|
// chooseTransport/chooseOneDriveFolder — see TransportSettings.effectiveFolders).
|
||||||
|
if transport == .oneDrive {
|
||||||
|
try? FileManager.default.createDirectory(at: outboxURL, withIntermediateDirectories: true)
|
||||||
|
}
|
||||||
|
setResolvedOneDriveFolder(OneDriveLocator.resolveOneDriveFolder())
|
||||||
|
await watcher.setRecordUncommented(transport == .airDrop)
|
||||||
|
|
||||||
|
do {
|
||||||
|
// BLOCKER fix: reconcile the watcher's internal watchFolder with the live
|
||||||
|
// watchFolderURL UNCONDITIONALLY, before it ever starts. `paths` (and so the
|
||||||
|
// watcher's initial folder, set in its own init) now comes from the same
|
||||||
|
// transport-aware TransportSettings.effectiveFolders() as watchFolderURL, so
|
||||||
|
// in the normal case this is a no-op — but it is the only thing that would
|
||||||
|
// have caught the old bug (launch paths built AirDrop-only while OneDrive was
|
||||||
|
// the persisted transport, leaving the watcher's FSEvents stream pointed at a
|
||||||
|
// stale folder for the whole session) and it stays cheap insurance against
|
||||||
|
// that class of drift ever recurring. Calling it before start() only updates
|
||||||
|
// the stored folder — no FSEvents stream exists yet to restart.
|
||||||
|
try await watcher.updateWatchFolder(watchFolderURL)
|
||||||
try await watcher.start { [weak self] _ in
|
try await watcher.start { [weak self] _ in
|
||||||
Task { @MainActor in
|
Task { @MainActor in
|
||||||
guard let self else { return }
|
guard let self else { return }
|
||||||
@@ -146,16 +284,78 @@ public final class AppModel {
|
|||||||
setStatus((error as? ShotdeckError)?.errorDescription ?? "Could not watch the return folder.")
|
setStatus((error as? ShotdeckError)?.errorDescription ?? "Could not watch the return folder.")
|
||||||
}
|
}
|
||||||
|
|
||||||
let registered = hotkeys.register(
|
// Env-var-flagged self-test/headless runs (PickerSelfTest's phases, PanelSnapshot,
|
||||||
|
// and the new ShotdeckTests launch-wiring regression test) skip two real-world
|
||||||
|
// side effects that are unsafe or meaningless in that context: the update-check
|
||||||
|
// schedule (a real network call), and binding the REAL, process-wide Carbon
|
||||||
|
// global hotkey — which is not safe to exercise in an automated/parallel test
|
||||||
|
// process (it can collide with ShotdeckCoreTests' own HotkeyCenterCarbonTests
|
||||||
|
// running in the same test binary) and was never meaningfully exercised by any
|
||||||
|
// self-test anyway. A real user launch never sets these env vars, so production
|
||||||
|
// behavior is unchanged.
|
||||||
|
let isSelfTestRun =
|
||||||
|
ProcessInfo.processInfo.environment["SHOTDECK_PICKER_SELFTEST"] != nil
|
||||||
|
|| ProcessInfo.processInfo.environment["SHOTDECK_SNAPSHOT_DIR"] != nil
|
||||||
|
|| ProcessInfo.processInfo.environment["SHOTDECK_UPDATE_SELFTEST"] != nil
|
||||||
|
|| ProcessInfo.processInfo.environment["SHOTDECK_ONEDRIVE_SELFTEST"] != nil
|
||||||
|
|| ProcessInfo.processInfo.environment["REDLINE_SELFTEST_PHASE"] != nil
|
||||||
|
|
||||||
|
let pref = HotkeyPreference.load()
|
||||||
|
captureHotkey = pref
|
||||||
|
if !isSelfTestRun, !bindCaptureHotkey(pref) {
|
||||||
|
setStatus("\(pref.displayString) is already used by another app — capture only works from the menu.")
|
||||||
|
}
|
||||||
|
|
||||||
|
if !isSelfTestRun {
|
||||||
|
updateChecker.startSchedule()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Installs the staged update over `/Applications/Redline.app` and relaunches.
|
||||||
|
/// Does nothing unless the user clicked the menu row.
|
||||||
|
public func installUpdate() {
|
||||||
|
updateChecker.installStaged()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// User-initiated appcast check ("Check for updates" menu row).
|
||||||
|
public func checkForUpdates() {
|
||||||
|
Task { @MainActor in
|
||||||
|
await updateChecker.checkNow(manual: true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Reverts `/Applications/Redline.app` to the app-managed rollback copy and relaunches.
|
||||||
|
/// Does nothing unless a `Redline.app.previous` exists and the user clicked the row.
|
||||||
|
public func revertToPreviousVersion() {
|
||||||
|
updateChecker.revertToPrevious()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 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",
|
id: "capture",
|
||||||
keyCode: UInt32(kVK_ANSI_2),
|
keyCode: pref.keyCode,
|
||||||
modifiers: UInt32(optionKey | shiftKey)
|
modifiers: pref.modifiers
|
||||||
) { [weak self] in
|
) { [weak self] in
|
||||||
Task { await self?.captureNow() }
|
Task { await self?.captureNow() }
|
||||||
}
|
}
|
||||||
if !registered {
|
|
||||||
setStatus("⌥⇧2 is already used by another app — capture only works from the menu.")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public func captureNow() async {
|
public func captureNow() async {
|
||||||
@@ -211,6 +411,100 @@ public final class AppModel {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// True when "Start new session" applies: there is something to keep and neither a
|
||||||
|
/// send nor another session start is in flight.
|
||||||
|
public var canStartNewSession: Bool {
|
||||||
|
!session.isEmpty && !isSending && !isStartingNewSession
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Menu "Start new session": keeps the current screenshots as a past session
|
||||||
|
/// (moved into the single archive folder — never deleted) and opens a fresh empty
|
||||||
|
/// session. Session retention (newest 10 kept) is applied inside the store, on
|
||||||
|
/// this path and on the send path alike.
|
||||||
|
public func startNewSession() async {
|
||||||
|
// Re-checked here on the main actor, synchronously, before the first await:
|
||||||
|
// the menu's `.disabled` state cannot stop a Task that was queued just before
|
||||||
|
// a send started.
|
||||||
|
guard !isSending, !isStartingNewSession else {
|
||||||
|
setStatus(isSending ? "Finish the current send first." : "A new session is already being started.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
isStartingNewSession = true
|
||||||
|
defer { isStartingNewSession = false }
|
||||||
|
|
||||||
|
var message: String
|
||||||
|
do {
|
||||||
|
if let archived = try await spool.closeCurrentSession() {
|
||||||
|
let count = archived.captures.count
|
||||||
|
message = "New session — \(count) capture\(count == 1 ? "" : "s") kept as a past session."
|
||||||
|
} else {
|
||||||
|
message = "New session started."
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
message = (error as? ShotdeckError)?.errorDescription ?? "Could not start a new session."
|
||||||
|
}
|
||||||
|
if let refreshProblem = await reloadFromSpool() {
|
||||||
|
message += " \(refreshProblem)"
|
||||||
|
}
|
||||||
|
setStatus(message)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Re-reads the open session and the past-session list from the store. Returns a
|
||||||
|
/// problem description when either read failed (the caller decides how to surface
|
||||||
|
/// it), nil when everything was refreshed — never silently substitutes stale state.
|
||||||
|
func reloadFromSpool() async -> String? {
|
||||||
|
var problems: [String] = []
|
||||||
|
do {
|
||||||
|
replaceSession(try await spool.currentSession())
|
||||||
|
} catch {
|
||||||
|
problems.append(
|
||||||
|
"Could not reload the current session: \((error as? ShotdeckError)?.errorDescription ?? error.localizedDescription)")
|
||||||
|
}
|
||||||
|
do {
|
||||||
|
setPastSessions(try await spool.archivedSessions())
|
||||||
|
} catch {
|
||||||
|
problems.append(
|
||||||
|
"Could not load past sessions: \((error as? ShotdeckError)?.errorDescription ?? error.localizedDescription)")
|
||||||
|
}
|
||||||
|
return problems.isEmpty ? nil : problems.joined(separator: " ")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Where a past session's sent PDF lives now (the outbox in AirDrop mode, the
|
||||||
|
/// OneDrive folder in OneDrive mode), or nil when it was never sent / is gone.
|
||||||
|
public func sentPDFURL(for session: CaptureSession) -> URL? {
|
||||||
|
guard let name = session.pdfFileName else { return nil }
|
||||||
|
let url = outboxURL.appendingPathComponent(name)
|
||||||
|
return FileManager.default.fileExists(atPath: url.path) ? url : nil
|
||||||
|
}
|
||||||
|
|
||||||
|
/// "PDF" action on a past-submission row: reveals the exact PDF that was sent.
|
||||||
|
public func revealSentPDF(_ session: CaptureSession) {
|
||||||
|
guard session.pdfFileName != nil else {
|
||||||
|
setStatus("That session was never sent.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
guard let url = sentPDFURL(for: session) else {
|
||||||
|
setStatus("The PDF is no longer in \(outboxDisplayName).")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
NSWorkspace.shared.activateFileViewerSelecting([url])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// "Captures" action on a past-submission row: reveals that session's folder.
|
||||||
|
public func revealSessionCaptures(_ session: CaptureSession) {
|
||||||
|
let dir = paths.archiveDirectory(session.id)
|
||||||
|
guard FileManager.default.fileExists(atPath: dir.path) else {
|
||||||
|
setStatus("That past session is no longer on disk.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
NSWorkspace.shared.activateFileViewerSelecting([dir])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The single folder every retained session lives in.
|
||||||
|
public func openSessionsFolder() {
|
||||||
|
NSWorkspace.shared.open(paths.archive)
|
||||||
|
}
|
||||||
|
|
||||||
public func copyCommentedLinks() async {
|
public func copyCommentedLinks() async {
|
||||||
do {
|
do {
|
||||||
let text = try await ledger.clipboardText()
|
let text = try await ledger.clipboardText()
|
||||||
@@ -237,6 +531,14 @@ public final class AppModel {
|
|||||||
NSWorkspace.shared.open(url)
|
NSWorkspace.shared.open(url)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static func loadPersistedRegion() -> CaptureRegion? {
|
||||||
|
guard let data = UserDefaults.standard.data(forKey: CaptureRegion.defaultsKey),
|
||||||
|
let decoded = try? JSONDecoder().decode(CaptureRegion.self, from: data),
|
||||||
|
decoded.isStillValid
|
||||||
|
else { return nil }
|
||||||
|
return decoded
|
||||||
|
}
|
||||||
|
|
||||||
private func persistRegion(_ picked: CaptureRegion) {
|
private func persistRegion(_ picked: CaptureRegion) {
|
||||||
replaceRegion(picked)
|
replaceRegion(picked)
|
||||||
if let encoded = try? JSONEncoder().encode(picked) {
|
if let encoded = try? JSONEncoder().encode(picked) {
|
||||||
|
|||||||
@@ -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)"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -15,6 +15,8 @@ struct MenuBarView: View {
|
|||||||
Divider()
|
Divider()
|
||||||
returnsBlock
|
returnsBlock
|
||||||
}
|
}
|
||||||
|
Divider()
|
||||||
|
updateFooter
|
||||||
}
|
}
|
||||||
.padding(10)
|
.padding(10)
|
||||||
.frame(width: 320, alignment: .leading)
|
.frame(width: 320, alignment: .leading)
|
||||||
@@ -49,7 +51,7 @@ struct MenuBarView: View {
|
|||||||
|
|
||||||
private var defaultStatusText: String {
|
private var defaultStatusText: String {
|
||||||
guard let region = model.region else {
|
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 w = Int(region.rect.width)
|
||||||
let h = Int(region.rect.height)
|
let h = Int(region.rect.height)
|
||||||
@@ -74,6 +76,30 @@ struct MenuBarView: View {
|
|||||||
|
|
||||||
private var actionsList: some View {
|
private var actionsList: some View {
|
||||||
VStack(alignment: .leading, spacing: 2) {
|
VStack(alignment: .leading, spacing: 2) {
|
||||||
|
if let update = model.updateAvailable {
|
||||||
|
Button {
|
||||||
|
model.installUpdate()
|
||||||
|
} label: {
|
||||||
|
actionLabel("Update to \(update.version)")
|
||||||
|
.foregroundStyle(Color.accentColor)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Button {
|
||||||
|
model.checkForUpdates()
|
||||||
|
} label: {
|
||||||
|
actionLabel(model.isCheckingForUpdates ? "Checking…" : "Check for updates")
|
||||||
|
}
|
||||||
|
.disabled(model.isCheckingForUpdates)
|
||||||
|
|
||||||
|
if let previous = model.previousVersion {
|
||||||
|
Button {
|
||||||
|
model.revertToPreviousVersion()
|
||||||
|
} label: {
|
||||||
|
actionLabel("Revert to \(previous)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
let anchor = NSApp.keyWindow?.contentView
|
let anchor = NSApp.keyWindow?.contentView
|
||||||
if let sender = model as? SendCapable {
|
if let sender = model as? SendCapable {
|
||||||
@@ -82,14 +108,41 @@ struct MenuBarView: View {
|
|||||||
model.setStatus("Send is not available in this build.")
|
model.setStatus("Send is not available in this build.")
|
||||||
}
|
}
|
||||||
} label: {
|
} label: {
|
||||||
actionLabel("Send…")
|
actionLabel(model.transport == .oneDrive ? "Send to OneDrive" : "Send…")
|
||||||
}
|
}
|
||||||
.disabled(model.session.isEmpty || model.isSending)
|
.disabled(model.session.isEmpty || model.isSending)
|
||||||
|
|
||||||
|
Button {
|
||||||
|
model.revealLastPDF()
|
||||||
|
} label: {
|
||||||
|
actionLabel("Reveal last PDF")
|
||||||
|
}
|
||||||
|
.disabled(!model.canRevealLastPDF)
|
||||||
|
|
||||||
|
Button {
|
||||||
|
Task { await model.startNewSession() }
|
||||||
|
} label: {
|
||||||
|
actionLabel("Start new session")
|
||||||
|
}
|
||||||
|
.disabled(!model.canStartNewSession)
|
||||||
|
|
||||||
|
Button {
|
||||||
|
if let presenter = model as? SubmissionsWindowPresenting {
|
||||||
|
presenter.presentSubmissionsWindow()
|
||||||
|
} else {
|
||||||
|
model.setStatus("Past submissions are not available in this build.")
|
||||||
|
}
|
||||||
|
} label: {
|
||||||
|
actionLabel(
|
||||||
|
"Past submissions…",
|
||||||
|
trailing: model.pastSessions.isEmpty ? nil : "\(model.pastSessions.count)"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
Task { await model.captureNow() }
|
Task { await model.captureNow() }
|
||||||
} label: {
|
} label: {
|
||||||
actionLabel("Capture now", trailing: "⌥⇧2")
|
actionLabel("Capture now", trailing: model.hotkeyDisplayString)
|
||||||
}
|
}
|
||||||
.disabled(model.isCapturing)
|
.disabled(model.isCapturing)
|
||||||
|
|
||||||
@@ -128,7 +181,7 @@ struct MenuBarView: View {
|
|||||||
Button {
|
Button {
|
||||||
NSApp.terminate(nil)
|
NSApp.terminate(nil)
|
||||||
} label: {
|
} label: {
|
||||||
actionLabel("Quit Shotdeck")
|
actionLabel("Quit Redline")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.buttonStyle(.plain)
|
.buttonStyle(.plain)
|
||||||
@@ -177,4 +230,18 @@ struct MenuBarView: View {
|
|||||||
private var newestReturns: [ReturnedDocument] {
|
private var newestReturns: [ReturnedDocument] {
|
||||||
model.allReturns.sorted { $0.detectedAt > $1.detectedAt }
|
model.allReturns.sorted { $0.detectedAt > $1.detectedAt }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private var updateFooter: some View {
|
||||||
|
VStack(alignment: .leading, spacing: 2) {
|
||||||
|
Text("Redline \(model.appVersion)")
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundStyle(.secondary)
|
||||||
|
if let message = model.updateStatusMessage {
|
||||||
|
Text(message)
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundStyle(.secondary)
|
||||||
|
.fixedSize(horizontal: false, vertical: true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,416 @@
|
|||||||
|
import AppKit
|
||||||
|
import CoreGraphics
|
||||||
|
import Darwin
|
||||||
|
import Foundation
|
||||||
|
import ImageIO
|
||||||
|
import PDFKit
|
||||||
|
import SwiftUI
|
||||||
|
import ShotdeckCore
|
||||||
|
|
||||||
|
/// Headless offscreen renderer for `MenuBarView` / `SettingsView`.
|
||||||
|
/// Driven by `SHOTDECK_SNAPSHOT_DIR`; never touches the real Application Support spool.
|
||||||
|
enum PanelSnapshot {
|
||||||
|
private static let panelWidth: CGFloat = 340
|
||||||
|
|
||||||
|
/// Called from `main.swift` before `ShotdeckApp.main()`. Returns immediately when the
|
||||||
|
/// env var is unset; otherwise writes the six panel PNGs, prints each path, and `exit`s.
|
||||||
|
@MainActor
|
||||||
|
static func runIfRequested() {
|
||||||
|
guard let raw = ProcessInfo.processInfo.environment["SHOTDECK_SNAPSHOT_DIR"],
|
||||||
|
!raw.isEmpty
|
||||||
|
else { return }
|
||||||
|
|
||||||
|
let app = NSApplication.shared
|
||||||
|
app.setActivationPolicy(.prohibited)
|
||||||
|
|
||||||
|
Task { @MainActor in
|
||||||
|
do {
|
||||||
|
try await captureAll(to: URL(fileURLWithPath: raw, isDirectory: true))
|
||||||
|
exit(0)
|
||||||
|
} catch {
|
||||||
|
fputs("PanelSnapshot failed: \(error)\n", stderr)
|
||||||
|
exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
app.run()
|
||||||
|
exit(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
private static func captureAll(to directory: URL) async throws {
|
||||||
|
try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
|
||||||
|
|
||||||
|
let (model, root) = try makeIsolatedModel()
|
||||||
|
defer { try? FileManager.default.removeItem(at: root) }
|
||||||
|
|
||||||
|
let region = sampleRegion()
|
||||||
|
|
||||||
|
// Two real past sessions through the REAL store paths (one sent with a PDF in
|
||||||
|
// the outbox, one closed without ever sending) so panel-06b has the exact two
|
||||||
|
// states the Past submissions window must distinguish.
|
||||||
|
try await seedPastSessions(to: model)
|
||||||
|
|
||||||
|
// 01 — Screen Recording missing (no public mutator; snapshot-only seam).
|
||||||
|
model.snapshotSetScreenRecordingGranted(false)
|
||||||
|
model.replaceRegion(nil)
|
||||||
|
try renderMenuBar(model: model, to: directory, name: "01-no-permission")
|
||||||
|
|
||||||
|
// 02 — granted, no region picked.
|
||||||
|
model.snapshotSetScreenRecordingGranted(true)
|
||||||
|
model.replaceRegion(nil)
|
||||||
|
try renderMenuBar(model: model, to: directory, name: "02-no-region")
|
||||||
|
|
||||||
|
// 03 — region set, empty session.
|
||||||
|
model.replaceRegion(region)
|
||||||
|
try renderMenuBar(model: model, to: directory, name: "03-empty-session")
|
||||||
|
|
||||||
|
// 04 — three real PNGs in the temp spool so SessionStrip thumbnails decode.
|
||||||
|
try await addSampleCaptures(to: model)
|
||||||
|
try renderMenuBar(model: model, to: directory, name: "04-captures-present")
|
||||||
|
|
||||||
|
// 05 — two inspected PDFs in the temp ledger, one marked / one not.
|
||||||
|
try await seedReturns(model: model)
|
||||||
|
try renderMenuBar(model: model, to: directory, name: "05-returns-present")
|
||||||
|
|
||||||
|
// 06 — SettingsView against the same isolated model.
|
||||||
|
try render(
|
||||||
|
SettingsView().environment(model),
|
||||||
|
to: directory.appendingPathComponent("panel-06-settings.png")
|
||||||
|
)
|
||||||
|
|
||||||
|
// 06b — Past submissions window against the same isolated model: the two
|
||||||
|
// seeded past sessions plus the live session's three captures from panel 04.
|
||||||
|
model.setPastSessions(try await model.spool.archivedSessions())
|
||||||
|
try render(
|
||||||
|
PastSubmissionsView().environment(model),
|
||||||
|
to: directory.appendingPathComponent("panel-06b-past-submissions.png"),
|
||||||
|
width: 440
|
||||||
|
)
|
||||||
|
|
||||||
|
// 07/08/09 — OneDrive-mode Settings + menu bar, on a SEPARATE isolated model so
|
||||||
|
// this transport switch never bleeds into the AirDrop-mode panels above.
|
||||||
|
try await captureOneDrivePanels(to: directory)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Three real PNGs appended to the given model's temp spool so SessionStrip
|
||||||
|
/// thumbnails decode. Shared by panel 04 (AirDrop) and panel 09 (OneDrive).
|
||||||
|
@MainActor
|
||||||
|
private static func addSampleCaptures(to model: AppModel) async throws {
|
||||||
|
let swatches: [(CGFloat, CGFloat, CGFloat)] = [
|
||||||
|
(0.85, 0.22, 0.18),
|
||||||
|
(0.18, 0.62, 0.32),
|
||||||
|
(0.16, 0.38, 0.82),
|
||||||
|
]
|
||||||
|
for (red, green, blue) in swatches {
|
||||||
|
let png = try makePNGData(width: 192, height: 108, red: red, green: green, blue: blue)
|
||||||
|
_ = try await model.spool.append(
|
||||||
|
pngData: png,
|
||||||
|
pixelWidth: 192,
|
||||||
|
pixelHeight: 108,
|
||||||
|
scale: 2.0,
|
||||||
|
capturedAt: Date()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
model.replaceSession(try await model.spool.currentSession())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Panels 07-09: OneDrive transport, on its own isolated model/temp root so
|
||||||
|
/// switching transport here never touches the AirDrop-mode model above, the real
|
||||||
|
/// home directory, or UserDefaults.standard. The "resolved" and "not found" states
|
||||||
|
/// are produced by calling the real OneDriveLocator functions against fake home
|
||||||
|
/// trees built under this snapshot's own temp root — never a hand-typed path.
|
||||||
|
@MainActor
|
||||||
|
private static func captureOneDrivePanels(to directory: URL) async throws {
|
||||||
|
let (model, root) = try makeIsolatedModel()
|
||||||
|
defer { try? FileManager.default.removeItem(at: root) }
|
||||||
|
model.setTransport(.oneDrive)
|
||||||
|
|
||||||
|
// 07 — a resolved OneDrive folder, shaped like the real default
|
||||||
|
// (…/Library/CloudStorage/OneDrive-MMDGROUP/Redline): a fake home tree with a
|
||||||
|
// real OneDrive-MMDGROUP directory under it, resolved via the same pure
|
||||||
|
// OneDriveLocator function production code uses — never a hand-typed path.
|
||||||
|
let fakeHomeWithOneDrive = root.appendingPathComponent("fake-home-with-onedrive", isDirectory: true)
|
||||||
|
let syncRoot = fakeHomeWithOneDrive
|
||||||
|
.appendingPathComponent("Library/CloudStorage/OneDrive-MMDGROUP", isDirectory: true)
|
||||||
|
try FileManager.default.createDirectory(at: syncRoot, withIntermediateDirectories: true)
|
||||||
|
guard let resolvedFolder = OneDriveLocator.defaultRedlineFolder(
|
||||||
|
home: fakeHomeWithOneDrive, fileManager: .default
|
||||||
|
) else {
|
||||||
|
throw SnapshotError.oneDriveFixtureFailed("fake OneDrive-MMDGROUP root did not resolve")
|
||||||
|
}
|
||||||
|
model.setResolvedOneDriveFolder(resolvedFolder)
|
||||||
|
try render(
|
||||||
|
SettingsView().environment(model),
|
||||||
|
to: directory.appendingPathComponent("panel-07-settings-onedrive.png")
|
||||||
|
)
|
||||||
|
|
||||||
|
// 08 — no OneDrive folder found: a fake home with NO Library/CloudStorage at
|
||||||
|
// all, and a throwaway UserDefaults suite (never .standard, never touched
|
||||||
|
// before) so the stored-override check also legitimately finds nothing.
|
||||||
|
let fakeHomeWithoutOneDrive = root.appendingPathComponent("fake-home-without-onedrive", isDirectory: true)
|
||||||
|
try FileManager.default.createDirectory(at: fakeHomeWithoutOneDrive, withIntermediateDirectories: true)
|
||||||
|
let isolatedDefaults = try makeIsolatedDefaultsSuite()
|
||||||
|
defer { isolatedDefaults.defaults.removePersistentDomain(forName: isolatedDefaults.suiteName) }
|
||||||
|
let missingFolder = OneDriveLocator.resolveOneDriveFolder(
|
||||||
|
defaults: isolatedDefaults.defaults, home: fakeHomeWithoutOneDrive, fileManager: .default
|
||||||
|
)
|
||||||
|
guard missingFolder == nil else {
|
||||||
|
throw SnapshotError.oneDriveFixtureFailed("fake home without OneDrive unexpectedly resolved")
|
||||||
|
}
|
||||||
|
model.setResolvedOneDriveFolder(nil)
|
||||||
|
try render(
|
||||||
|
SettingsView().environment(model),
|
||||||
|
to: directory.appendingPathComponent("panel-08-settings-onedrive-missing.png")
|
||||||
|
)
|
||||||
|
|
||||||
|
// 09 — menu bar panel, 3 captures present, OneDrive mode ("Send to OneDrive").
|
||||||
|
model.snapshotSetScreenRecordingGranted(true)
|
||||||
|
model.replaceRegion(sampleRegion())
|
||||||
|
try await addSampleCaptures(to: model)
|
||||||
|
try renderMenuBar(model: model, to: directory, name: "09-captures-present-onedrive")
|
||||||
|
}
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
private static func seedPastSessions(to model: AppModel) async throws {
|
||||||
|
_ = try await model.spool.append(
|
||||||
|
pngData: try makePNGData(width: 192, height: 108, red: 0.55, green: 0.35, blue: 0.85),
|
||||||
|
pixelWidth: 192, pixelHeight: 108, scale: 2.0, capturedAt: Date())
|
||||||
|
_ = try await model.spool.append(
|
||||||
|
pngData: try makePNGData(width: 192, height: 108, red: 0.25, green: 0.7, blue: 0.6),
|
||||||
|
pixelWidth: 192, pixelHeight: 108, scale: 2.0, capturedAt: Date())
|
||||||
|
let sentName = "Redline-\(DubaiTime.fileStamp(Date())).pdf"
|
||||||
|
_ = try await model.spool.archiveCurrent(pdfFileName: sentName)
|
||||||
|
// The real send writes the PDF to the outbox; the fixture does the same so the
|
||||||
|
// row's PDF action is genuinely live in the snapshot.
|
||||||
|
try Data("%PDF-1.4\n% snapshot fixture\n".utf8).write(
|
||||||
|
to: model.paths.outbox.appendingPathComponent(sentName))
|
||||||
|
|
||||||
|
_ = try await model.spool.append(
|
||||||
|
pngData: try makePNGData(width: 160, height: 90, red: 0.9, green: 0.55, blue: 0.2),
|
||||||
|
pixelWidth: 160, pixelHeight: 90, scale: 2.0, capturedAt: Date())
|
||||||
|
_ = try await model.spool.closeCurrentSession()
|
||||||
|
}
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
private static func renderMenuBar(model: AppModel, to directory: URL, name: String) throws {
|
||||||
|
try render(
|
||||||
|
MenuBarView().environment(model),
|
||||||
|
to: directory.appendingPathComponent("panel-\(name).png")
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
private static func render(_ view: some View, to url: URL, width: CGFloat = panelWidth) throws {
|
||||||
|
let wrapped = view
|
||||||
|
.frame(width: width, alignment: .topLeading)
|
||||||
|
.fixedSize(horizontal: false, vertical: true)
|
||||||
|
.background(Color(nsColor: .windowBackgroundColor))
|
||||||
|
|
||||||
|
let hosting = NSHostingView(rootView: wrapped)
|
||||||
|
hosting.wantsLayer = true
|
||||||
|
hosting.appearance = NSAppearance(named: .aqua)
|
||||||
|
|
||||||
|
let window = NSWindow(
|
||||||
|
contentRect: NSRect(x: -10_000, y: -10_000, width: panelWidth, height: 64),
|
||||||
|
styleMask: [.borderless],
|
||||||
|
backing: .buffered,
|
||||||
|
defer: false
|
||||||
|
)
|
||||||
|
window.isReleasedWhenClosed = false
|
||||||
|
window.appearance = NSAppearance(named: .aqua)
|
||||||
|
window.backgroundColor = .windowBackgroundColor
|
||||||
|
window.isOpaque = true
|
||||||
|
window.alphaValue = 0
|
||||||
|
window.contentView = hosting
|
||||||
|
window.orderBack(nil)
|
||||||
|
|
||||||
|
hosting.layoutSubtreeIfNeeded()
|
||||||
|
var size = hosting.fittingSize
|
||||||
|
if size.height < 1 {
|
||||||
|
size.height = hosting.intrinsicContentSize.height
|
||||||
|
}
|
||||||
|
if size.height < 1 { size.height = 240 }
|
||||||
|
size.width = width
|
||||||
|
size.height = ceil(size.height)
|
||||||
|
|
||||||
|
hosting.setFrameSize(size)
|
||||||
|
window.setContentSize(size)
|
||||||
|
hosting.layoutSubtreeIfNeeded()
|
||||||
|
RunLoop.current.run(until: Date(timeIntervalSinceNow: 0.05))
|
||||||
|
|
||||||
|
let bounds = hosting.bounds
|
||||||
|
guard let rep = hosting.bitmapImageRepForCachingDisplay(in: bounds) else {
|
||||||
|
throw SnapshotError.renderFailed(url.lastPathComponent)
|
||||||
|
}
|
||||||
|
hosting.cacheDisplay(in: bounds, to: rep)
|
||||||
|
guard let png = rep.representation(using: .png, properties: [:]) else {
|
||||||
|
throw SnapshotError.encodeFailed(url.lastPathComponent)
|
||||||
|
}
|
||||||
|
try png.write(to: url)
|
||||||
|
print(url.path)
|
||||||
|
fflush(stdout)
|
||||||
|
|
||||||
|
window.contentView = nil
|
||||||
|
window.close()
|
||||||
|
}
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
private static func makeIsolatedModel() throws -> (model: AppModel, root: URL) {
|
||||||
|
let root = FileManager.default.temporaryDirectory
|
||||||
|
.appendingPathComponent("shotdeck-panel-snapshot-\(UUID().uuidString)", isDirectory: true)
|
||||||
|
let paths = try AppSupportPaths(
|
||||||
|
root: root,
|
||||||
|
outbox: root.appendingPathComponent("outbox", isDirectory: true),
|
||||||
|
watchFolder: root.appendingPathComponent("watch", isDirectory: true)
|
||||||
|
)
|
||||||
|
let ledger = try ReturnLedger(paths: paths)
|
||||||
|
let model = AppModel(
|
||||||
|
paths: paths,
|
||||||
|
spool: try SpoolStore(paths: paths),
|
||||||
|
composer: PDFComposer(),
|
||||||
|
capturer: ScreenCapturer(),
|
||||||
|
hotkeys: HotkeyCenter(),
|
||||||
|
picker: RegionPickerController(),
|
||||||
|
ledger: ledger,
|
||||||
|
watcher: ReturnWatcher(paths: paths, ledger: ledger)
|
||||||
|
)
|
||||||
|
model.setFolderURLs(outbox: paths.outbox, watch: paths.watchFolder)
|
||||||
|
return (model, root)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A throwaway UserDefaults suite — never `.standard` — for the panel-08 fixture,
|
||||||
|
/// the same isolation pattern ShotdeckCoreTests uses for TransportSettings/
|
||||||
|
/// OneDriveLocator tests.
|
||||||
|
private struct IsolatedDefaultsSuite {
|
||||||
|
let suiteName: String
|
||||||
|
let defaults: UserDefaults
|
||||||
|
}
|
||||||
|
|
||||||
|
private static func makeIsolatedDefaultsSuite() throws -> IsolatedDefaultsSuite {
|
||||||
|
let suiteName = "shotdeck-panel-snapshot-\(UUID().uuidString)"
|
||||||
|
guard let defaults = UserDefaults(suiteName: suiteName) else {
|
||||||
|
throw SnapshotError.oneDriveFixtureFailed("could not create isolated UserDefaults suite")
|
||||||
|
}
|
||||||
|
defaults.removePersistentDomain(forName: suiteName)
|
||||||
|
return IsolatedDefaultsSuite(suiteName: suiteName, defaults: defaults)
|
||||||
|
}
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
private static func seedReturns(model: AppModel) async throws {
|
||||||
|
let watch = model.paths.watchFolder
|
||||||
|
let unmarkedURL = watch.appendingPathComponent("Shotdeck-20260901-120000.pdf")
|
||||||
|
let markedURL = watch.appendingPathComponent("Shotdeck-20260901-120100.pdf")
|
||||||
|
try writeShotdeckPDF(to: unmarkedURL, marked: false)
|
||||||
|
try writeShotdeckPDF(to: markedURL, marked: true)
|
||||||
|
|
||||||
|
let unmarked = try AnnotationInspector.inspect(fileURL: unmarkedURL)
|
||||||
|
let marked = try AnnotationInspector.inspect(fileURL: markedURL)
|
||||||
|
try await model.ledger.record(unmarked)
|
||||||
|
try await model.ledger.record(marked)
|
||||||
|
model.setReturns(
|
||||||
|
all: try await model.ledger.all(),
|
||||||
|
commented: try await model.ledger.commented()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
private static func sampleRegion() -> CaptureRegion {
|
||||||
|
CaptureRegion(
|
||||||
|
displayID: CGMainDisplayID(),
|
||||||
|
rect: CGRect(x: 120, y: 80, width: 800, height: 600),
|
||||||
|
capturedScale: 2.0
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
private static func makePNGData(
|
||||||
|
width: Int,
|
||||||
|
height: Int,
|
||||||
|
red: CGFloat,
|
||||||
|
green: CGFloat,
|
||||||
|
blue: CGFloat
|
||||||
|
) throws -> Data {
|
||||||
|
let colorSpace = CGColorSpaceCreateDeviceRGB()
|
||||||
|
guard let context = CGContext(
|
||||||
|
data: nil,
|
||||||
|
width: width,
|
||||||
|
height: height,
|
||||||
|
bitsPerComponent: 8,
|
||||||
|
bytesPerRow: width * 4,
|
||||||
|
space: colorSpace,
|
||||||
|
bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue
|
||||||
|
) else {
|
||||||
|
throw SnapshotError.pngGenerationFailed
|
||||||
|
}
|
||||||
|
context.setFillColor(red: red, green: green, blue: blue, alpha: 1)
|
||||||
|
context.fill(CGRect(x: 0, y: 0, width: width, height: height))
|
||||||
|
guard let image = context.makeImage() else {
|
||||||
|
throw SnapshotError.pngGenerationFailed
|
||||||
|
}
|
||||||
|
let buffer = NSMutableData()
|
||||||
|
guard let destination = CGImageDestinationCreateWithData(
|
||||||
|
buffer,
|
||||||
|
"public.png" as CFString,
|
||||||
|
1,
|
||||||
|
nil
|
||||||
|
) else {
|
||||||
|
throw SnapshotError.pngGenerationFailed
|
||||||
|
}
|
||||||
|
CGImageDestinationAddImage(destination, image, nil)
|
||||||
|
guard CGImageDestinationFinalize(destination) else {
|
||||||
|
throw SnapshotError.pngGenerationFailed
|
||||||
|
}
|
||||||
|
return buffer as Data
|
||||||
|
}
|
||||||
|
|
||||||
|
private static func writeShotdeckPDF(to url: URL, marked: Bool) throws {
|
||||||
|
let document = PDFDocument()
|
||||||
|
let page = PDFPage()
|
||||||
|
page.setBounds(CGRect(x: 0, y: 0, width: 612, height: 792), for: .mediaBox)
|
||||||
|
document.insert(page, at: 0)
|
||||||
|
document.documentAttributes = [
|
||||||
|
PDFDocumentAttribute.creatorAttribute: "Shotdeck",
|
||||||
|
PDFDocumentAttribute.subjectAttribute: UUID().uuidString,
|
||||||
|
]
|
||||||
|
if marked {
|
||||||
|
let annotation = PDFAnnotation(
|
||||||
|
bounds: CGRect(x: 72, y: 400, width: 220, height: 36),
|
||||||
|
forType: .highlight,
|
||||||
|
withProperties: nil
|
||||||
|
)
|
||||||
|
page.addAnnotation(annotation)
|
||||||
|
}
|
||||||
|
guard document.write(to: url) else {
|
||||||
|
throw SnapshotError.pdfWriteFailed(url.lastPathComponent)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extension AppModel {
|
||||||
|
/// `screenRecordingGranted` is `public private(set)` with no seam mutator.
|
||||||
|
/// Snapshot-only: the KeyPath setter exists at runtime; compile-time access is file-private.
|
||||||
|
func snapshotSetScreenRecordingGranted(_ granted: Bool) {
|
||||||
|
// private(set) types this as KeyPath; the setter still exists on the @Observable storage.
|
||||||
|
let writable: ReferenceWritableKeyPath<AppModel, Bool> = unsafeBitCast(
|
||||||
|
\AppModel.screenRecordingGranted, to: ReferenceWritableKeyPath<AppModel, Bool>.self
|
||||||
|
)
|
||||||
|
self[keyPath: writable] = granted
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private enum SnapshotError: Error, CustomStringConvertible {
|
||||||
|
case renderFailed(String)
|
||||||
|
case encodeFailed(String)
|
||||||
|
case pngGenerationFailed
|
||||||
|
case pdfWriteFailed(String)
|
||||||
|
case oneDriveFixtureFailed(String)
|
||||||
|
|
||||||
|
var description: String {
|
||||||
|
switch self {
|
||||||
|
case .renderFailed(let name): return "bitmapImageRepForCachingDisplay failed for \(name)"
|
||||||
|
case .encodeFailed(let name): return "PNG encode failed for \(name)"
|
||||||
|
case .pngGenerationFailed: return "CoreGraphics PNG generation failed"
|
||||||
|
case .pdfWriteFailed(let name): return "could not write \(name)"
|
||||||
|
case .oneDriveFixtureFailed(let detail): return "OneDrive snapshot fixture failed: \(detail)"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,146 @@
|
|||||||
|
import AppKit
|
||||||
|
import SwiftUI
|
||||||
|
import ShotdeckCore
|
||||||
|
|
||||||
|
/// "Past submissions…" window: every retained session and what was sent for it.
|
||||||
|
/// Read-and-reveal only — keeping/starting sessions is driven from the menu rows
|
||||||
|
/// (and the button on the current-session row below).
|
||||||
|
struct PastSubmissionsView: View {
|
||||||
|
@Environment(AppModel.self) private var model
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
VStack(alignment: .leading, spacing: 8) {
|
||||||
|
currentSessionRow
|
||||||
|
Divider()
|
||||||
|
if model.pastSessions.isEmpty {
|
||||||
|
Text("No past sessions yet. Use “Start new session” to keep the current captures.")
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundStyle(.secondary)
|
||||||
|
.fixedSize(horizontal: false, vertical: true)
|
||||||
|
} else {
|
||||||
|
ScrollView {
|
||||||
|
VStack(alignment: .leading, spacing: 6) {
|
||||||
|
ForEach(model.pastSessions) { session in
|
||||||
|
PastSessionRow(session: session)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.frame(maxHeight: 320)
|
||||||
|
}
|
||||||
|
Divider()
|
||||||
|
footer
|
||||||
|
}
|
||||||
|
.padding(10)
|
||||||
|
.frame(width: 420, alignment: .leading)
|
||||||
|
.controlSize(.small)
|
||||||
|
.task {
|
||||||
|
if let problem = await model.reloadFromSpool() {
|
||||||
|
model.setStatus(problem)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private var currentSessionRow: some View {
|
||||||
|
HStack(alignment: .center, spacing: 8) {
|
||||||
|
VStack(alignment: .leading, spacing: 2) {
|
||||||
|
Text("Current session")
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundStyle(.secondary)
|
||||||
|
Text(currentSessionSummary)
|
||||||
|
.fixedSize(horizontal: false, vertical: true)
|
||||||
|
}
|
||||||
|
Spacer(minLength: 8)
|
||||||
|
Button("Start new session") {
|
||||||
|
Task { await model.startNewSession() }
|
||||||
|
}
|
||||||
|
.disabled(!model.canStartNewSession)
|
||||||
|
.help("Keeps these captures as a past session and starts a fresh one.")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private var currentSessionSummary: String {
|
||||||
|
let count = model.session.captures.count
|
||||||
|
if count == 0 {
|
||||||
|
return "Nothing captured yet."
|
||||||
|
}
|
||||||
|
return "\(count) capture\(count == 1 ? "" : "s") · started \(DubaiTime.stamp(model.session.createdAt))"
|
||||||
|
}
|
||||||
|
|
||||||
|
private var footer: some View {
|
||||||
|
HStack(spacing: 8) {
|
||||||
|
Text("Sessions are kept in one folder — the newest \(SpoolStore.defaultRetainedSessionCount).")
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundStyle(.secondary)
|
||||||
|
.fixedSize(horizontal: false, vertical: true)
|
||||||
|
Spacer(minLength: 8)
|
||||||
|
Button("Open sessions folder") {
|
||||||
|
model.openSessionsFolder()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private struct PastSessionRow: View {
|
||||||
|
@Environment(AppModel.self) private var model
|
||||||
|
let session: CaptureSession
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
HStack(alignment: .center, spacing: 8) {
|
||||||
|
VStack(alignment: .leading, spacing: 2) {
|
||||||
|
Text(DubaiTime.stamp(session.createdAt))
|
||||||
|
Text(submissionLabel)
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundStyle(session.pdfFileName == nil ? .secondary : .primary)
|
||||||
|
.lineLimit(1)
|
||||||
|
}
|
||||||
|
Spacer(minLength: 8)
|
||||||
|
Button("PDF") {
|
||||||
|
model.revealSentPDF(session)
|
||||||
|
}
|
||||||
|
.disabled(model.sentPDFURL(for: session) == nil)
|
||||||
|
.help(pdfHelpText)
|
||||||
|
Button("Captures") {
|
||||||
|
model.revealSessionCaptures(session)
|
||||||
|
}
|
||||||
|
.help("Reveal this session's screenshots")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private var pdfHelpText: String {
|
||||||
|
guard let name = session.pdfFileName else { return "This session was never sent." }
|
||||||
|
guard model.sentPDFURL(for: session) != nil else {
|
||||||
|
return "The PDF \(name) is no longer in the output folder."
|
||||||
|
}
|
||||||
|
return "Reveal \(name)"
|
||||||
|
}
|
||||||
|
|
||||||
|
private var submissionLabel: String {
|
||||||
|
let pages = "\(session.captures.count) page\(session.captures.count == 1 ? "" : "s")"
|
||||||
|
guard let name = session.pdfFileName else {
|
||||||
|
return "\(pages) · not sent"
|
||||||
|
}
|
||||||
|
return "\(pages) · sent as \(name)"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extension AppModel: SubmissionsWindowPresenting {
|
||||||
|
private static var submissionsWindowController: NSWindowController?
|
||||||
|
|
||||||
|
public func presentSubmissionsWindow() {
|
||||||
|
if let existing = Self.submissionsWindowController {
|
||||||
|
existing.window?.makeKeyAndOrderFront(nil)
|
||||||
|
NSApp.activate()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
let hosting = NSHostingController(rootView: PastSubmissionsView().environment(self))
|
||||||
|
let window = NSWindow(contentViewController: hosting)
|
||||||
|
window.title = "Redline — Past submissions"
|
||||||
|
window.styleMask = [.titled, .closable]
|
||||||
|
window.isReleasedWhenClosed = false
|
||||||
|
window.center()
|
||||||
|
let controller = NSWindowController(window: window)
|
||||||
|
Self.submissionsWindowController = controller
|
||||||
|
controller.showWindow(nil)
|
||||||
|
NSApp.activate()
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -48,20 +48,27 @@ public final class RegionPickerController {
|
|||||||
matching: [.leftMouseDown, .leftMouseDragged, .leftMouseUp, .keyDown]
|
matching: [.leftMouseDown, .leftMouseDragged, .leftMouseUp, .keyDown]
|
||||||
) { [weak self] event in
|
) { [weak self] event in
|
||||||
guard let self else { return event }
|
guard let self else { return event }
|
||||||
// NSEvent is not Sendable; lift the two Sendable fields the handler
|
// NSEvent is not Sendable; lift Sendable fields the handler needs.
|
||||||
// needs. Mouse geometry is read from NSEvent.mouseLocation on the
|
// Prefer the event's window-local point converted to global AppKit
|
||||||
// main thread inside the isolated methods, per spec.
|
// coordinates; NSEvent.mouseLocation is only a fallback.
|
||||||
|
// keyCode is only valid on key events — reading it on a mouse event raises.
|
||||||
let type = event.type
|
let type = event.type
|
||||||
let keyCode = event.keyCode
|
let keyCode: UInt16 = (type == .keyDown) ? event.keyCode : 0
|
||||||
|
let locationInWindow = event.locationInWindow
|
||||||
|
let windowNumber = event.windowNumber
|
||||||
let consume = MainActor.assumeIsolated {
|
let consume = MainActor.assumeIsolated {
|
||||||
self.handle(type: type, keyCode: keyCode)
|
let location = self.globalAppKitLocation(
|
||||||
|
locationInWindow: locationInWindow,
|
||||||
|
windowNumber: windowNumber
|
||||||
|
)
|
||||||
|
return self.handle(type: type, keyCode: keyCode, location: location)
|
||||||
}
|
}
|
||||||
return consume ? nil : event
|
return consume ? nil : event
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Returns `true` when the event should be swallowed.
|
/// Returns `true` when the event should be swallowed.
|
||||||
private func handle(type: NSEvent.EventType, keyCode: UInt16) -> Bool {
|
private func handle(type: NSEvent.EventType, keyCode: UInt16, location: NSPoint?) -> Bool {
|
||||||
switch type {
|
switch type {
|
||||||
case .keyDown:
|
case .keyDown:
|
||||||
if keyCode == 53 { // kVK_Escape
|
if keyCode == 53 { // kVK_Escape
|
||||||
@@ -70,21 +77,21 @@ public final class RegionPickerController {
|
|||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
case .leftMouseDown:
|
case .leftMouseDown:
|
||||||
handleMouseDown()
|
handleMouseDown(location: location)
|
||||||
return false
|
return false
|
||||||
case .leftMouseDragged:
|
case .leftMouseDragged:
|
||||||
handleMouseDragged()
|
handleMouseDragged(location: location)
|
||||||
return false
|
return false
|
||||||
case .leftMouseUp:
|
case .leftMouseUp:
|
||||||
handleMouseUp()
|
handleMouseUp(location: location)
|
||||||
return false
|
return false
|
||||||
default:
|
default:
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private func handleMouseDown() {
|
private func handleMouseDown(location: NSPoint?) {
|
||||||
let point = NSEvent.mouseLocation
|
let point = location ?? NSEvent.mouseLocation
|
||||||
dragStart = point
|
dragStart = point
|
||||||
startScreen = NSScreen.screens.first(where: { $0.frame.contains(point) })
|
startScreen = NSScreen.screens.first(where: { $0.frame.contains(point) })
|
||||||
?? NSScreen.screens.first
|
?? NSScreen.screens.first
|
||||||
@@ -99,17 +106,17 @@ public final class RegionPickerController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private func handleMouseDragged() {
|
private func handleMouseDragged(location: NSPoint?) {
|
||||||
guard dragStart != nil, startScreen != nil else { return }
|
guard dragStart != nil, startScreen != nil else { return }
|
||||||
applyLiveSelection()
|
applyLiveSelection(current: location)
|
||||||
}
|
}
|
||||||
|
|
||||||
private func handleMouseUp() {
|
private func handleMouseUp(location: NSPoint?) {
|
||||||
guard let startScreen else {
|
guard let startScreen else {
|
||||||
dragStart = nil
|
dragStart = nil
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
guard let rect = currentClampedRect(), rect.width >= 8, rect.height >= 8 else {
|
guard let rect = currentClampedRect(current: location), rect.width >= 8, rect.height >= 8 else {
|
||||||
// Mis-click: reset drag state, leave every window open and fully dimmed.
|
// Mis-click: reset drag state, leave every window open and fully dimmed.
|
||||||
dragStart = nil
|
dragStart = nil
|
||||||
self.startScreen = nil
|
self.startScreen = nil
|
||||||
@@ -122,8 +129,8 @@ public final class RegionPickerController {
|
|||||||
finish(region: region)
|
finish(region: region)
|
||||||
}
|
}
|
||||||
|
|
||||||
private func applyLiveSelection() {
|
private func applyLiveSelection(current: NSPoint?) {
|
||||||
guard let startScreen, let rect = currentClampedRect() else { return }
|
guard let startScreen, let rect = currentClampedRect(current: current) else { return }
|
||||||
let local = Self.localRect(from: rect, on: startScreen)
|
let local = Self.localRect(from: rect, on: startScreen)
|
||||||
let text = "\(Int(rect.width)) x \(Int(rect.height))"
|
let text = "\(Int(rect.width)) x \(Int(rect.height))"
|
||||||
window(for: startScreen)?.updateSelection(localRect: local, sizeText: text)
|
window(for: startScreen)?.updateSelection(localRect: local, sizeText: text)
|
||||||
@@ -134,9 +141,9 @@ public final class RegionPickerController {
|
|||||||
|
|
||||||
/// Normalize the drag (so bottom-right → up-left is not misjudged) then clamp
|
/// Normalize the drag (so bottom-right → up-left is not misjudged) then clamp
|
||||||
/// to the screen the gesture started on — never selects across displays.
|
/// to the screen the gesture started on — never selects across displays.
|
||||||
private func currentClampedRect() -> CGRect? {
|
private func currentClampedRect(current: NSPoint?) -> CGRect? {
|
||||||
guard let dragStart, let startScreen else { return nil }
|
guard let dragStart, let startScreen else { return nil }
|
||||||
let current = NSEvent.mouseLocation
|
let current = current ?? NSEvent.mouseLocation
|
||||||
let normalized = CGRect(
|
let normalized = CGRect(
|
||||||
x: min(dragStart.x, current.x),
|
x: min(dragStart.x, current.x),
|
||||||
y: min(dragStart.y, current.y),
|
y: min(dragStart.y, current.y),
|
||||||
@@ -146,6 +153,21 @@ public final class RegionPickerController {
|
|||||||
return normalized.intersection(startScreen.frame)
|
return normalized.intersection(startScreen.frame)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Convert a monitored event's `locationInWindow` into global AppKit coordinates
|
||||||
|
/// (bottom-left origin, matching `NSEvent.mouseLocation` / `NSScreen.frame`).
|
||||||
|
private func globalAppKitLocation(locationInWindow: NSPoint, windowNumber: Int) -> NSPoint? {
|
||||||
|
if let window = windows.first(where: { $0.windowNumber == windowNumber }) {
|
||||||
|
return window.convertPoint(toScreen: locationInWindow)
|
||||||
|
}
|
||||||
|
if windowNumber != 0, let window = NSApp.window(withWindowNumber: windowNumber) {
|
||||||
|
return window.convertPoint(toScreen: locationInWindow)
|
||||||
|
}
|
||||||
|
if windowNumber == 0 {
|
||||||
|
return locationInWindow
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
private func window(for screen: NSScreen) -> RegionPickerWindow? {
|
private func window(for screen: NSScreen) -> RegionPickerWindow? {
|
||||||
windows.first { $0.coveringScreen === screen }
|
windows.first { $0.coveringScreen === screen }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ final class RegionPickerWindow: NSPanel {
|
|||||||
becomesKeyOnlyIfNeeded = false
|
becomesKeyOnlyIfNeeded = false
|
||||||
animationBehavior = .none
|
animationBehavior = .none
|
||||||
collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .stationary]
|
collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .stationary]
|
||||||
|
acceptsMouseMovedEvents = true
|
||||||
contentView = pickerView
|
contentView = pickerView
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,6 +54,8 @@ private final class RegionPickerView: NSView {
|
|||||||
|
|
||||||
override var isOpaque: Bool { false }
|
override var isOpaque: Bool { false }
|
||||||
override var acceptsFirstResponder: Bool { true }
|
override var acceptsFirstResponder: Bool { true }
|
||||||
|
// Accessory-app trap: first click on an inactive overlay is first-mouse and is dropped unless accepted.
|
||||||
|
override func acceptsFirstMouse(for event: NSEvent?) -> Bool { true }
|
||||||
|
|
||||||
override func draw(_ dirtyRect: NSRect) {
|
override func draw(_ dirtyRect: NSRect) {
|
||||||
super.draw(dirtyRect)
|
super.draw(dirtyRect)
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
import AppKit
|
||||||
|
import SwiftUI
|
||||||
|
import ShotdeckCore
|
||||||
|
|
||||||
|
func newestReturnsForDisplay(_ returns: [ReturnedDocument], limit: Int = 8) -> [ReturnedDocument] {
|
||||||
|
Array(returns.sorted { $0.detectedAt > $1.detectedAt }.prefix(limit))
|
||||||
|
}
|
||||||
|
|
||||||
|
func returnMarkLabel(_ document: ReturnedDocument) -> String {
|
||||||
|
guard document.isCommented else { return "not marked" }
|
||||||
|
let count = document.annotatedPages.count
|
||||||
|
return "\(count) page\(count == 1 ? "" : "s") marked"
|
||||||
|
}
|
||||||
|
|
||||||
|
struct ReturnsList: View {
|
||||||
|
let returns: [ReturnedDocument]
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
let visible = newestReturnsForDisplay(returns)
|
||||||
|
if visible.isEmpty {
|
||||||
|
EmptyView()
|
||||||
|
} else {
|
||||||
|
VStack(alignment: .leading, spacing: 4) {
|
||||||
|
Text("Came back from your device")
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundStyle(.secondary)
|
||||||
|
ForEach(visible) { document in
|
||||||
|
Button {
|
||||||
|
NSWorkspace.shared.activateFileViewerSelecting([document.fileURL])
|
||||||
|
} label: {
|
||||||
|
HStack(spacing: 8) {
|
||||||
|
Text(document.fileURL.lastPathComponent)
|
||||||
|
.lineLimit(1)
|
||||||
|
Spacer(minLength: 8)
|
||||||
|
Text(returnMarkLabel(document))
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundStyle(document.isCommented ? .primary : .secondary)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.buttonStyle(.plain)
|
||||||
|
.help(DubaiTime.stamp(document.detectedAt))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extension AppModel: ReturnsSectionProviding {
|
||||||
|
public func returnsSection() -> AnyView {
|
||||||
|
guard !allReturns.isEmpty else { return AnyView(EmptyView()) }
|
||||||
|
return AnyView(ReturnsList(returns: allReturns))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,69 +3,225 @@ import Darwin
|
|||||||
import Foundation
|
import Foundation
|
||||||
import ShotdeckCore
|
import ShotdeckCore
|
||||||
|
|
||||||
|
/// Result of composing a send PDF. Kept so the self-test can drive the share
|
||||||
|
/// outcome without presenting a real AirDrop sheet.
|
||||||
|
struct ComposedSend: Sendable {
|
||||||
|
let fileName: String
|
||||||
|
let fileURL: URL
|
||||||
|
let pageCount: Int
|
||||||
|
}
|
||||||
|
|
||||||
extension AppModel: SendCapable {
|
extension AppModel: SendCapable {
|
||||||
public func send(anchor: NSView?) async {
|
public func send(anchor: NSView?) async {
|
||||||
guard !session.isEmpty, !isSending else { return }
|
guard !session.isEmpty, !isSending else { return }
|
||||||
|
// Same synchronous guard as AppModel.startNewSession(): refuse while a session
|
||||||
|
// start is mid-flight, instead of composing from a session directory that is
|
||||||
|
// being renamed into the archive.
|
||||||
|
guard !isStartingNewSession else {
|
||||||
|
setStatus("Finish starting the new session first.")
|
||||||
|
return
|
||||||
|
}
|
||||||
setSending(true)
|
setSending(true)
|
||||||
defer { setSending(false) }
|
|
||||||
|
|
||||||
|
// Wait for any IN-FLIGHT transport/folder reconcile (chooseTransport/
|
||||||
|
// chooseOneDriveFolder in SettingsView.swift) to fully settle BEFORE
|
||||||
|
// snapshotting transport/folder below. Without this, a toggle immediately
|
||||||
|
// followed by Send could let send() read a state that is still mid-transition
|
||||||
|
// — e.g. the watcher's recordUncommented flag briefly lagging the just-chosen
|
||||||
|
// transport, so a freshly-sent unmarked OneDrive PDF gets misreported as an
|
||||||
|
// already-returned document. `Task<Void, Never>.value` never throws, and
|
||||||
|
// awaiting nil is an immediate no-op (AirDrop mode, or no toggle in flight).
|
||||||
|
await pendingReconcileTask?.value
|
||||||
|
|
||||||
|
// Snapshot BOTH the transport AND the destination folder into local `let`s
|
||||||
|
// ONCE, before any further `await` in this function. chooseTransport/
|
||||||
|
// chooseOneDriveFolder also refuse outright (status "Finish the current send
|
||||||
|
// first.") while isSending is true, but this snapshot is the actual fix for the
|
||||||
|
// send-vs-switch race: even without that guard, everything below operates on
|
||||||
|
// these frozen values — composePDFForSend(outbox:transport:) takes both as
|
||||||
|
// parameters and never re-reads `self.outboxURL`/`self.transport` after a
|
||||||
|
// suspension point, so a concurrent transport switch mid-send can no longer
|
||||||
|
// land the PDF under one transport's folder while the archive/status branch
|
||||||
|
// runs the other's.
|
||||||
|
let transport = TransportSettings.transport()
|
||||||
|
let destinationFolder: URL
|
||||||
|
|
||||||
|
// OneDrive mode: verify the real destination exists, is writable, AND actually
|
||||||
|
// accepts a real write RIGHT NOW, before composing anything. `isWritableDirectory`
|
||||||
|
// alone is not enough — a OneDrive Files-On-Demand directory whose provider
|
||||||
|
// domain is signed out can report as existing and POSIX-writable while an
|
||||||
|
// actual write fails, so `probeWritable` writes-fsyncs-removes a tiny real probe
|
||||||
|
// file to catch that. `outboxURL` is kept in sync with the resolved OneDrive
|
||||||
|
// folder by bootstrap/chooseTransport/chooseOneDriveFolder, but this is
|
||||||
|
// re-resolved fresh here (never trusted stale) so a folder that vanished or lost
|
||||||
|
// its permissions since then (OneDrive signed out, external volume unmounted,
|
||||||
|
// folder deleted, chmod'd unwritable) is caught instead of silently attempted
|
||||||
|
// and surfacing as a generic PDF-composition failure.
|
||||||
|
if transport == .oneDrive {
|
||||||
|
guard let folder = OneDriveLocator.resolveOneDriveFolder(),
|
||||||
|
OneDriveLocator.isWritableDirectory(at: folder),
|
||||||
|
OneDriveLocator.probeWritable(at: folder)
|
||||||
|
else {
|
||||||
|
let path = OneDriveLocator.resolveOneDriveFolder()?.path
|
||||||
|
?? TransportSettings.storedOneDriveFolderPath()
|
||||||
|
?? "no OneDrive folder found"
|
||||||
|
setResolvedOneDriveFolder(nil)
|
||||||
|
setStatus(ShotdeckError.oneDriveFolderUnavailable(path: path).errorDescription)
|
||||||
|
setSending(false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
destinationFolder = folder
|
||||||
|
setResolvedOneDriveFolder(folder)
|
||||||
|
if outboxURL != folder || watchFolderURL != folder {
|
||||||
|
setFolderURLs(outbox: folder, watch: folder)
|
||||||
|
try? await watcher.updateWatchFolder(folder)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
destinationFolder = outboxURL
|
||||||
|
}
|
||||||
|
|
||||||
|
let pending: ComposedSend
|
||||||
|
do {
|
||||||
|
pending = try await composePDFForSend(outbox: destinationFolder, transport: transport)
|
||||||
|
} catch {
|
||||||
|
// Never unlink the published PDF, and never unlink the temp file either:
|
||||||
|
// a rename failure would leave the complete document at the temp name.
|
||||||
|
setStatus((error as? ShotdeckError)?.errorDescription ?? "The PDF could not be built.")
|
||||||
|
setSending(false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
switch transport {
|
||||||
|
case .oneDrive:
|
||||||
|
// No AirDrop, no anchor needed — the PDF is already in the watched
|
||||||
|
// OneDrive folder. Archive immediately; the iPad marks it up in place.
|
||||||
|
let pageWord = pending.pageCount == 1 ? "page" : "pages"
|
||||||
|
await handleDidShareItems(
|
||||||
|
fileName: pending.fileName,
|
||||||
|
sentSummary: "Saved to OneDrive — \(pending.pageCount) \(pageWord). Open it in Files on your iPad."
|
||||||
|
)
|
||||||
|
setSending(false)
|
||||||
|
|
||||||
|
case .airDrop:
|
||||||
|
guard let anchor else {
|
||||||
|
handleDidFailToShareItems(fileName: pending.fileName)
|
||||||
|
setSending(false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
do {
|
||||||
|
try Sharing.airDrop(fileURL: pending.fileURL, from: anchor) { [weak self] success in
|
||||||
|
guard let self else { return }
|
||||||
|
if success {
|
||||||
|
let pageWord = pending.pageCount == 1 ? "page" : "pages"
|
||||||
|
await self.handleDidShareItems(
|
||||||
|
fileName: pending.fileName,
|
||||||
|
sentSummary: "Sent — \(pending.pageCount) \(pageWord)."
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
self.handleDidFailToShareItems(fileName: pending.fileName)
|
||||||
|
}
|
||||||
|
self.setSending(false)
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// canPerform false, no service, or no visible window: same as cancel.
|
||||||
|
handleDidFailToShareItems(fileName: pending.fileName)
|
||||||
|
setSending(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Writes the PDF to `outboxDir` and records its path. Does not archive the session
|
||||||
|
/// and does not present AirDrop — that happens only after the share completes.
|
||||||
|
/// `outboxDir`/`transport` are passed in (values `send(anchor:)` snapshotted before
|
||||||
|
/// any await) rather than read from `self.outboxURL`/`self.transport` here, so a
|
||||||
|
/// concurrent transport switch mid-send can never redirect an in-flight compose to
|
||||||
|
/// a different folder. A write/rename failure specifically at the destination
|
||||||
|
/// folder (as opposed to composer.compose()'s own session/image-content failures)
|
||||||
|
/// is reported as `oneDriveFolderUnavailable` rather than the generic
|
||||||
|
/// `pdfCompositionFailed` when `transport == .oneDrive` — the File Provider edge
|
||||||
|
/// case where the folder looked writable moments ago in `send(anchor:)` but the
|
||||||
|
/// actual write still failed (e.g. OneDrive signed out mid-write).
|
||||||
|
func composePDFForSend(outbox outboxDir: URL, transport: SendTransport) async throws -> ComposedSend {
|
||||||
let workingSession = session
|
let workingSession = session
|
||||||
let composer = self.composer
|
let composer = self.composer
|
||||||
// Live outbox (FolderSettings), not `paths.outbox` — Settings changes take effect.
|
|
||||||
let outboxDir = outboxURL
|
|
||||||
let sourceDir = paths.sessionDirectory(workingSession.id)
|
let sourceDir = paths.sessionDirectory(workingSession.id)
|
||||||
let fileName = PDFComposer.fileName(for: workingSession)
|
let fileName = PDFComposer.fileName(for: workingSession)
|
||||||
let finalURL = outboxDir.appendingPathComponent(fileName)
|
let finalURL = outboxDir.appendingPathComponent(fileName)
|
||||||
// Same directory as the final target so the rename below is same-volume (atomic).
|
// Same directory as the final target so the rename below is same-volume (atomic).
|
||||||
let tempURL = outboxDir.appendingPathComponent(".shotdeck-\(UUID().uuidString).pdf")
|
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
|
||||||
// D-13: build off the main actor. Only Sendable values cross into the
|
// detached task — never `anchor` (NSView is not Sendable).
|
||||||
// detached task — never `anchor` (NSView is not Sendable).
|
try await Task.detached(priority: .userInitiated) {
|
||||||
try await Task.detached(priority: .userInitiated) {
|
_ = try composer.compose(
|
||||||
_ = try composer.compose(
|
session: workingSession,
|
||||||
session: workingSession,
|
imageURL: { capture in sourceDir.appendingPathComponent(capture.fileName) },
|
||||||
imageURL: { capture in sourceDir.appendingPathComponent(capture.fileName) },
|
title: title,
|
||||||
title: title,
|
to: tempURL
|
||||||
to: tempURL
|
)
|
||||||
)
|
// POSIX rename onto `finalURL` replaces any same-name file in one
|
||||||
// POSIX rename onto `finalURL` replaces any same-name file in one
|
// directory operation; there is never a window where the PDF is gone.
|
||||||
// directory operation; there is never a window where the PDF is gone.
|
if Darwin.rename(tempURL.path, finalURL.path) != 0 {
|
||||||
if Darwin.rename(tempURL.path, finalURL.path) != 0 {
|
if transport == .oneDrive {
|
||||||
throw ShotdeckError.pdfCompositionFailed(
|
throw ShotdeckError.oneDriveFolderUnavailable(path: outboxDir.path)
|
||||||
reason: "could not publish the PDF: \(String(cString: strerror(errno)))"
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
try AtomicFile.fsyncDirectory(at: outboxDir)
|
throw ShotdeckError.pdfCompositionFailed(
|
||||||
}.value
|
reason: "could not publish the PDF: \(String(cString: strerror(errno)))"
|
||||||
|
)
|
||||||
// File exists on disk now — archive only after that (D-13). A later AirDrop
|
|
||||||
// failure never deletes this file.
|
|
||||||
guard FileManager.default.fileExists(atPath: finalURL.path) else {
|
|
||||||
throw ShotdeckError.pdfCompositionFailed(reason: "the PDF was not written to disk")
|
|
||||||
}
|
|
||||||
_ = try await spool.archiveCurrent(pdfFileName: fileName)
|
|
||||||
replaceSession(try await spool.currentSession())
|
|
||||||
|
|
||||||
let pageWord = workingSession.captures.count == 1 ? "page" : "pages"
|
|
||||||
setStatus("Sent — \(workingSession.captures.count) \(pageWord).")
|
|
||||||
|
|
||||||
guard let anchor else {
|
|
||||||
setStatus("PDF saved to \(outboxDisplayName). Open the panel to AirDrop it.")
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
do {
|
do {
|
||||||
try Sharing.airDrop(fileURL: finalURL, from: anchor)
|
try AtomicFile.fsyncDirectory(at: outboxDir)
|
||||||
} catch {
|
} catch {
|
||||||
setStatus(
|
if transport == .oneDrive {
|
||||||
"AirDrop is not available right now — the PDF is on your \(outboxDisplayName)."
|
throw ShotdeckError.oneDriveFolderUnavailable(path: outboxDir.path)
|
||||||
)
|
}
|
||||||
|
throw error
|
||||||
}
|
}
|
||||||
} catch {
|
}.value
|
||||||
// Never unlink the published PDF, and never unlink `tempURL` either:
|
|
||||||
// a rename failure would leave the complete document at the temp name.
|
guard FileManager.default.fileExists(atPath: finalURL.path) else {
|
||||||
setStatus((error as? ShotdeckError)?.errorDescription ?? "The PDF could not be built.")
|
if transport == .oneDrive {
|
||||||
|
throw ShotdeckError.oneDriveFolderUnavailable(path: outboxDir.path)
|
||||||
|
}
|
||||||
|
throw ShotdeckError.pdfCompositionFailed(reason: "the PDF was not written to disk")
|
||||||
}
|
}
|
||||||
|
rememberLastComposedPDF(finalURL)
|
||||||
|
return ComposedSend(
|
||||||
|
fileName: fileName,
|
||||||
|
fileURL: finalURL,
|
||||||
|
pageCount: workingSession.captures.count
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `NSSharingServiceDelegate.sharingService(_:didShareItems:)` seam — also the
|
||||||
|
/// OneDrive completion path. Composes ONE truthful status from the caller's success
|
||||||
|
/// summary (the share itself DID complete) plus, when they happened, the archive
|
||||||
|
/// error and any state-refresh problem — nothing is overwritten or hidden.
|
||||||
|
func handleDidShareItems(fileName: String, sentSummary: String) async {
|
||||||
|
guard !session.isEmpty else { return }
|
||||||
|
var message = sentSummary
|
||||||
|
do {
|
||||||
|
_ = try await spool.archiveCurrent(pdfFileName: fileName)
|
||||||
|
} catch {
|
||||||
|
message += " \((error as? ShotdeckError)?.errorDescription ?? "Could not archive the session.")"
|
||||||
|
}
|
||||||
|
// Refresh model state from the store on BOTH paths: after a successful archive
|
||||||
|
// the current session and the past-submissions list are stale until reloaded,
|
||||||
|
// and after a failure the store (not this model) knows whether the session
|
||||||
|
// actually moved. Any refresh problem is appended to the status, never hidden.
|
||||||
|
if let refreshProblem = await reloadFromSpool() {
|
||||||
|
message += " \(refreshProblem)"
|
||||||
|
}
|
||||||
|
setStatus(message)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `NSSharingServiceDelegate.sharingService(_:didFailToShareItems:error:)` seam,
|
||||||
|
/// also used when `canPerform` is false or the user cancels. Does not archive.
|
||||||
|
func handleDidFailToShareItems(fileName: String) {
|
||||||
|
setStatus(
|
||||||
|
"AirDrop didn't complete — nothing was sent. Your captures are still here; the PDF is on your \(outboxDisplayName) as \(fileName)."
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,338 @@
|
|||||||
|
import AppKit
|
||||||
|
import SwiftUI
|
||||||
|
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
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
Grid(alignment: .leading, horizontalSpacing: 12, verticalSpacing: 10) {
|
||||||
|
GridRow {
|
||||||
|
Text("Hotkey")
|
||||||
|
.font(.headline)
|
||||||
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
|
.gridCellColumns(2)
|
||||||
|
}
|
||||||
|
|
||||||
|
GridRow(alignment: .center) {
|
||||||
|
fieldLabel("Capture")
|
||||||
|
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 {
|
||||||
|
Text("Send via")
|
||||||
|
.font(.headline)
|
||||||
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
|
.gridCellColumns(2)
|
||||||
|
.padding(.top, 6)
|
||||||
|
}
|
||||||
|
|
||||||
|
GridRow {
|
||||||
|
Picker("Send via", selection: transportBinding) {
|
||||||
|
ForEach(SendTransport.allCases, id: \.self) { transport in
|
||||||
|
Text(transport.displayName).tag(transport)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.labelsHidden()
|
||||||
|
.pickerStyle(.segmented)
|
||||||
|
.gridCellColumns(2)
|
||||||
|
}
|
||||||
|
|
||||||
|
GridRow {
|
||||||
|
Text("Folders")
|
||||||
|
.font(.headline)
|
||||||
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
|
.gridCellColumns(2)
|
||||||
|
.padding(.top, 6)
|
||||||
|
}
|
||||||
|
|
||||||
|
if model.transport == .airDrop {
|
||||||
|
GridRow(alignment: .center) {
|
||||||
|
fieldLabel("Watch folder")
|
||||||
|
folderValue(path: model.watchFolderURL.path) {
|
||||||
|
model.chooseWatchFolder()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
GridRow(alignment: .center) {
|
||||||
|
fieldLabel("Output folder")
|
||||||
|
folderValue(path: model.outboxURL.path) {
|
||||||
|
model.chooseOutboxFolder()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
GridRow(alignment: .center) {
|
||||||
|
fieldLabel("OneDrive folder")
|
||||||
|
if let folder = model.resolvedOneDriveFolder {
|
||||||
|
folderValue(path: folder.path) {
|
||||||
|
model.chooseOneDriveFolder()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// One-line row, same shape as the normal path row: "Not found"
|
||||||
|
// where the path would be, Choose… stays live. The explanation
|
||||||
|
// moves to the caption below instead of wrapping this row.
|
||||||
|
folderValue(path: "Not found") {
|
||||||
|
model.chooseOneDriveFolder()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
GridRow {
|
||||||
|
Text(
|
||||||
|
model.resolvedOneDriveFolder != nil
|
||||||
|
? "The PDF is saved here and this same folder is watched for the marked-up copy. On the iPad open it from Files > OneDrive."
|
||||||
|
: "No OneDrive folder found. Sign in to OneDrive, or choose a folder."
|
||||||
|
)
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundStyle(.secondary)
|
||||||
|
.fixedSize(horizontal: false, vertical: true)
|
||||||
|
.gridCellColumns(2)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
GridRow {
|
||||||
|
Button("Reveal spool folder") { model.openSpoolFolder() }
|
||||||
|
.gridCellColumns(2)
|
||||||
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
|
.padding(.top, 4)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.padding(16)
|
||||||
|
.frame(minWidth: 320, idealWidth: 360, maxWidth: 360, alignment: .leading)
|
||||||
|
.controlSize(.small)
|
||||||
|
.onDisappear { disarmHotkeyRecorder() }
|
||||||
|
}
|
||||||
|
|
||||||
|
private var transportBinding: Binding<SendTransport> {
|
||||||
|
Binding(get: { model.transport }, set: { model.chooseTransport($0) })
|
||||||
|
}
|
||||||
|
|
||||||
|
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 {
|
||||||
|
Text(title)
|
||||||
|
.lineLimit(1)
|
||||||
|
.frame(width: labelWidth, alignment: .trailing)
|
||||||
|
.gridColumnAlignment(.trailing)
|
||||||
|
.frame(minHeight: 22, alignment: .trailing)
|
||||||
|
}
|
||||||
|
|
||||||
|
private func folderValue(path: String, choose: @escaping () -> Void) -> some View {
|
||||||
|
HStack(spacing: 8) {
|
||||||
|
Text(path)
|
||||||
|
.lineLimit(1)
|
||||||
|
.truncationMode(.middle)
|
||||||
|
.foregroundStyle(.secondary)
|
||||||
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
|
Button("Choose…") { choose() }
|
||||||
|
}
|
||||||
|
.frame(minHeight: 22)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 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?
|
||||||
|
|
||||||
|
public func presentSettingsWindow() {
|
||||||
|
if let existing = Self.settingsWindowController {
|
||||||
|
existing.window?.makeKeyAndOrderFront(nil)
|
||||||
|
NSApp.activate()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
let hosting = NSHostingController(rootView: SettingsView().environment(self))
|
||||||
|
let window = NSWindow(contentViewController: hosting)
|
||||||
|
window.title = "Redline Settings"
|
||||||
|
window.styleMask = [.titled, .closable]
|
||||||
|
window.isReleasedWhenClosed = false
|
||||||
|
window.center()
|
||||||
|
let controller = NSWindowController(window: window)
|
||||||
|
Self.settingsWindowController = controller
|
||||||
|
controller.showWindow(nil)
|
||||||
|
NSApp.activate()
|
||||||
|
}
|
||||||
|
|
||||||
|
func chooseOutboxFolder() {
|
||||||
|
guard let url = chooseDirectory(startingAt: outboxURL) else { return }
|
||||||
|
FolderSettings.setOutbox(url)
|
||||||
|
setFolderURLs(outbox: url, watch: watchFolderURL)
|
||||||
|
setStatus("Output folder set to \(url.lastPathComponent).")
|
||||||
|
}
|
||||||
|
|
||||||
|
func chooseWatchFolder() {
|
||||||
|
guard let url = chooseDirectory(startingAt: watchFolderURL) else { return }
|
||||||
|
FolderSettings.setWatchFolder(url)
|
||||||
|
setFolderURLs(outbox: outboxURL, watch: url)
|
||||||
|
Task {
|
||||||
|
do {
|
||||||
|
try await watcher.updateWatchFolder(url)
|
||||||
|
setStatus("Watch folder set to \(url.lastPathComponent).")
|
||||||
|
} catch {
|
||||||
|
setStatus(
|
||||||
|
(error as? ShotdeckError)?.errorDescription ?? "Could not switch the watch folder."
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Settings "Send via" picker action. Persists the choice, recomputes the effective
|
||||||
|
/// outbox/watch folder for the new transport, creates the OneDrive folder if it
|
||||||
|
/// doesn't exist yet, and re-points the running watcher (folder + recordUncommented)
|
||||||
|
/// at the new state. Switching back to AirDrop restores its own stored overrides
|
||||||
|
/// untouched, since AirDrop and OneDrive folder settings are stored under separate keys.
|
||||||
|
/// Refuses while a send is in flight (send() snapshots its own folder/transport, but
|
||||||
|
/// switching mid-send is still confusing UX — nothing to gain by allowing it).
|
||||||
|
/// The async reconcile below is generation-guarded: `reconcileGeneration` is bumped
|
||||||
|
/// synchronously before the Task starts, and the Task checks its own snapshot against
|
||||||
|
/// the live value before every mutating step, so rapid toggling (this function or
|
||||||
|
/// chooseOneDriveFolder, in any order) always lets the LAST choice win instead of an
|
||||||
|
/// earlier, superseded call applying its stale folder/flag after a later one already won.
|
||||||
|
/// The Task's handle is stored in `pendingReconcileTask` so send() can await its
|
||||||
|
/// completion before snapshotting transport/folder — closing the OTHER race, where a
|
||||||
|
/// toggle is immediately followed by Send before this reconcile has settled.
|
||||||
|
func chooseTransport(_ value: SendTransport) {
|
||||||
|
guard !isSending else {
|
||||||
|
setStatus("Finish the current send first.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
guard value != transport else { return }
|
||||||
|
TransportSettings.setTransport(value)
|
||||||
|
setTransport(value)
|
||||||
|
let folders = TransportSettings.effectiveFolders()
|
||||||
|
if value == .oneDrive {
|
||||||
|
try? FileManager.default.createDirectory(
|
||||||
|
at: folders.outbox, withIntermediateDirectories: true
|
||||||
|
)
|
||||||
|
}
|
||||||
|
setFolderURLs(outbox: folders.outbox, watch: folders.watch)
|
||||||
|
setResolvedOneDriveFolder(OneDriveLocator.resolveOneDriveFolder())
|
||||||
|
|
||||||
|
reconcileGeneration += 1
|
||||||
|
let generation = reconcileGeneration
|
||||||
|
pendingReconcileTask = Task {
|
||||||
|
guard generation == self.reconcileGeneration else { return }
|
||||||
|
await watcher.setRecordUncommented(value == .airDrop)
|
||||||
|
guard generation == self.reconcileGeneration else { return }
|
||||||
|
do {
|
||||||
|
try await watcher.updateWatchFolder(folders.watch)
|
||||||
|
} catch {
|
||||||
|
guard generation == self.reconcileGeneration else { return }
|
||||||
|
setStatus(
|
||||||
|
(error as? ShotdeckError)?.errorDescription ?? "Could not switch the watch folder."
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Refuses while a send is in flight, same reasoning as chooseTransport. See
|
||||||
|
/// chooseTransport's doc comment for the generation-guard mechanism shared here.
|
||||||
|
func chooseOneDriveFolder() {
|
||||||
|
guard !isSending else {
|
||||||
|
setStatus("Finish the current send first.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
let start = resolvedOneDriveFolder ?? FileManager.default.homeDirectoryForCurrentUser
|
||||||
|
guard let url = chooseDirectory(startingAt: start) else { return }
|
||||||
|
TransportSettings.setOneDriveFolder(url)
|
||||||
|
try? FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
|
||||||
|
setResolvedOneDriveFolder(OneDriveLocator.resolveOneDriveFolder())
|
||||||
|
guard transport == .oneDrive else { return }
|
||||||
|
setFolderURLs(outbox: url, watch: url)
|
||||||
|
|
||||||
|
reconcileGeneration += 1
|
||||||
|
let generation = reconcileGeneration
|
||||||
|
pendingReconcileTask = Task {
|
||||||
|
guard generation == self.reconcileGeneration else { return }
|
||||||
|
do {
|
||||||
|
try await watcher.updateWatchFolder(url)
|
||||||
|
guard generation == self.reconcileGeneration else { return }
|
||||||
|
setStatus("OneDrive folder set to \(url.lastPathComponent).")
|
||||||
|
} catch {
|
||||||
|
guard generation == self.reconcileGeneration else { return }
|
||||||
|
setStatus(
|
||||||
|
(error as? ShotdeckError)?.errorDescription ?? "Could not switch the watch folder."
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private func chooseDirectory(startingAt directory: URL) -> URL? {
|
||||||
|
let panel = NSOpenPanel()
|
||||||
|
panel.canChooseDirectories = true
|
||||||
|
panel.canChooseFiles = false
|
||||||
|
panel.allowsMultipleSelection = false
|
||||||
|
panel.canCreateDirectories = true
|
||||||
|
panel.prompt = "Choose"
|
||||||
|
panel.directoryURL = directory
|
||||||
|
guard panel.runModal() == .OK else { return nil }
|
||||||
|
return panel.url
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,7 +7,14 @@ enum Sharing {
|
|||||||
/// Throws `ShotdeckError.airDropUnavailable` when the service cannot be created,
|
/// Throws `ShotdeckError.airDropUnavailable` when the service cannot be created,
|
||||||
/// `canPerform` is false, or `view` is not in a visible window (a detached view
|
/// `canPerform` is false, or `view` is not in a visible window (a detached view
|
||||||
/// never produces an on-screen sheet).
|
/// never produces an on-screen sheet).
|
||||||
static func airDrop(fileURL: URL, from view: NSView) throws {
|
///
|
||||||
|
/// `onFinished` is invoked on the main actor when the sheet completes: `true` for
|
||||||
|
/// `didShareItems`, `false` for `didFailToShareItems` (including user cancel).
|
||||||
|
static func airDrop(
|
||||||
|
fileURL: URL,
|
||||||
|
from view: NSView,
|
||||||
|
onFinished: @escaping @MainActor @Sendable (Bool) async -> Void
|
||||||
|
) throws {
|
||||||
guard let service = NSSharingService(named: .sendViaAirDrop),
|
guard let service = NSSharingService(named: .sendViaAirDrop),
|
||||||
service.canPerform(withItems: [fileURL]) else {
|
service.canPerform(withItems: [fileURL]) else {
|
||||||
throw ShotdeckError.airDropUnavailable
|
throw ShotdeckError.airDropUnavailable
|
||||||
@@ -21,7 +28,12 @@ enum Sharing {
|
|||||||
window.makeKeyAndOrderFront(nil)
|
window.makeKeyAndOrderFront(nil)
|
||||||
|
|
||||||
service.subject = fileURL.lastPathComponent
|
service.subject = fileURL.lastPathComponent
|
||||||
let session = AirDropSession(service: service, window: window, view: view)
|
let session = AirDropSession(
|
||||||
|
service: service,
|
||||||
|
window: window,
|
||||||
|
view: view,
|
||||||
|
onFinished: onFinished
|
||||||
|
)
|
||||||
AirDropSession.keepAlive(session)
|
AirDropSession.keepAlive(session)
|
||||||
service.delegate = session
|
service.delegate = session
|
||||||
service.perform(withItems: [fileURL])
|
service.perform(withItems: [fileURL])
|
||||||
@@ -29,7 +41,9 @@ enum Sharing {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Retains the sharing service for the life of the picker and supplies the real
|
/// Retains the sharing service for the life of the picker and supplies the real
|
||||||
/// on-screen window as the sheet parent. `NSSharingService.delegate` is weak.
|
/// on-screen window as the sheet parent. `NSSharingService.delegate` is weak, so
|
||||||
|
/// `live` is the strong reference that keeps this object alive until the sheet
|
||||||
|
/// reports success or failure (including cancel).
|
||||||
@MainActor
|
@MainActor
|
||||||
private final class AirDropSession: NSObject, NSSharingServiceDelegate {
|
private final class AirDropSession: NSObject, NSSharingServiceDelegate {
|
||||||
static var live: [AirDropSession] = []
|
static var live: [AirDropSession] = []
|
||||||
@@ -37,11 +51,19 @@ private final class AirDropSession: NSObject, NSSharingServiceDelegate {
|
|||||||
let service: NSSharingService
|
let service: NSSharingService
|
||||||
let window: NSWindow
|
let window: NSWindow
|
||||||
let view: NSView
|
let view: NSView
|
||||||
|
let onFinished: @MainActor @Sendable (Bool) async -> Void
|
||||||
|
private var reported = false
|
||||||
|
|
||||||
init(service: NSSharingService, window: NSWindow, view: NSView) {
|
init(
|
||||||
|
service: NSSharingService,
|
||||||
|
window: NSWindow,
|
||||||
|
view: NSView,
|
||||||
|
onFinished: @escaping @MainActor @Sendable (Bool) async -> Void
|
||||||
|
) {
|
||||||
self.service = service
|
self.service = service
|
||||||
self.window = window
|
self.window = window
|
||||||
self.view = view
|
self.view = view
|
||||||
|
self.onFinished = onFinished
|
||||||
}
|
}
|
||||||
|
|
||||||
static func keepAlive(_ session: AirDropSession) {
|
static func keepAlive(_ session: AirDropSession) {
|
||||||
@@ -52,6 +74,15 @@ private final class AirDropSession: NSObject, NSSharingServiceDelegate {
|
|||||||
Self.live.removeAll { $0 === self }
|
Self.live.removeAll { $0 === self }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private func report(_ success: Bool) {
|
||||||
|
guard !reported else { return }
|
||||||
|
reported = true
|
||||||
|
Task { @MainActor in
|
||||||
|
await self.onFinished(success)
|
||||||
|
self.drop()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func sharingService(
|
func sharingService(
|
||||||
_ sharingService: NSSharingService,
|
_ sharingService: NSSharingService,
|
||||||
sourceWindowForShareItems items: [Any],
|
sourceWindowForShareItems items: [Any],
|
||||||
@@ -70,7 +101,7 @@ private final class AirDropSession: NSObject, NSSharingServiceDelegate {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func sharingService(_ sharingService: NSSharingService, didShareItems items: [Any]) {
|
func sharingService(_ sharingService: NSSharingService, didShareItems items: [Any]) {
|
||||||
drop()
|
report(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
func sharingService(
|
func sharingService(
|
||||||
@@ -78,6 +109,6 @@ private final class AirDropSession: NSObject, NSSharingServiceDelegate {
|
|||||||
didFailToShareItems items: [Any],
|
didFailToShareItems items: [Any],
|
||||||
error: any Error
|
error: any Error
|
||||||
) {
|
) {
|
||||||
drop()
|
report(false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,484 @@
|
|||||||
|
import AppKit
|
||||||
|
import CryptoKit
|
||||||
|
import Foundation
|
||||||
|
import Security
|
||||||
|
|
||||||
|
/// Built-in updater. Checks an appcast, stages a verified payload, and installs
|
||||||
|
/// only when the user clicks the menu row — never automatically.
|
||||||
|
@MainActor
|
||||||
|
final class UpdateChecker {
|
||||||
|
static let appcastURLDefaultsKey = "ai.flowmaster.shotdeck.appcastURL"
|
||||||
|
static let defaultAppcastURL = URL(string: "https://get.baobab-ts.com/cowork/redline/appcast.json")!
|
||||||
|
static let defaultInstallTarget = URL(fileURLWithPath: "/Applications/Redline.app")
|
||||||
|
|
||||||
|
/// Required bundle identifier for any staged or installed payload.
|
||||||
|
static let expectedBundleIdentifier = "ai.flowmaster.shotdeck"
|
||||||
|
/// Developer team identifiers MMD ships Redline under. Overridable only for the self-test.
|
||||||
|
static let allowedTeamIdentifiers: Set<String> = ["PWMCBMX5M8", "L3N9S54CN3"]
|
||||||
|
|
||||||
|
private(set) var availableUpdate: (version: String, notes: String)?
|
||||||
|
private(set) var stagedAppURL: URL?
|
||||||
|
private(set) var statusMessage: String?
|
||||||
|
private(set) var lastCheckedAt: Date?
|
||||||
|
private(set) var isCheckingNow: Bool = false
|
||||||
|
|
||||||
|
var onChecked: (() -> Void)?
|
||||||
|
/// Fired whenever `isCheckingNow` flips, so a UI can show "Checking…" for the
|
||||||
|
/// whole duration of a check rather than only after it lands.
|
||||||
|
var onCheckingChanged: ((Bool) -> Void)?
|
||||||
|
|
||||||
|
private let urlSession: URLSession
|
||||||
|
private var repeatingTimer: Timer?
|
||||||
|
private var firstCheckTask: Task<Void, Never>?
|
||||||
|
private var stagingDirectory: URL?
|
||||||
|
|
||||||
|
init() {
|
||||||
|
let config = URLSessionConfiguration.ephemeral
|
||||||
|
config.timeoutIntervalForRequest = 30
|
||||||
|
config.timeoutIntervalForResource = 600
|
||||||
|
config.httpCookieAcceptPolicy = .never
|
||||||
|
config.httpShouldSetCookies = false
|
||||||
|
config.httpCookieStorage = nil
|
||||||
|
config.urlCache = nil
|
||||||
|
urlSession = URLSession(configuration: config)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// First check 10 seconds after start, then every 6 hours. Stages only — never installs.
|
||||||
|
func startSchedule() {
|
||||||
|
firstCheckTask?.cancel()
|
||||||
|
firstCheckTask = Task { [weak self] in
|
||||||
|
try? await Task.sleep(for: .seconds(10))
|
||||||
|
guard !Task.isCancelled else { return }
|
||||||
|
await self?.checkNow()
|
||||||
|
}
|
||||||
|
repeatingTimer?.invalidate()
|
||||||
|
let timer = Timer(timeInterval: 6 * 60 * 60, repeats: true) { [weak self] _ in
|
||||||
|
Task { @MainActor in
|
||||||
|
await self?.checkNow()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RunLoop.main.add(timer, forMode: .common)
|
||||||
|
repeatingTimer = timer
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Checks the appcast and stages a newer, signature-verified payload.
|
||||||
|
/// `manual` only affects the status message shown when already up to date —
|
||||||
|
/// a user-initiated check says so; the silent background check stays quiet.
|
||||||
|
func checkNow(manual: Bool = false) async {
|
||||||
|
guard !isCheckingNow else { return }
|
||||||
|
isCheckingNow = true
|
||||||
|
onCheckingChanged?(true)
|
||||||
|
defer {
|
||||||
|
isCheckingNow = false
|
||||||
|
onCheckingChanged?(false)
|
||||||
|
}
|
||||||
|
lastCheckedAt = Date()
|
||||||
|
|
||||||
|
let appcast: Appcast
|
||||||
|
do {
|
||||||
|
appcast = try await fetchAppcast()
|
||||||
|
} catch {
|
||||||
|
statusMessage = "Could not check for updates."
|
||||||
|
onChecked?()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
guard Self.isNewer(appcast.version, than: Self.currentVersion()) else {
|
||||||
|
clearOffer()
|
||||||
|
statusMessage = manual ? "Redline \(Self.currentVersion()) is up to date." : nil
|
||||||
|
onChecked?()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
do {
|
||||||
|
try await downloadAndStage(appcast)
|
||||||
|
availableUpdate = (version: appcast.version, notes: appcast.notes ?? "")
|
||||||
|
statusMessage = nil
|
||||||
|
} catch UpdateCheckError.checksumMismatch {
|
||||||
|
discardStaging()
|
||||||
|
availableUpdate = nil
|
||||||
|
statusMessage = "Update file failed the checksum — not installed."
|
||||||
|
} catch UpdateCheckError.signatureInvalid {
|
||||||
|
discardStaging()
|
||||||
|
availableUpdate = nil
|
||||||
|
statusMessage = "Update is not signed by MMD — not installed."
|
||||||
|
} catch {
|
||||||
|
discardStaging()
|
||||||
|
availableUpdate = nil
|
||||||
|
statusMessage = "The update could not be prepared."
|
||||||
|
}
|
||||||
|
onChecked?()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Installs the staged app onto `target` atomically, keeping exactly one rollback
|
||||||
|
/// copy (`Redline.app.previous`), then hands off to a relaunch and quits.
|
||||||
|
/// Never deletes the old app before the new one is verified in place.
|
||||||
|
func installStaged(to target: URL = UpdateChecker.defaultInstallTarget) {
|
||||||
|
guard let staged = stagedAppURL else {
|
||||||
|
statusMessage = "No update is staged."
|
||||||
|
onChecked?()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
let targetDir = target.deletingLastPathComponent()
|
||||||
|
let previousURL = targetDir.appendingPathComponent("Redline.app.previous")
|
||||||
|
|
||||||
|
do {
|
||||||
|
try FileManager.default.createDirectory(at: targetDir, withIntermediateDirectories: true)
|
||||||
|
|
||||||
|
let replacementDir = try FileManager.default.url(
|
||||||
|
for: .itemReplacementDirectory,
|
||||||
|
in: .userDomainMask,
|
||||||
|
appropriateFor: target,
|
||||||
|
create: true
|
||||||
|
)
|
||||||
|
defer { try? FileManager.default.removeItem(at: replacementDir) }
|
||||||
|
|
||||||
|
let newCopy = replacementDir.appendingPathComponent(target.lastPathComponent)
|
||||||
|
try Self.runProcess(executable: "/usr/bin/ditto", arguments: [staged.path, newCopy.path])
|
||||||
|
|
||||||
|
// Exactly one rollback copy is kept — drop any older one before this install.
|
||||||
|
if FileManager.default.fileExists(atPath: previousURL.path) {
|
||||||
|
try FileManager.default.removeItem(at: previousURL)
|
||||||
|
}
|
||||||
|
|
||||||
|
if FileManager.default.fileExists(atPath: target.path) {
|
||||||
|
_ = try FileManager.default.replaceItemAt(
|
||||||
|
target,
|
||||||
|
withItemAt: newCopy,
|
||||||
|
backupItemName: previousURL.lastPathComponent,
|
||||||
|
options: [.withoutDeletingBackupItem]
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
try FileManager.default.moveItem(at: newCopy, to: target)
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
statusMessage = "The update could not be installed."
|
||||||
|
onChecked?()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Defense in depth: re-verify what actually landed on disk, not just the staged copy.
|
||||||
|
do {
|
||||||
|
try Self.verifySignature(of: target)
|
||||||
|
} catch {
|
||||||
|
statusMessage = "The update was installed but failed verification."
|
||||||
|
onChecked?()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
discardStaging()
|
||||||
|
availableUpdate = nil
|
||||||
|
relaunch(target: target)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Swaps `Redline.app.previous` back into place, verifying its signature first.
|
||||||
|
/// The just-replaced (newer) app becomes the new `.previous` — a revert is
|
||||||
|
/// itself reversible.
|
||||||
|
func revertToPrevious(target: URL = UpdateChecker.defaultInstallTarget) {
|
||||||
|
let targetDir = target.deletingLastPathComponent()
|
||||||
|
let previousURL = targetDir.appendingPathComponent("Redline.app.previous")
|
||||||
|
|
||||||
|
guard FileManager.default.fileExists(atPath: previousURL.path) else {
|
||||||
|
statusMessage = "No previous version to revert to."
|
||||||
|
onChecked?()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
do {
|
||||||
|
try Self.verifySignature(of: previousURL)
|
||||||
|
} catch {
|
||||||
|
statusMessage = "The previous version failed verification and was not restored."
|
||||||
|
onChecked?()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
do {
|
||||||
|
// `previousURL` cannot be handed to replaceItemAt directly: its own path
|
||||||
|
// IS the requested backup name, so the backup step would clobber it
|
||||||
|
// before the swap ever reads it. Stage a throwaway copy first, exactly
|
||||||
|
// like installStaged does for the forward direction.
|
||||||
|
let replacementDir = try FileManager.default.url(
|
||||||
|
for: .itemReplacementDirectory,
|
||||||
|
in: .userDomainMask,
|
||||||
|
appropriateFor: target,
|
||||||
|
create: true
|
||||||
|
)
|
||||||
|
defer { try? FileManager.default.removeItem(at: replacementDir) }
|
||||||
|
|
||||||
|
let newCopy = replacementDir.appendingPathComponent(target.lastPathComponent)
|
||||||
|
try Self.runProcess(executable: "/usr/bin/ditto", arguments: [previousURL.path, newCopy.path])
|
||||||
|
try FileManager.default.removeItem(at: previousURL)
|
||||||
|
|
||||||
|
_ = try FileManager.default.replaceItemAt(
|
||||||
|
target,
|
||||||
|
withItemAt: newCopy,
|
||||||
|
backupItemName: previousURL.lastPathComponent,
|
||||||
|
options: [.withoutDeletingBackupItem]
|
||||||
|
)
|
||||||
|
} catch {
|
||||||
|
statusMessage = "Could not revert to the previous version."
|
||||||
|
onChecked?()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
relaunch(target: target)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The version recorded in `Redline.app.previous`'s Info.plist, or nil when no
|
||||||
|
/// rollback copy exists.
|
||||||
|
func previousVersion(target: URL = UpdateChecker.defaultInstallTarget) -> String? {
|
||||||
|
let previousURL = target.deletingLastPathComponent().appendingPathComponent("Redline.app.previous")
|
||||||
|
let plistURL = previousURL.appendingPathComponent("Contents/Info.plist")
|
||||||
|
guard let plist = NSDictionary(contentsOf: plistURL) as? [String: Any] else { return nil }
|
||||||
|
return plist["CFBundleShortVersionString"] as? String
|
||||||
|
}
|
||||||
|
|
||||||
|
static func resolvedAppcastURL() -> URL {
|
||||||
|
if let env = ProcessInfo.processInfo.environment["REDLINE_APPCAST_URL"],
|
||||||
|
!env.isEmpty,
|
||||||
|
let url = URL(string: env)
|
||||||
|
{
|
||||||
|
return url
|
||||||
|
}
|
||||||
|
if let stored = UserDefaults.standard.string(forKey: appcastURLDefaultsKey),
|
||||||
|
!stored.isEmpty,
|
||||||
|
let url = URL(string: stored)
|
||||||
|
{
|
||||||
|
return url
|
||||||
|
}
|
||||||
|
return defaultAppcastURL
|
||||||
|
}
|
||||||
|
|
||||||
|
static func currentVersion() -> String {
|
||||||
|
Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "0.0.0"
|
||||||
|
}
|
||||||
|
|
||||||
|
static func isNewer(_ candidate: String, than current: String) -> Bool {
|
||||||
|
let a = semverParts(candidate)
|
||||||
|
let b = semverParts(current)
|
||||||
|
for i in 0..<3 {
|
||||||
|
if a[i] != b[i] { return a[i] > b[i] }
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
static func sha256Hex(_ data: Data) -> String {
|
||||||
|
SHA256.hash(data: data).map { String(format: "%02x", $0) }.joined()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Validates the code signature of the app at `appURL`: strictly, across all
|
||||||
|
/// architectures and nested code, then checks its bundle identifier and team
|
||||||
|
/// identifier against `expectedBundleIdentifier` / the allowed-teams set.
|
||||||
|
/// `REDLINE_ALLOWED_TEAMS` (comma separated) overrides the allowed set — for
|
||||||
|
/// the self-test only, so it can accept a locally re-signed fake bundle.
|
||||||
|
static func verifySignature(of appURL: URL) throws {
|
||||||
|
var staticCode: SecStaticCode?
|
||||||
|
let createStatus = SecStaticCodeCreateWithPath(appURL as CFURL, [], &staticCode)
|
||||||
|
guard createStatus == errSecSuccess, let code = staticCode else {
|
||||||
|
throw UpdateCheckError.signatureInvalid(
|
||||||
|
"could not read a code signature (status \(createStatus))"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
let validityFlags = SecCSFlags(
|
||||||
|
rawValue: kSecCSStrictValidate | kSecCSCheckAllArchitectures | kSecCSCheckNestedCode
|
||||||
|
)
|
||||||
|
var validityError: Unmanaged<CFError>?
|
||||||
|
let validityStatus = SecStaticCodeCheckValidityWithErrors(code, validityFlags, nil, &validityError)
|
||||||
|
guard validityStatus == errSecSuccess else {
|
||||||
|
let detail = (validityError?.takeRetainedValue()).map { String(describing: $0) } ?? "status \(validityStatus)"
|
||||||
|
throw UpdateCheckError.signatureInvalid("signature is not valid: \(detail)")
|
||||||
|
}
|
||||||
|
|
||||||
|
var signingInfo: CFDictionary?
|
||||||
|
let infoStatus = SecCodeCopySigningInformation(
|
||||||
|
code,
|
||||||
|
SecCSFlags(rawValue: kSecCSSigningInformation),
|
||||||
|
&signingInfo
|
||||||
|
)
|
||||||
|
guard infoStatus == errSecSuccess, let info = signingInfo as? [String: Any] else {
|
||||||
|
throw UpdateCheckError.signatureInvalid("could not read signing information (status \(infoStatus))")
|
||||||
|
}
|
||||||
|
|
||||||
|
let identifier = info[kSecCodeInfoIdentifier as String] as? String
|
||||||
|
guard identifier == expectedBundleIdentifier else {
|
||||||
|
throw UpdateCheckError.signatureInvalid(
|
||||||
|
"unexpected bundle identifier: \(identifier ?? "nil")"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
let teamIdentifier = info[kSecCodeInfoTeamIdentifier as String] as? String
|
||||||
|
guard let teamIdentifier, resolvedAllowedTeamIdentifiers().contains(teamIdentifier) else {
|
||||||
|
throw UpdateCheckError.signatureInvalid(
|
||||||
|
"unexpected team identifier: \(teamIdentifier ?? "nil")"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static func resolvedAllowedTeamIdentifiers() -> Set<String> {
|
||||||
|
if let env = ProcessInfo.processInfo.environment["REDLINE_ALLOWED_TEAMS"], !env.isEmpty {
|
||||||
|
let parts = env.split(separator: ",")
|
||||||
|
.map { $0.trimmingCharacters(in: .whitespaces) }
|
||||||
|
.filter { !$0.isEmpty }
|
||||||
|
if !parts.isEmpty {
|
||||||
|
return Set(parts)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return allowedTeamIdentifiers
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Private
|
||||||
|
|
||||||
|
private struct Appcast: Decodable {
|
||||||
|
var version: String
|
||||||
|
var zipURL: URL
|
||||||
|
var sha256: String
|
||||||
|
var notes: String?
|
||||||
|
}
|
||||||
|
|
||||||
|
private enum UpdateCheckError: Error {
|
||||||
|
case checksumMismatch
|
||||||
|
case invalidPayload
|
||||||
|
case httpStatus(Int)
|
||||||
|
case processFailed(String)
|
||||||
|
case signatureInvalid(String)
|
||||||
|
}
|
||||||
|
|
||||||
|
private func fetchAppcast() async throws -> Appcast {
|
||||||
|
let data = try await fetchData(from: Self.resolvedAppcastURL())
|
||||||
|
return try JSONDecoder().decode(Appcast.self, from: data)
|
||||||
|
}
|
||||||
|
|
||||||
|
private func fetchData(from url: URL) async throws -> Data {
|
||||||
|
if url.isFileURL {
|
||||||
|
return try Data(contentsOf: url)
|
||||||
|
}
|
||||||
|
let (data, response) = try await urlSession.data(from: url)
|
||||||
|
if let http = response as? HTTPURLResponse, !(200...299).contains(http.statusCode) {
|
||||||
|
throw UpdateCheckError.httpStatus(http.statusCode)
|
||||||
|
}
|
||||||
|
return data
|
||||||
|
}
|
||||||
|
|
||||||
|
private func downloadAndStage(_ appcast: Appcast) async throws {
|
||||||
|
let zipData = try await fetchData(from: appcast.zipURL)
|
||||||
|
let expected = appcast.sha256.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||||
|
let actual = Self.sha256Hex(zipData)
|
||||||
|
guard actual.caseInsensitiveCompare(expected) == .orderedSame else {
|
||||||
|
throw UpdateCheckError.checksumMismatch
|
||||||
|
}
|
||||||
|
|
||||||
|
discardStaging()
|
||||||
|
let root = FileManager.default.temporaryDirectory
|
||||||
|
.appendingPathComponent("shotdeck-update-\(UUID().uuidString)", isDirectory: true)
|
||||||
|
try FileManager.default.createDirectory(at: root, withIntermediateDirectories: true)
|
||||||
|
stagingDirectory = root
|
||||||
|
|
||||||
|
let zipURL = root.appendingPathComponent("update.zip")
|
||||||
|
try zipData.write(to: zipURL)
|
||||||
|
|
||||||
|
let extracted = root.appendingPathComponent("extracted", isDirectory: true)
|
||||||
|
try FileManager.default.createDirectory(at: extracted, withIntermediateDirectories: true)
|
||||||
|
try Self.runProcess(
|
||||||
|
executable: "/usr/bin/ditto",
|
||||||
|
arguments: ["-x", "-k", zipURL.path, extracted.path]
|
||||||
|
)
|
||||||
|
|
||||||
|
guard let appURL = Self.findRedlineApp(in: extracted) else {
|
||||||
|
throw UpdateCheckError.invalidPayload
|
||||||
|
}
|
||||||
|
let executable = appURL.appendingPathComponent("Contents/MacOS/Shotdeck")
|
||||||
|
guard FileManager.default.fileExists(atPath: executable.path) else {
|
||||||
|
throw UpdateCheckError.invalidPayload
|
||||||
|
}
|
||||||
|
try Self.verifySignature(of: appURL)
|
||||||
|
stagedAppURL = appURL
|
||||||
|
}
|
||||||
|
|
||||||
|
private func clearOffer() {
|
||||||
|
availableUpdate = nil
|
||||||
|
discardStaging()
|
||||||
|
}
|
||||||
|
|
||||||
|
private func discardStaging() {
|
||||||
|
if let stagingDirectory {
|
||||||
|
try? FileManager.default.removeItem(at: stagingDirectory)
|
||||||
|
}
|
||||||
|
stagingDirectory = nil
|
||||||
|
stagedAppURL = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Spawns a detached watcher that waits for this process to exit, then reopens
|
||||||
|
/// `target`, and quits. Never called during the self-test, so the in-process
|
||||||
|
/// assertions after `installStaged`/`revertToPrevious` can still run.
|
||||||
|
private func relaunch(target: URL) {
|
||||||
|
guard ProcessInfo.processInfo.environment["SHOTDECK_UPDATE_SELFTEST"] == nil else { return }
|
||||||
|
|
||||||
|
let ownPID = ProcessInfo.processInfo.processIdentifier
|
||||||
|
let script = "while kill -0 \(ownPID) 2>/dev/null; do sleep 0.2; done; " +
|
||||||
|
"/usr/bin/open -n \(Self.shellQuoted(target.path))"
|
||||||
|
let process = Process()
|
||||||
|
process.executableURL = URL(fileURLWithPath: "/bin/sh")
|
||||||
|
process.arguments = ["-c", script]
|
||||||
|
process.standardInput = FileHandle.nullDevice
|
||||||
|
process.standardOutput = FileHandle.nullDevice
|
||||||
|
process.standardError = FileHandle.nullDevice
|
||||||
|
do {
|
||||||
|
try process.run()
|
||||||
|
} catch {
|
||||||
|
statusMessage = "The update was installed but Redline could not relaunch. Open it from Applications."
|
||||||
|
onChecked?()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
NSApp.terminate(nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
private static func shellQuoted(_ path: String) -> String {
|
||||||
|
"'" + path.replacingOccurrences(of: "'", with: "'\\''") + "'"
|
||||||
|
}
|
||||||
|
|
||||||
|
private static func findRedlineApp(in directory: URL) -> URL? {
|
||||||
|
let fm = FileManager.default
|
||||||
|
let direct = directory.appendingPathComponent("Redline.app")
|
||||||
|
if fm.fileExists(atPath: direct.path) { return direct }
|
||||||
|
|
||||||
|
guard let enumerator = fm.enumerator(
|
||||||
|
at: directory,
|
||||||
|
includingPropertiesForKeys: [.isDirectoryKey],
|
||||||
|
options: [.skipsHiddenFiles]
|
||||||
|
) else { return nil }
|
||||||
|
|
||||||
|
while let item = enumerator.nextObject() as? URL {
|
||||||
|
if item.lastPathComponent == "Redline.app" {
|
||||||
|
return item
|
||||||
|
}
|
||||||
|
if item.pathExtension == "app" {
|
||||||
|
enumerator.skipDescendants()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
private static func semverParts(_ string: String) -> [Int] {
|
||||||
|
let core = string.split(separator: "-").first.map(String.init) ?? string
|
||||||
|
var parts = core.split(separator: ".").prefix(3).map { Int($0) ?? 0 }
|
||||||
|
while parts.count < 3 { parts.append(0) }
|
||||||
|
return parts
|
||||||
|
}
|
||||||
|
|
||||||
|
private static func runProcess(executable: String, arguments: [String]) throws {
|
||||||
|
let process = Process()
|
||||||
|
process.executableURL = URL(fileURLWithPath: executable)
|
||||||
|
process.arguments = arguments
|
||||||
|
let err = Pipe()
|
||||||
|
process.standardError = err
|
||||||
|
process.standardOutput = Pipe()
|
||||||
|
try process.run()
|
||||||
|
process.waitUntilExit()
|
||||||
|
guard process.terminationStatus == 0 else {
|
||||||
|
let message = String(data: err.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8) ?? ""
|
||||||
|
throw UpdateCheckError.processFailed("\(executable) failed: \(message)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,6 +4,18 @@ import ShotdeckCore
|
|||||||
|
|
||||||
// SwiftPM treats a file named main.swift as top-level code, which forbids `@main`.
|
// SwiftPM treats a file named main.swift as top-level code, which forbids `@main`.
|
||||||
// App.main() is the equivalent entry point.
|
// App.main() is the equivalent entry point.
|
||||||
|
if ProcessInfo.processInfo.environment["SHOTDECK_SNAPSHOT_DIR"] != nil {
|
||||||
|
MainActor.assumeIsolated { PanelSnapshot.runIfRequested() }
|
||||||
|
}
|
||||||
|
if ProcessInfo.processInfo.environment["REDLINE_SELFTEST_PHASE"] == "onedrive" {
|
||||||
|
MainActor.assumeIsolated { PickerSelfTest.runOneDriveOnlyIfRequested() }
|
||||||
|
}
|
||||||
|
if ProcessInfo.processInfo.environment["REDLINE_SELFTEST_PHASE"] == "sendtruth" {
|
||||||
|
MainActor.assumeIsolated { PickerSelfTest.runSendTruthOnlyIfRequested() }
|
||||||
|
}
|
||||||
|
if ProcessInfo.processInfo.environment["SHOTDECK_PICKER_SELFTEST"] != nil {
|
||||||
|
MainActor.assumeIsolated { PickerSelfTest.runIfRequested() }
|
||||||
|
}
|
||||||
ShotdeckApp.main()
|
ShotdeckApp.main()
|
||||||
|
|
||||||
struct ShotdeckApp: App {
|
struct ShotdeckApp: App {
|
||||||
@@ -15,18 +27,42 @@ struct ShotdeckApp: App {
|
|||||||
.environment(appDelegate.model)
|
.environment(appDelegate.model)
|
||||||
} label: {
|
} label: {
|
||||||
let state = appDelegate.model.iconState
|
let state = appDelegate.model.iconState
|
||||||
|
let hasUpdate = appDelegate.model.updateAvailable != nil
|
||||||
HStack(spacing: 4) {
|
HStack(spacing: 4) {
|
||||||
Image(systemName: state.symbolName)
|
menuBarIcon(for: state, hasUpdate: hasUpdate)
|
||||||
if let count = state.countText {
|
if let count = state.countText {
|
||||||
Text(count).font(.system(size: 11, weight: .semibold))
|
Text(count).font(.system(size: 11, weight: .semibold))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.accessibilityLabel("Shotdeck")
|
.accessibilityLabel("Redline")
|
||||||
}
|
}
|
||||||
.menuBarExtraStyle(.window)
|
.menuBarExtraStyle(.window)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The menu-bar symbol for `state`, badged while an update is staged. Uses the
|
||||||
|
/// SF Symbol's own `.badge` variant when one exists; falls back to a small
|
||||||
|
/// overlaid dot on the plain symbol otherwise. The badge disappears on its own
|
||||||
|
/// once `updateAvailable` clears, since this reads live model state.
|
||||||
|
@ViewBuilder
|
||||||
|
private func menuBarIcon(for state: MenuIconState, hasUpdate: Bool) -> some View {
|
||||||
|
if hasUpdate {
|
||||||
|
let badgeName = "\(state.symbolName).badge"
|
||||||
|
if NSImage(systemSymbolName: badgeName, accessibilityDescription: nil) != nil {
|
||||||
|
Image(systemName: badgeName)
|
||||||
|
} else {
|
||||||
|
ZStack(alignment: .topTrailing) {
|
||||||
|
Image(systemName: state.symbolName)
|
||||||
|
Circle()
|
||||||
|
.frame(width: 6, height: 6)
|
||||||
|
.offset(x: 3, y: -3)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Image(systemName: state.symbolName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@MainActor
|
@MainActor
|
||||||
final class AppDelegate: NSObject, NSApplicationDelegate {
|
final class AppDelegate: NSObject, NSApplicationDelegate {
|
||||||
let model: AppModel
|
let model: AppModel
|
||||||
@@ -41,9 +77,18 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
|
|||||||
Task { await model.bootstrap() }
|
Task { await model.bootstrap() }
|
||||||
}
|
}
|
||||||
|
|
||||||
private static func makeLaunchModel() -> AppModel {
|
/// Builds the model exactly the way the real app launches: paths come from
|
||||||
|
/// `TransportSettings.resolvedAppSupportPaths()` — transport-aware, so the watcher
|
||||||
|
/// this feeds is never seeded with a stale AirDrop folder while OneDrive is the
|
||||||
|
/// persisted transport (that was the BLOCKER this function used to have, when it
|
||||||
|
/// called the AirDrop-only `FolderSettings.resolvedAppSupportPaths()` instead).
|
||||||
|
/// `appSupportRoot` exists only so PickerSelfTest's relaunch-simulation sub-step can
|
||||||
|
/// point this at a temp directory instead of the real
|
||||||
|
/// ~/Library/Application Support/Shotdeck — production always calls this with no
|
||||||
|
/// argument (the real root). Internal, not private, for that same reason.
|
||||||
|
static func makeLaunchModel(appSupportRoot: URL? = nil) -> AppModel {
|
||||||
do {
|
do {
|
||||||
let paths = try FolderSettings.resolvedAppSupportPaths()
|
let paths = try TransportSettings.resolvedAppSupportPaths(root: appSupportRoot)
|
||||||
return try makeModel(paths: paths)
|
return try makeModel(paths: paths)
|
||||||
} catch {
|
} catch {
|
||||||
Log.ui.critical(
|
Log.ui.critical(
|
||||||
@@ -54,7 +99,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
|
|||||||
// Safe: temp-dir creation for a path this process controls cannot legitimately fail.
|
// Safe: temp-dir creation for a path this process controls cannot legitimately fail.
|
||||||
let fallback = try! AppSupportPaths(root: fallbackRoot, outbox: tmp, watchFolder: tmp)
|
let fallback = try! AppSupportPaths(root: fallbackRoot, outbox: tmp, watchFolder: tmp)
|
||||||
let model = try! makeModel(paths: fallback)
|
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
|
return model
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import Foundation
|
|||||||
|
|
||||||
public enum SessionState: String, Codable, Sendable {
|
public enum SessionState: String, Codable, Sendable {
|
||||||
case open // accepting captures
|
case open // accepting captures
|
||||||
case archived // its PDF has been built and sent; kept forever, never deleted
|
case archived // closed and kept as a past session (sent or not); pruned by retention
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The manifest persisted as session.json alongside the PNGs.
|
/// The manifest persisted as session.json alongside the PNGs.
|
||||||
@@ -11,7 +11,9 @@ public struct CaptureSession: Codable, Sendable, Identifiable, Equatable {
|
|||||||
public let createdAt: Date
|
public let createdAt: Date
|
||||||
public private(set) var state: SessionState
|
public private(set) var state: SessionState
|
||||||
public private(set) var captures: [Capture]
|
public private(set) var captures: [Capture]
|
||||||
/// Set when the PDF is built, so a re-send reuses the same file.
|
/// Set when the PDF is built, so a re-send reuses the same file. nil on a
|
||||||
|
/// session that was closed without ever sending — the Past submissions list
|
||||||
|
/// shows that as "Not sent".
|
||||||
public private(set) var pdfFileName: String?
|
public private(set) var pdfFileName: String?
|
||||||
|
|
||||||
public init(
|
public init(
|
||||||
@@ -61,7 +63,8 @@ public struct CaptureSession: Codable, Sendable, Identifiable, Equatable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Value-semantic: returns a new session; does not mutate `self`.
|
/// Value-semantic: returns a new session; does not mutate `self`.
|
||||||
public func markArchived(pdfFileName: String) -> CaptureSession {
|
/// `pdfFileName` is nil when the session is closed without ever sending.
|
||||||
|
public func markArchived(pdfFileName: String?) -> CaptureSession {
|
||||||
CaptureSession(
|
CaptureSession(
|
||||||
id: id,
|
id: id,
|
||||||
createdAt: createdAt,
|
createdAt: createdAt,
|
||||||
|
|||||||
@@ -10,13 +10,14 @@ public enum ShotdeckError: Error, LocalizedError, Sendable {
|
|||||||
case pdfCompositionFailed(reason: String)
|
case pdfCompositionFailed(reason: String)
|
||||||
case airDropUnavailable
|
case airDropUnavailable
|
||||||
case noCommentedReturns
|
case noCommentedReturns
|
||||||
|
case oneDriveFolderUnavailable(path: String)
|
||||||
|
|
||||||
public var errorDescription: String? {
|
public var errorDescription: String? {
|
||||||
switch self {
|
switch self {
|
||||||
case .screenRecordingNotGranted:
|
case .screenRecordingNotGranted:
|
||||||
return "Screen Recording is turned off. Grant it in System Settings to capture."
|
return "Screen Recording is turned off. Grant it in System Settings to capture."
|
||||||
case .noRegionRemembered:
|
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:
|
case .displayNoLongerConnected:
|
||||||
return "The display used for capture is no longer connected."
|
return "The display used for capture is no longer connected."
|
||||||
case .captureFailed(let underlying):
|
case .captureFailed(let underlying):
|
||||||
@@ -31,6 +32,8 @@ public enum ShotdeckError: Error, LocalizedError, Sendable {
|
|||||||
return "AirDrop is not available right now."
|
return "AirDrop is not available right now."
|
||||||
case .noCommentedReturns:
|
case .noCommentedReturns:
|
||||||
return "None of the returned PDFs have comments on them."
|
return "None of the returned PDFs have comments on them."
|
||||||
|
case .oneDriveFolderUnavailable(let path):
|
||||||
|
return "Your OneDrive folder is not available: \(path). Check that OneDrive is signed in, or choose another folder in Settings."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -70,8 +70,8 @@ public struct PDFComposer: Sendable {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static func fileName(for session: CaptureSession) -> String {
|
public static func fileName(for _: CaptureSession) -> String {
|
||||||
"Shotdeck-\(DubaiTime.fileStamp(session.createdAt)).pdf"
|
"Redline-\(DubaiTime.fileStamp(Date())).pdf"
|
||||||
}
|
}
|
||||||
|
|
||||||
private static func writePDF(
|
private static func writePDF(
|
||||||
@@ -86,7 +86,7 @@ public struct PDFComposer: Sendable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let auxiliaryInfo: [String: Any] = [
|
let auxiliaryInfo: [String: Any] = [
|
||||||
kCGPDFContextCreator as String: "Shotdeck",
|
kCGPDFContextCreator as String: "Redline",
|
||||||
kCGPDFContextTitle as String: title,
|
kCGPDFContextTitle as String: title,
|
||||||
kCGPDFContextSubject as String: sessionID.uuidString.lowercased(),
|
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.
|
/// 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 {
|
public static func isShotdeckDocument(_ document: PDFDocument) -> Bool {
|
||||||
if let creator = document.documentAttributes?[PDFDocumentAttribute.creatorAttribute] as? String {
|
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.
|
// Creator ABSENT (some apps rewrite metadata on save) -> filename fallback only here.
|
||||||
guard let name = document.documentURL?.lastPathComponent else { return false }
|
guard let name = document.documentURL?.lastPathComponent else { return false }
|
||||||
// .lastPathComponent on a file URL is already percent-decoded; do not use .absoluteString.
|
// .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).
|
// 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 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.
|
// the same name already exists in the watch folder — the normal case for a return.
|
||||||
|
|||||||
@@ -10,6 +10,21 @@ public actor ReturnWatcher {
|
|||||||
private var bridge: FSEventBridge?
|
private var bridge: FSEventBridge?
|
||||||
private var pendingScanTask: Task<Void, Never>?
|
private var pendingScanTask: Task<Void, Never>?
|
||||||
private let eventQueue = DispatchQueue(label: "ai.flowmaster.shotdeck.returns.fsevents")
|
private let eventQueue = DispatchQueue(label: "ai.flowmaster.shotdeck.returns.fsevents")
|
||||||
|
/// When false, a document with zero human marks is neither recorded into the ledger
|
||||||
|
/// nor included in scanNow's/onChange's results — needed for OneDrive mode, where the
|
||||||
|
/// outbox and watch folder are the same folder and a freshly written, unmarked PDF
|
||||||
|
/// must not be treated as a return. Defaults to true (today's AirDrop behaviour).
|
||||||
|
/// A document that IS commented is always recorded, regardless of this flag.
|
||||||
|
public var recordUncommented: Bool = true
|
||||||
|
|
||||||
|
/// The folder this watcher is CURRENTLY seeded to scan/watch — whatever `init`
|
||||||
|
/// last set it to, or `updateWatchFolder` since. Exposed so tests can observe the
|
||||||
|
/// watcher's seeded folder directly (e.g. right after construction, before
|
||||||
|
/// `start()`/`updateWatchFolder()` ever run) rather than only inferring it
|
||||||
|
/// indirectly through `scanNow()`'s behavior.
|
||||||
|
public var currentWatchFolder: URL {
|
||||||
|
watchFolder
|
||||||
|
}
|
||||||
|
|
||||||
/// Watch folder is `paths.watchFolder`, which production constructs from
|
/// Watch folder is `paths.watchFolder`, which production constructs from
|
||||||
/// `FolderSettings.resolve().watch`. This type never calls FolderSettings;
|
/// `FolderSettings.resolve().watch`. This type never calls FolderSettings;
|
||||||
@@ -29,6 +44,12 @@ public actor ReturnWatcher {
|
|||||||
onChange(found)
|
onChange(found)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Sets `recordUncommented`. A `func` (not a plain property set) only because
|
||||||
|
/// callers outside this actor must `await` it like any other actor mutation.
|
||||||
|
public func setRecordUncommented(_ value: Bool) {
|
||||||
|
recordUncommented = value
|
||||||
|
}
|
||||||
|
|
||||||
/// Idempotent. Stops and releases the FSEventStream if one is running; safe to call
|
/// Idempotent. Stops and releases the FSEventStream if one is running; safe to call
|
||||||
/// when never started or already stopped. Cancels any pending debounced scan.
|
/// when never started or already stopped. Cancels any pending debounced scan.
|
||||||
public func stop() {
|
public func stop() {
|
||||||
@@ -60,7 +81,7 @@ public actor ReturnWatcher {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Scans the watch folder once, immediately, without waiting for an event. Every
|
/// 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.
|
/// into the ledger; returns exactly the documents processed in this call.
|
||||||
@discardableResult
|
@discardableResult
|
||||||
public func scanNow() async throws -> [ReturnedDocument] {
|
public func scanNow() async throws -> [ReturnedDocument] {
|
||||||
@@ -77,6 +98,7 @@ public actor ReturnWatcher {
|
|||||||
guard let document = PDFDocument(url: url),
|
guard let document = PDFDocument(url: url),
|
||||||
AnnotationInspector.isShotdeckDocument(document) else { continue }
|
AnnotationInspector.isShotdeckDocument(document) else { continue }
|
||||||
guard let inspected = try? AnnotationInspector.inspect(fileURL: url) else { continue }
|
guard let inspected = try? AnnotationInspector.inspect(fileURL: url) else { continue }
|
||||||
|
if !recordUncommented, !inspected.isCommented { continue }
|
||||||
try await ledger.record(inspected)
|
try await ledger.record(inspected)
|
||||||
results.append(inspected)
|
results.append(inspected)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,13 @@ import CoreGraphics
|
|||||||
import Darwin
|
import Darwin
|
||||||
|
|
||||||
public actor SpoolStore {
|
public actor SpoolStore {
|
||||||
|
/// How many archived sessions (past submissions) are kept on disk. Ben's
|
||||||
|
/// retention rule (2026-10-11): "by default, retain the past 10 sessions" —
|
||||||
|
/// older session folders are removed from `archive/` once this is exceeded.
|
||||||
|
/// Any PDF a pruned session produced is not touched: it lives in the outbox
|
||||||
|
/// (or the OneDrive folder) it was sent to.
|
||||||
|
public static let defaultRetainedSessionCount = 10
|
||||||
|
|
||||||
private let paths: AppSupportPaths
|
private let paths: AppSupportPaths
|
||||||
private var openSession: CaptureSession
|
private var openSession: CaptureSession
|
||||||
|
|
||||||
@@ -28,9 +35,28 @@ public actor SpoolStore {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// The session currently accepting captures. Cheap accessor — all reconciliation already
|
/// The session currently accepting captures. Cheap accessor — all reconciliation already
|
||||||
/// happened once, inside init.
|
/// happened once, inside init. A truth guard: if the stored session is no longer really
|
||||||
|
/// open on disk (its directory was archived away and the replacement session could not
|
||||||
|
/// be created — e.g. disk full), a fresh session is minted, or the call fails loudly.
|
||||||
|
/// It never returns an already-archived session as the open one.
|
||||||
public func currentSession() throws -> CaptureSession {
|
public func currentSession() throws -> CaptureSession {
|
||||||
openSession
|
try ensureOpenSession()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Mint-or-verify the open session: returns the session that is REALLY open on disk,
|
||||||
|
/// creating a fresh one when the stored one is stale (archived away mid-run). Throws
|
||||||
|
/// loudly when no new session can be created either — never substitutes a lie.
|
||||||
|
private func ensureOpenSession() throws -> CaptureSession {
|
||||||
|
let dir = paths.sessionDirectory(openSession.id)
|
||||||
|
if openSession.state == .open && FileManager.default.fileExists(atPath: dir.path) {
|
||||||
|
return openSession
|
||||||
|
}
|
||||||
|
let staleID = openSession.id.uuidString
|
||||||
|
Log.spool.error(
|
||||||
|
"The stored open session \(staleID, privacy: .public) is not really open on disk; starting a fresh one.")
|
||||||
|
let fresh = try Self.createFreshSession(paths: paths)
|
||||||
|
openSession = fresh
|
||||||
|
return fresh
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Writes `pngData` to disk and fsyncs it BEFORE the manifest is touched, then updates and
|
/// Writes `pngData` to disk and fsyncs it BEFORE the manifest is touched, then updates and
|
||||||
@@ -40,32 +66,38 @@ public actor SpoolStore {
|
|||||||
pngData: Data, pixelWidth: Int, pixelHeight: Int,
|
pngData: Data, pixelWidth: Int, pixelHeight: Int,
|
||||||
scale: CGFloat, capturedAt: Date
|
scale: CGFloat, capturedAt: Date
|
||||||
) throws -> Capture {
|
) throws -> Capture {
|
||||||
|
let open = try ensureOpenSession()
|
||||||
let captureID = UUID()
|
let captureID = UUID()
|
||||||
let sequence = openSession.nextSequence
|
let sequence = open.nextSequence
|
||||||
let fileName = "\(String(format: "%03d", sequence))-\(Self.hexSuffix(captureID)).png"
|
let fileName = "\(String(format: "%03d", sequence))-\(Self.hexSuffix(captureID)).png"
|
||||||
let sessionDir = paths.sessionDirectory(openSession.id)
|
let sessionDir = paths.sessionDirectory(open.id)
|
||||||
let fileURL = sessionDir.appendingPathComponent(fileName)
|
let fileURL = sessionDir.appendingPathComponent(fileName)
|
||||||
try AtomicFile.write(pngData, to: fileURL)
|
try AtomicFile.write(pngData, to: fileURL)
|
||||||
let capture = Capture(
|
let capture = Capture(
|
||||||
id: captureID, sequence: sequence, fileName: fileName,
|
id: captureID, sequence: sequence, fileName: fileName,
|
||||||
pixelWidth: pixelWidth, pixelHeight: pixelHeight,
|
pixelWidth: pixelWidth, pixelHeight: pixelHeight,
|
||||||
scale: scale, capturedAt: capturedAt)
|
scale: scale, capturedAt: capturedAt)
|
||||||
let updated = openSession.appending(capture)
|
let updated = open.appending(capture)
|
||||||
try AtomicFile.writeJSON(updated, to: sessionDir.appendingPathComponent("session.json"))
|
try AtomicFile.writeJSON(updated, to: sessionDir.appendingPathComponent("session.json"))
|
||||||
openSession = updated
|
openSession = updated
|
||||||
return capture
|
return capture
|
||||||
}
|
}
|
||||||
|
|
||||||
/// D-11: moves the capture's PNG into `<sessionDir>/removed/` (created lazily) and drops
|
/// D-11: moves the capture's PNG into `<sessionDir>/removed/` (created lazily) and drops
|
||||||
/// its manifest entry. NEVER unlinks/deletes a user PNG. Throws (no filesystem change) if
|
/// its manifest entry. NEVER unlinks/deletes a user PNG on this path. Throws (no
|
||||||
/// `captureID` is not present in the open session.
|
/// filesystem change) if `captureID` is not present in the open session.
|
||||||
|
/// (Session retention is the one place that removes files: when a session falls
|
||||||
|
/// outside the newest `defaultRetainedSessionCount`, its WHOLE folder — including
|
||||||
|
/// `removed/` — is pruned. That is the requested retention policy (Ben, 2026-10-11),
|
||||||
|
/// not this remove path.)
|
||||||
public func remove(captureID: UUID) throws -> CaptureSession {
|
public func remove(captureID: UUID) throws -> CaptureSession {
|
||||||
guard let capture = openSession.captures.first(where: { $0.id == captureID }) else {
|
let open = try ensureOpenSession()
|
||||||
|
guard let capture = open.captures.first(where: { $0.id == captureID }) else {
|
||||||
throw ShotdeckError.spoolWriteFailed(
|
throw ShotdeckError.spoolWriteFailed(
|
||||||
path: paths.sessionDirectory(openSession.id).path,
|
path: paths.sessionDirectory(open.id).path,
|
||||||
underlying: "capture \(captureID) is not in the open session")
|
underlying: "capture \(captureID) is not in the open session")
|
||||||
}
|
}
|
||||||
let sessionDir = paths.sessionDirectory(openSession.id)
|
let sessionDir = paths.sessionDirectory(open.id)
|
||||||
let removedDir = sessionDir.appendingPathComponent("removed", isDirectory: true)
|
let removedDir = sessionDir.appendingPathComponent("removed", isDirectory: true)
|
||||||
do {
|
do {
|
||||||
try FileManager.default.createDirectory(at: removedDir, withIntermediateDirectories: true)
|
try FileManager.default.createDirectory(at: removedDir, withIntermediateDirectories: true)
|
||||||
@@ -87,35 +119,110 @@ public actor SpoolStore {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Closes the open session (must be non-empty), moves its directory under archive/, records
|
/// Closes the open session (must be non-empty), moves its directory under archive/, records
|
||||||
/// pdfFileName, and starts a fresh empty open session. Returns the archived one.
|
/// pdfFileName, starts a fresh empty open session, and applies session retention.
|
||||||
|
/// Returns the archived one.
|
||||||
public func archiveCurrent(pdfFileName: String) throws -> CaptureSession {
|
public func archiveCurrent(pdfFileName: String) throws -> CaptureSession {
|
||||||
guard !openSession.isEmpty else {
|
let open = try ensureOpenSession()
|
||||||
|
guard !open.isEmpty else {
|
||||||
throw ShotdeckError.spoolWriteFailed(
|
throw ShotdeckError.spoolWriteFailed(
|
||||||
path: paths.sessionDirectory(openSession.id).path,
|
path: paths.sessionDirectory(open.id).path,
|
||||||
underlying: "cannot archive an empty session")
|
underlying: "cannot archive an empty session")
|
||||||
}
|
}
|
||||||
let archived = openSession.markArchived(pdfFileName: pdfFileName)
|
let archived = try moveOpenSessionToArchive(open.markArchived(pdfFileName: pdfFileName))
|
||||||
let sessionDir = paths.sessionDirectory(openSession.id)
|
openSession = try Self.createFreshSession(paths: paths)
|
||||||
|
applyRetention()
|
||||||
|
return archived
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Closes the open session — sent or not — and keeps its captures as a past
|
||||||
|
/// session under archive/, then starts a fresh empty open session. Unlike
|
||||||
|
/// `archiveCurrent(pdfFileName:)` this never requires a PDF: the archived session
|
||||||
|
/// keeps whatever pdfFileName it already has (nil when it was never sent, which
|
||||||
|
/// the Past submissions list shows as "Not sent"). An empty open session is
|
||||||
|
/// simply replaced — there is nothing to keep. Returns the archived session, or
|
||||||
|
/// nil when the open session was empty.
|
||||||
|
public func closeCurrentSession() throws -> CaptureSession? {
|
||||||
|
let open = try ensureOpenSession()
|
||||||
|
guard !open.isEmpty else {
|
||||||
|
openSession = try Self.createFreshSession(paths: paths)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
let archived = try moveOpenSessionToArchive(
|
||||||
|
open.markArchived(pdfFileName: open.pdfFileName))
|
||||||
|
openSession = try Self.createFreshSession(paths: paths)
|
||||||
|
applyRetention()
|
||||||
|
return archived
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Keeps the newest `limit` archived sessions and removes the rest of the session
|
||||||
|
/// folders from archive/ (the single folder all sessions live in). Returns the
|
||||||
|
/// removed ids. Only UUID session folders directly under archive/ are ever
|
||||||
|
/// touched — never spool/, never anything else. This is the requested retention
|
||||||
|
/// policy (Ben, 2026-10-11: "retain the past 10 sessions"): a session folder
|
||||||
|
/// dropped here is gone for good, while any PDF it produced stays in the
|
||||||
|
/// outbox/OneDrive folder it was sent to.
|
||||||
|
public func pruneArchivedSessions(keeping limit: Int) throws -> [UUID] {
|
||||||
|
let sessions = try archivedSessions()
|
||||||
|
guard sessions.count > limit else { return [] }
|
||||||
|
var removed: [UUID] = []
|
||||||
|
for session in sessions.dropFirst(limit) {
|
||||||
|
let dir = paths.archiveDirectory(session.id)
|
||||||
|
do {
|
||||||
|
try FileManager.default.removeItem(at: dir)
|
||||||
|
} catch {
|
||||||
|
throw ShotdeckError.spoolWriteFailed(
|
||||||
|
path: dir.path,
|
||||||
|
underlying: "could not remove an expired session: \(error.localizedDescription)")
|
||||||
|
}
|
||||||
|
removed.append(session.id)
|
||||||
|
}
|
||||||
|
try AtomicFile.fsyncDirectory(at: paths.archive)
|
||||||
|
return removed
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The retention policy every archive path funnels through, so it can never be
|
||||||
|
/// forgotten: sessions over the default count are pruned. A retention failure is
|
||||||
|
/// logged loudly (with the exact path) and never thrown — the archive it follows
|
||||||
|
/// already succeeded, and converting a completed send into a reported failure
|
||||||
|
/// would be a lie (the safe direction of a failed prune is keeping too much, never
|
||||||
|
/// losing data). The visible symptom of a failed prune is simply more than 10
|
||||||
|
/// sessions in the Past submissions list.
|
||||||
|
private func applyRetention() {
|
||||||
|
do {
|
||||||
|
let removed = try pruneArchivedSessions(keeping: Self.defaultRetainedSessionCount)
|
||||||
|
if !removed.isEmpty {
|
||||||
|
Log.spool.warning(
|
||||||
|
"Session retention: removed \(removed.count, privacy: .public) archived session(s) beyond the newest \(Self.defaultRetainedSessionCount, privacy: .public).")
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
Log.spool.error(
|
||||||
|
"Session retention failed — past sessions were kept beyond \(Self.defaultRetainedSessionCount, privacy: .public): \((error as? ShotdeckError)?.errorDescription ?? error.localizedDescription, privacy: .public)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Writes the archived manifest, then renames the whole session directory from
|
||||||
|
/// spool/ into archive/ in one atomic operation.
|
||||||
|
private func moveOpenSessionToArchive(_ archived: CaptureSession) throws -> CaptureSession {
|
||||||
|
let sessionDir = paths.sessionDirectory(archived.id)
|
||||||
try AtomicFile.writeJSON(archived, to: sessionDir.appendingPathComponent("session.json"))
|
try AtomicFile.writeJSON(archived, to: sessionDir.appendingPathComponent("session.json"))
|
||||||
let archiveDir = paths.archiveDirectory(openSession.id)
|
let archiveDir = paths.archiveDirectory(archived.id)
|
||||||
guard rename(sessionDir.path, archiveDir.path) == 0 else {
|
guard rename(sessionDir.path, archiveDir.path) == 0 else {
|
||||||
throw ShotdeckError.spoolWriteFailed(
|
throw ShotdeckError.spoolWriteFailed(
|
||||||
path: sessionDir.path,
|
path: sessionDir.path,
|
||||||
underlying: "could not move the session into archive/: \(String(cString: strerror(errno)))")
|
underlying: "could not move the session into archive/: \(String(cString: strerror(errno)))")
|
||||||
}
|
}
|
||||||
try AtomicFile.fsyncDirectory(at: paths.archive)
|
try AtomicFile.fsyncDirectory(at: paths.archive)
|
||||||
let fresh = try Self.createFreshSession(paths: paths)
|
|
||||||
openSession = fresh
|
|
||||||
return archived
|
return archived
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Abandons the open session only if it is empty (mints a new id/dir/manifest); throws,
|
/// Abandons the open session only if it is empty (mints a new id/dir/manifest); throws,
|
||||||
/// with no filesystem change, if the open session has captures.
|
/// with no filesystem change, if the open session has captures.
|
||||||
public func startNewSession() throws -> CaptureSession {
|
public func startNewSession() throws -> CaptureSession {
|
||||||
guard openSession.isEmpty else {
|
let open = try ensureOpenSession()
|
||||||
|
guard open.isEmpty else {
|
||||||
throw ShotdeckError.spoolWriteFailed(
|
throw ShotdeckError.spoolWriteFailed(
|
||||||
path: paths.sessionDirectory(openSession.id).path,
|
path: paths.sessionDirectory(open.id).path,
|
||||||
underlying: "cannot start a new session: \(openSession.captures.count) capture(s) present in the open session")
|
underlying: "cannot start a new session: \(open.captures.count) capture(s) present in the open session")
|
||||||
}
|
}
|
||||||
let fresh = try Self.createFreshSession(paths: paths)
|
let fresh = try Self.createFreshSession(paths: paths)
|
||||||
openSession = fresh
|
openSession = fresh
|
||||||
@@ -129,19 +236,44 @@ public actor SpoolStore {
|
|||||||
return dir.appendingPathComponent(capture.fileName)
|
return dir.appendingPathComponent(capture.fileName)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Archived sessions, newest createdAt first. Lazily reconciles each archive/ directory
|
/// Archived sessions, newest first. Lazily reconciles each archive/ directory
|
||||||
/// the same way init reconciles spool/ candidates (orphan recovery, missing-drop, corrupt
|
/// the same way init reconciles spool/ candidates (orphan recovery, missing-drop, corrupt
|
||||||
/// rebuild) — an archived session's manifest can degrade too and must self-heal without
|
/// rebuild) — an archived session's manifest can degrade too and must self-heal without
|
||||||
/// ever losing a PNG.
|
/// ever losing a PNG.
|
||||||
|
///
|
||||||
|
/// Order: manifest `createdAt` first (whole-second ISO8601 — the manifest format is
|
||||||
|
/// pinned in AtomicFileTests), then the session folder's creation date and content
|
||||||
|
/// modification date to break ties at real resolution (two sessions closed in the
|
||||||
|
/// same second would otherwise order, and therefore prune, arbitrarily by UUID —
|
||||||
|
/// and on a volume that reports no creation date the modification date still keeps
|
||||||
|
/// retention on real order), then the id as the final deterministic tie-break.
|
||||||
|
/// The folder dates are tie-break refinements only — the manifest `createdAt` stays
|
||||||
|
/// the authoritative timestamp; if a volume reports neither date the tie-break
|
||||||
|
/// degrades to the id.
|
||||||
public func archivedSessions() throws -> [CaptureSession] {
|
public func archivedSessions() throws -> [CaptureSession] {
|
||||||
let ids = try Self.listUUIDDirectories(in: paths.archive, fileManager: .default)
|
let ids = try Self.listUUIDDirectories(in: paths.archive, fileManager: .default)
|
||||||
var sessions: [CaptureSession] = []
|
var keyed: [(session: CaptureSession, folderCreatedAt: Date, folderModifiedAt: Date)] = []
|
||||||
for id in ids {
|
for id in ids {
|
||||||
sessions.append(
|
let dir = paths.archiveDirectory(id)
|
||||||
try Self.reconcileSessionDirectory(
|
// Read the folder dates BEFORE reconciling: reconciliation can rewrite
|
||||||
at: paths.archiveDirectory(id), id: id, assumedStateIfRebuilt: .archived, fileManager: .default))
|
// session.json and bump the folder's modification date to "now", which
|
||||||
|
// would let a healed older session outrank a genuinely newer same-second
|
||||||
|
// peer in the tie-break below.
|
||||||
|
let values = try? dir.resourceValues(forKeys: [.creationDateKey, .contentModificationDateKey])
|
||||||
|
let session = try Self.reconcileSessionDirectory(
|
||||||
|
at: dir, id: id, assumedStateIfRebuilt: .archived, fileManager: .default)
|
||||||
|
// The manifest `createdAt` is the authoritative timestamp; the folder dates
|
||||||
|
// only refine ties between same-second sessions.
|
||||||
|
let folderCreatedAt = values?.creationDate ?? session.createdAt
|
||||||
|
let folderModifiedAt = values?.contentModificationDate ?? folderCreatedAt
|
||||||
|
keyed.append((session, folderCreatedAt, folderModifiedAt))
|
||||||
}
|
}
|
||||||
return sessions.sorted { ($0.createdAt, $0.id.uuidString) > ($1.createdAt, $1.id.uuidString) }
|
return keyed
|
||||||
|
.sorted { lhs, rhs in
|
||||||
|
(lhs.session.createdAt, lhs.folderCreatedAt, lhs.folderModifiedAt, lhs.session.id.uuidString)
|
||||||
|
> (rhs.session.createdAt, rhs.folderCreatedAt, rhs.folderModifiedAt, rhs.session.id.uuidString)
|
||||||
|
}
|
||||||
|
.map(\.session)
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: - Reconciliation (static so they can run inside init)
|
// MARK: - Reconciliation (static so they can run inside init)
|
||||||
|
|||||||
@@ -11,12 +11,6 @@ public struct AppSupportPaths: Sendable {
|
|||||||
/// Production paths.
|
/// Production paths.
|
||||||
public static func standard() throws -> AppSupportPaths {
|
public static func standard() throws -> AppSupportPaths {
|
||||||
let fileManager = FileManager.default
|
let fileManager = FileManager.default
|
||||||
let appSupportParent = try fileManager.url(
|
|
||||||
for: .applicationSupportDirectory,
|
|
||||||
in: .userDomainMask,
|
|
||||||
appropriateFor: nil,
|
|
||||||
create: true
|
|
||||||
)
|
|
||||||
let desktop = try fileManager.url(
|
let desktop = try fileManager.url(
|
||||||
for: .desktopDirectory,
|
for: .desktopDirectory,
|
||||||
in: .userDomainMask,
|
in: .userDomainMask,
|
||||||
@@ -29,10 +23,25 @@ public struct AppSupportPaths: Sendable {
|
|||||||
appropriateFor: nil,
|
appropriateFor: nil,
|
||||||
create: true
|
create: true
|
||||||
)
|
)
|
||||||
let root = appSupportParent.appendingPathComponent("Shotdeck", isDirectory: true)
|
let root = try standardRoot(fileManager: fileManager)
|
||||||
return try AppSupportPaths(root: root, outbox: desktop, watchFolder: downloads)
|
return try AppSupportPaths(root: root, outbox: desktop, watchFolder: downloads)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The standard `~/Library/Application Support/Shotdeck` root. Shared by
|
||||||
|
/// `standard()`, `FolderSettings.resolvedAppSupportPaths()`, and
|
||||||
|
/// `TransportSettings.resolvedAppSupportPaths()` so all three agree on where the
|
||||||
|
/// root lives — the folder-resolution logic (AirDrop-only vs transport-aware)
|
||||||
|
/// differs between those, the root computation never should.
|
||||||
|
public static func standardRoot(fileManager: FileManager = .default) throws -> URL {
|
||||||
|
let appSupportParent = try fileManager.url(
|
||||||
|
for: .applicationSupportDirectory,
|
||||||
|
in: .userDomainMask,
|
||||||
|
appropriateFor: nil,
|
||||||
|
create: true
|
||||||
|
)
|
||||||
|
return appSupportParent.appendingPathComponent("Shotdeck", isDirectory: true)
|
||||||
|
}
|
||||||
|
|
||||||
/// Test paths rooted anywhere. Every directory is created if missing.
|
/// Test paths rooted anywhere. Every directory is created if missing.
|
||||||
public init(root: URL, outbox: URL, watchFolder: URL) throws {
|
public init(root: URL, outbox: URL, watchFolder: URL) throws {
|
||||||
self.root = root
|
self.root = root
|
||||||
|
|||||||
@@ -70,15 +70,7 @@ public enum FolderSettings {
|
|||||||
defaults: UserDefaults = .standard,
|
defaults: UserDefaults = .standard,
|
||||||
fileManager: FileManager = .default
|
fileManager: FileManager = .default
|
||||||
) throws -> AppSupportPaths {
|
) throws -> AppSupportPaths {
|
||||||
let resolvedRoot: URL
|
let resolvedRoot = try root ?? AppSupportPaths.standardRoot(fileManager: fileManager)
|
||||||
if let root {
|
|
||||||
resolvedRoot = root
|
|
||||||
} else {
|
|
||||||
let appSupportParent = try fileManager.url(
|
|
||||||
for: .applicationSupportDirectory, in: .userDomainMask,
|
|
||||||
appropriateFor: nil, create: true)
|
|
||||||
resolvedRoot = appSupportParent.appendingPathComponent("Shotdeck", isDirectory: true)
|
|
||||||
}
|
|
||||||
let folders = resolve(defaults: defaults, fileManager: fileManager)
|
let folders = resolve(defaults: defaults, fileManager: fileManager)
|
||||||
return try AppSupportPaths(root: resolvedRoot, outbox: folders.outbox, watchFolder: folders.watch)
|
return try AppSupportPaths(root: resolvedRoot, outbox: folders.outbox, watchFolder: folders.watch)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,221 @@
|
|||||||
|
import Foundation
|
||||||
|
|
||||||
|
/// The two ways a composed PDF can reach the iPad and come back marked up.
|
||||||
|
public enum SendTransport: String, Codable, Sendable, CaseIterable {
|
||||||
|
case airDrop
|
||||||
|
case oneDrive
|
||||||
|
|
||||||
|
public var displayName: String {
|
||||||
|
switch self {
|
||||||
|
case .airDrop: return "AirDrop"
|
||||||
|
case .oneDrive: return "OneDrive folder"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// User-configurable transport choice plus the OneDrive folder override, backed by
|
||||||
|
/// UserDefaults the same way `FolderSettings` is. See `FolderSettings` for why a plain
|
||||||
|
/// path (not a security-scoped bookmark) is correct for this unsandboxed app.
|
||||||
|
public enum TransportSettings {
|
||||||
|
public static let transportDefaultsKey = "ai.flowmaster.shotdeck.transport"
|
||||||
|
public static let oneDriveFolderDefaultsKey = "ai.flowmaster.shotdeck.oneDriveFolder"
|
||||||
|
|
||||||
|
/// Defaults to `.airDrop` when unset or when the stored value cannot be parsed.
|
||||||
|
public static func transport(defaults: UserDefaults = .standard) -> SendTransport {
|
||||||
|
guard let raw = defaults.string(forKey: transportDefaultsKey),
|
||||||
|
let value = SendTransport(rawValue: raw)
|
||||||
|
else { return .airDrop }
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
|
||||||
|
public static func setTransport(_ value: SendTransport, defaults: UserDefaults = .standard) {
|
||||||
|
defaults.set(value.rawValue, forKey: transportDefaultsKey)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Raw stored path (or nil if never set / cleared). Does NOT validate that the
|
||||||
|
/// directory still exists.
|
||||||
|
public static func storedOneDriveFolderPath(defaults: UserDefaults = .standard) -> String? {
|
||||||
|
defaults.string(forKey: oneDriveFolderDefaultsKey)
|
||||||
|
}
|
||||||
|
|
||||||
|
public static func setOneDriveFolder(_ url: URL, defaults: UserDefaults = .standard) {
|
||||||
|
defaults.set(url.path, forKey: oneDriveFolderDefaultsKey)
|
||||||
|
}
|
||||||
|
|
||||||
|
public static func resetOneDriveFolder(defaults: UserDefaults = .standard) {
|
||||||
|
defaults.removeObject(forKey: oneDriveFolderDefaultsKey)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The outbox/watch folders Redline should actually use right now, for the current
|
||||||
|
/// transport. AirDrop mode delegates to `FolderSettings.resolve()` unchanged.
|
||||||
|
/// OneDrive mode uses the SAME folder for both outbox and watch — see
|
||||||
|
/// `OneDriveLocator.resolveOneDriveFolder`. When no OneDrive folder can be resolved
|
||||||
|
/// at all (no sync root, no override), this falls back to the AirDrop folders so the
|
||||||
|
/// app always has somewhere to write; `send(anchor:)` performs its own live
|
||||||
|
/// existence check before ever composing into a OneDrive send, so that fallback is
|
||||||
|
/// never mistaken for a valid OneDrive destination.
|
||||||
|
public static func effectiveFolders(
|
||||||
|
defaults: UserDefaults = .standard,
|
||||||
|
fileManager: FileManager = .default
|
||||||
|
) -> (outbox: URL, watch: URL, transport: SendTransport) {
|
||||||
|
let transport = transport(defaults: defaults)
|
||||||
|
switch transport {
|
||||||
|
case .airDrop:
|
||||||
|
let folders = FolderSettings.resolve(defaults: defaults, fileManager: fileManager)
|
||||||
|
return (folders.outbox, folders.watch, transport)
|
||||||
|
case .oneDrive:
|
||||||
|
if let folder = OneDriveLocator.resolveOneDriveFolder(
|
||||||
|
defaults: defaults,
|
||||||
|
home: fileManager.homeDirectoryForCurrentUser,
|
||||||
|
fileManager: fileManager
|
||||||
|
) {
|
||||||
|
return (folder, folder, transport)
|
||||||
|
}
|
||||||
|
let folders = FolderSettings.resolve(defaults: defaults, fileManager: fileManager)
|
||||||
|
return (folders.outbox, folders.watch, transport)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Builds an `AppSupportPaths` using `root` (defaults to the standard
|
||||||
|
/// `~/Library/Application Support/Shotdeck` when nil) plus whatever
|
||||||
|
/// `effectiveFolders()` returns for outbox/watch. Unlike
|
||||||
|
/// `FolderSettings.resolvedAppSupportPaths()` (AirDrop-only), this is
|
||||||
|
/// transport-aware — it is the ONLY function launch code should use to build its
|
||||||
|
/// paths, so the watcher it feeds is never seeded with a stale AirDrop folder while
|
||||||
|
/// OneDrive is the persisted transport. `root` is exposed purely so tests (and the
|
||||||
|
/// ONEDRIVE-SELFTEST relaunch simulation) can point it at a temporary directory
|
||||||
|
/// instead of the user's real Application Support folder.
|
||||||
|
public static func resolvedAppSupportPaths(
|
||||||
|
root: URL? = nil,
|
||||||
|
defaults: UserDefaults = .standard,
|
||||||
|
fileManager: FileManager = .default
|
||||||
|
) throws -> AppSupportPaths {
|
||||||
|
let resolvedRoot = try root ?? AppSupportPaths.standardRoot(fileManager: fileManager)
|
||||||
|
let folders = effectiveFolders(defaults: defaults, fileManager: fileManager)
|
||||||
|
return try AppSupportPaths(root: resolvedRoot, outbox: folders.outbox, watchFolder: folders.watch)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Pure path logic for locating a OneDrive sync root under
|
||||||
|
/// `~/Library/CloudStorage` and the Redline folder inside it. No side effects — never
|
||||||
|
/// creates a directory. Fully unit-testable with a fake home tree.
|
||||||
|
public enum OneDriveLocator {
|
||||||
|
/// Every directory directly under `<home>/Library/CloudStorage` whose name starts
|
||||||
|
/// with "OneDrive-", sorted so a name containing "MMD" (case-insensitive) sorts
|
||||||
|
/// first, then alphabetically. Empty when CloudStorage does not exist.
|
||||||
|
public static func syncRoots(
|
||||||
|
home: URL = FileManager.default.homeDirectoryForCurrentUser,
|
||||||
|
fileManager: FileManager = .default
|
||||||
|
) -> [URL] {
|
||||||
|
let cloudStorage = home.appendingPathComponent("Library/CloudStorage", isDirectory: true)
|
||||||
|
var isDirectory: ObjCBool = false
|
||||||
|
guard fileManager.fileExists(atPath: cloudStorage.path, isDirectory: &isDirectory),
|
||||||
|
isDirectory.boolValue
|
||||||
|
else { return [] }
|
||||||
|
|
||||||
|
let items = (try? fileManager.contentsOfDirectory(
|
||||||
|
at: cloudStorage,
|
||||||
|
includingPropertiesForKeys: [.isDirectoryKey],
|
||||||
|
options: [.skipsHiddenFiles]
|
||||||
|
)) ?? []
|
||||||
|
|
||||||
|
let roots = items.filter { url in
|
||||||
|
guard url.lastPathComponent.hasPrefix("OneDrive-") else { return false }
|
||||||
|
var itemIsDirectory: ObjCBool = false
|
||||||
|
let exists = fileManager.fileExists(atPath: url.path, isDirectory: &itemIsDirectory)
|
||||||
|
return exists && itemIsDirectory.boolValue
|
||||||
|
}
|
||||||
|
|
||||||
|
return roots.sorted { a, b in
|
||||||
|
let aName = a.lastPathComponent
|
||||||
|
let bName = b.lastPathComponent
|
||||||
|
let aIsMMD = aName.localizedCaseInsensitiveContains("MMD")
|
||||||
|
let bIsMMD = bName.localizedCaseInsensitiveContains("MMD")
|
||||||
|
if aIsMMD != bIsMMD { return aIsMMD }
|
||||||
|
return aName.localizedStandardCompare(bName) == .orderedAscending
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// First sync root's "Redline" subfolder, or nil when there is no sync root at all.
|
||||||
|
public static func defaultRedlineFolder(
|
||||||
|
home: URL = FileManager.default.homeDirectoryForCurrentUser,
|
||||||
|
fileManager: FileManager = .default
|
||||||
|
) -> URL? {
|
||||||
|
guard let first = syncRoots(home: home, fileManager: fileManager).first else { return nil }
|
||||||
|
return first.appendingPathComponent("Redline", isDirectory: true)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The stored override when it is set AND still exists as a directory; otherwise
|
||||||
|
/// `defaultRedlineFolder`. Never creates anything.
|
||||||
|
public static func resolveOneDriveFolder(
|
||||||
|
defaults: UserDefaults = .standard,
|
||||||
|
home: URL = FileManager.default.homeDirectoryForCurrentUser,
|
||||||
|
fileManager: FileManager = .default
|
||||||
|
) -> URL? {
|
||||||
|
if let storedPath = TransportSettings.storedOneDriveFolderPath(defaults: defaults) {
|
||||||
|
var isDirectory: ObjCBool = false
|
||||||
|
let exists = fileManager.fileExists(atPath: storedPath, isDirectory: &isDirectory)
|
||||||
|
if exists, isDirectory.boolValue {
|
||||||
|
return URL(fileURLWithPath: storedPath, isDirectory: true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return defaultRedlineFolder(home: home, fileManager: fileManager)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// True when `url` exists as a directory AND is writable by the current process.
|
||||||
|
/// The live check `send(anchor:)` performs before ever composing into a OneDrive
|
||||||
|
/// destination — a directory that exists but has had its permissions revoked (e.g.
|
||||||
|
/// `chmod 500`) must be treated as unavailable, not silently attempted and
|
||||||
|
/// surfaced as a generic PDF-composition failure.
|
||||||
|
public static func isWritableDirectory(
|
||||||
|
at url: URL,
|
||||||
|
fileManager: FileManager = .default
|
||||||
|
) -> Bool {
|
||||||
|
var isDirectory: ObjCBool = false
|
||||||
|
let exists = fileManager.fileExists(atPath: url.path, isDirectory: &isDirectory)
|
||||||
|
guard exists, isDirectory.boolValue else { return false }
|
||||||
|
return fileManager.isWritableFile(atPath: url.path)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Writes a tiny probe file into `folder`, fsyncs it, then removes it — the only
|
||||||
|
/// reliable way to catch a OneDrive Files-On-Demand directory whose provider domain
|
||||||
|
/// is signed out: such a directory can report as existing and POSIX-writable
|
||||||
|
/// (`isWritableDirectory` returns true) while an actual write fails. True only when
|
||||||
|
/// the write, fsync, AND removal of the probe file all succeed; any failure at any
|
||||||
|
/// of those steps means false, so the caller treats the folder as unavailable
|
||||||
|
/// rather than proceeding to compose a real PDF into it.
|
||||||
|
public static func probeWritable(
|
||||||
|
at folder: URL,
|
||||||
|
fileManager: FileManager = .default
|
||||||
|
) -> Bool {
|
||||||
|
let probeURL = folder.appendingPathComponent(".redline-probe-\(UUID().uuidString)")
|
||||||
|
// Belt-and-suspenders cleanup, unconditional: AtomicFile.write renames the temp
|
||||||
|
// file onto probeURL and THEN fsyncs the containing directory — if that last
|
||||||
|
// fsync throws, the probe file already exists on disk but the catch below
|
||||||
|
// returns false before ever reaching the explicit removeItem call. And if the
|
||||||
|
// explicit removeItem itself throws, this is the only retry it gets. Either
|
||||||
|
// way, never leave the probe file behind just because we're about to return.
|
||||||
|
defer {
|
||||||
|
if fileManager.fileExists(atPath: probeURL.path) {
|
||||||
|
try? fileManager.removeItem(at: probeURL)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
do {
|
||||||
|
try AtomicFile.write(Data(), to: probeURL)
|
||||||
|
} catch {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
do {
|
||||||
|
try fileManager.removeItem(at: probeURL)
|
||||||
|
} catch {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only true when the explicit removal above actually succeeded AND the file is
|
||||||
|
// confirmed gone — never trust a removeItem call that returned without throwing
|
||||||
|
// as proof of anything on a File Provider domain.
|
||||||
|
return !fileManager.fileExists(atPath: probeURL.path)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -371,6 +371,72 @@ func i19b_presentNonShotdeckCreatorBeatsMatchingFilename() throws {
|
|||||||
#expect(AnnotationInspector.isShotdeckDocument(reopened) == false)
|
#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(
|
private func expectSinglePageMark(
|
||||||
_ subtype: PDFAnnotationSubtype,
|
_ subtype: PDFAnnotationSubtype,
|
||||||
bounds: CGRect,
|
bounds: CGRect,
|
||||||
|
|||||||
@@ -0,0 +1,125 @@
|
|||||||
|
import Foundation
|
||||||
|
import Testing
|
||||||
|
import ShotdeckCore
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func syncRootsFindsOneDriveDirsMMDFirstIgnoresNonDirsAndOtherProviders() throws {
|
||||||
|
let home = try makeFakeHome()
|
||||||
|
defer { try? FileManager.default.removeItem(at: home) }
|
||||||
|
let cloudStorage = home.appendingPathComponent("Library/CloudStorage", isDirectory: true)
|
||||||
|
try FileManager.default.createDirectory(at: cloudStorage, withIntermediateDirectories: true)
|
||||||
|
|
||||||
|
try FileManager.default.createDirectory(
|
||||||
|
at: cloudStorage.appendingPathComponent("OneDrive-Flowmaster", isDirectory: true),
|
||||||
|
withIntermediateDirectories: true
|
||||||
|
)
|
||||||
|
try FileManager.default.createDirectory(
|
||||||
|
at: cloudStorage.appendingPathComponent("OneDrive-MMDGROUP", isDirectory: true),
|
||||||
|
withIntermediateDirectories: true
|
||||||
|
)
|
||||||
|
try FileManager.default.createDirectory(
|
||||||
|
at: cloudStorage.appendingPathComponent("GoogleDrive-x", isDirectory: true),
|
||||||
|
withIntermediateDirectories: true
|
||||||
|
)
|
||||||
|
// A plain FILE (not a directory) named like a OneDrive root must be ignored.
|
||||||
|
FileManager.default.createFile(
|
||||||
|
atPath: cloudStorage.appendingPathComponent("OneDrive-notadir").path,
|
||||||
|
contents: Data("not a directory".utf8)
|
||||||
|
)
|
||||||
|
|
||||||
|
let roots = OneDriveLocator.syncRoots(home: home, fileManager: .default)
|
||||||
|
|
||||||
|
#expect(roots.map(\.lastPathComponent) == ["OneDrive-MMDGROUP", "OneDrive-Flowmaster"])
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func syncRootsEmptyAndDefaultFolderNilWithNoCloudStorageDirectory() throws {
|
||||||
|
let home = try makeFakeHome()
|
||||||
|
defer { try? FileManager.default.removeItem(at: home) }
|
||||||
|
// No Library/CloudStorage created at all.
|
||||||
|
|
||||||
|
let roots = OneDriveLocator.syncRoots(home: home, fileManager: .default)
|
||||||
|
#expect(roots.isEmpty)
|
||||||
|
|
||||||
|
let defaultFolder = OneDriveLocator.defaultRedlineFolder(home: home, fileManager: .default)
|
||||||
|
#expect(defaultFolder == nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func defaultRedlineFolderIsFirstSyncRootPlusRedline() throws {
|
||||||
|
let home = try makeFakeHome()
|
||||||
|
defer { try? FileManager.default.removeItem(at: home) }
|
||||||
|
let cloudStorage = home.appendingPathComponent("Library/CloudStorage", isDirectory: true)
|
||||||
|
try FileManager.default.createDirectory(
|
||||||
|
at: cloudStorage.appendingPathComponent("OneDrive-MMDGROUP", isDirectory: true),
|
||||||
|
withIntermediateDirectories: true
|
||||||
|
)
|
||||||
|
try FileManager.default.createDirectory(
|
||||||
|
at: cloudStorage.appendingPathComponent("OneDrive-Flowmaster", isDirectory: true),
|
||||||
|
withIntermediateDirectories: true
|
||||||
|
)
|
||||||
|
|
||||||
|
let defaultFolder = try #require(
|
||||||
|
OneDriveLocator.defaultRedlineFolder(home: home, fileManager: .default)
|
||||||
|
)
|
||||||
|
// Derive "expected" from syncRoots() itself (already covered by its own dedicated
|
||||||
|
// test) rather than hand-building the path string — FileManager's directory
|
||||||
|
// enumeration can canonicalize /var -> /private/var and the two constructions
|
||||||
|
// otherwise disagree on that even for a URL that already exists.
|
||||||
|
let expectedRoot = try #require(OneDriveLocator.syncRoots(home: home, fileManager: .default).first)
|
||||||
|
let expected = expectedRoot.appendingPathComponent("Redline", isDirectory: true)
|
||||||
|
#expect(defaultFolder.path == expected.path)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func resolveOneDriveFolderPrefersAnExistingStoredOverride() throws {
|
||||||
|
let home = try makeFakeHome()
|
||||||
|
defer { try? FileManager.default.removeItem(at: home) }
|
||||||
|
let cloudStorage = home.appendingPathComponent("Library/CloudStorage", isDirectory: true)
|
||||||
|
try FileManager.default.createDirectory(
|
||||||
|
at: cloudStorage.appendingPathComponent("OneDrive-MMDGROUP", isDirectory: true),
|
||||||
|
withIntermediateDirectories: true
|
||||||
|
)
|
||||||
|
|
||||||
|
let suite = try makeTransportDefaultsSuite()
|
||||||
|
defer { tearDownTransportSuite(suite) }
|
||||||
|
let override = try makeTransportTemporaryDirectory(prefix: "shotdeck-onedrive-override")
|
||||||
|
defer { try? FileManager.default.removeItem(at: override) }
|
||||||
|
TransportSettings.setOneDriveFolder(override, defaults: suite.defaults)
|
||||||
|
|
||||||
|
let resolved = OneDriveLocator.resolveOneDriveFolder(
|
||||||
|
defaults: suite.defaults, home: home, fileManager: .default
|
||||||
|
)
|
||||||
|
#expect(resolved?.path == override.path)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func resolveOneDriveFolderIgnoresAStoredPathThatNoLongerExists() throws {
|
||||||
|
let home = try makeFakeHome()
|
||||||
|
defer { try? FileManager.default.removeItem(at: home) }
|
||||||
|
let cloudStorage = home.appendingPathComponent("Library/CloudStorage", isDirectory: true)
|
||||||
|
try FileManager.default.createDirectory(
|
||||||
|
at: cloudStorage.appendingPathComponent("OneDrive-MMDGROUP", isDirectory: true),
|
||||||
|
withIntermediateDirectories: true
|
||||||
|
)
|
||||||
|
|
||||||
|
let suite = try makeTransportDefaultsSuite()
|
||||||
|
defer { tearDownTransportSuite(suite) }
|
||||||
|
let goneOverride = try makeTransportTemporaryDirectory(prefix: "shotdeck-onedrive-gone")
|
||||||
|
TransportSettings.setOneDriveFolder(goneOverride, defaults: suite.defaults)
|
||||||
|
try FileManager.default.removeItem(at: goneOverride)
|
||||||
|
|
||||||
|
let resolved = OneDriveLocator.resolveOneDriveFolder(
|
||||||
|
defaults: suite.defaults, home: home, fileManager: .default
|
||||||
|
)
|
||||||
|
let expectedRoot = try #require(OneDriveLocator.syncRoots(home: home, fileManager: .default).first)
|
||||||
|
let expected = expectedRoot.appendingPathComponent("Redline", isDirectory: true)
|
||||||
|
#expect(resolved?.path == expected.path)
|
||||||
|
}
|
||||||
|
|
||||||
|
private func makeFakeHome() throws -> URL {
|
||||||
|
let home = FileManager.default.temporaryDirectory
|
||||||
|
.appendingPathComponent("shotdeck-fake-home-\(UUID().uuidString)", isDirectory: true)
|
||||||
|
try FileManager.default.createDirectory(at: home, withIntermediateDirectories: true)
|
||||||
|
return home
|
||||||
|
}
|
||||||
@@ -203,6 +203,17 @@ private func pixelWindow(
|
|||||||
return (pixelX0, pixelY0, pixelX1, pixelY1)
|
return (pixelX0, pixelY0, pixelX1, pixelY1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test("fileName uses compose time, not session.createdAt, and matches Redline-yyyyMMdd-HHmmss.pdf")
|
||||||
|
func fileNameUsesComposeTimeNotSessionCreatedAt() {
|
||||||
|
let old = Date(timeIntervalSince1970: 1_600_000_000) // 2020-09-13
|
||||||
|
let session = makeSession(captures: [], createdAt: old)
|
||||||
|
let name = PDFComposer.fileName(for: session)
|
||||||
|
#expect(name.wholeMatch(of: /^Redline-\d{8}-\d{6}\.pdf$/) != nil)
|
||||||
|
#expect(!name.contains(DubaiTime.fileStamp(old)))
|
||||||
|
let today = String(DubaiTime.fileStamp(Date()).prefix(8))
|
||||||
|
#expect(name.contains(today))
|
||||||
|
}
|
||||||
|
|
||||||
@Test("Three-page basic compose")
|
@Test("Three-page basic compose")
|
||||||
func threePageBasicCompose() throws {
|
func threePageBasicCompose() throws {
|
||||||
let directory = try makeScratchDirectory()
|
let directory = try makeScratchDirectory()
|
||||||
@@ -499,7 +510,7 @@ func documentAttributesRoundTrip() throws {
|
|||||||
)
|
)
|
||||||
let document = try openDocument(output)
|
let document = try openDocument(output)
|
||||||
let attributes = try #require(document.documentAttributes)
|
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.titleAttribute] as? String == "Ben review — 2026-08-30")
|
||||||
#expect(attributes[PDFDocumentAttribute.subjectAttribute] as? String == "deadbeef-dead-4eef-8ead-deadbeef0001")
|
#expect(attributes[PDFDocumentAttribute.subjectAttribute] as? String == "deadbeef-dead-4eef-8ead-deadbeef0001")
|
||||||
#expect(document.pageCount == 1)
|
#expect(document.pageCount == 1)
|
||||||
|
|||||||
@@ -109,6 +109,65 @@ func w25_duplicateNameSuffixIsRecognizedByScanNow() async throws {
|
|||||||
#expect(commented[0].fileURL.resolvingSymlinksInPath().path == pdfURL.resolvingSymlinksInPath().path)
|
#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")
|
@Test("W-26 Creator provenance negative at the scan level")
|
||||||
func w26_presentNonShotdeckCreatorIsIgnoredByScanNow() async throws {
|
func w26_presentNonShotdeckCreatorIsIgnoredByScanNow() async throws {
|
||||||
let (paths, cleanup) = try makeCasePaths()
|
let (paths, cleanup) = try makeCasePaths()
|
||||||
@@ -171,3 +230,162 @@ func w27_fsEventsCallbackFiresOnRealArrival() async throws {
|
|||||||
await watcher.stop()
|
await watcher.stop()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test("recordUncommented defaults to true: an unmarked PDF is still recorded (AirDrop behaviour unchanged)")
|
||||||
|
func recordUncommentedDefaultTrueRecordsAnUnmarkedPDF() 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-20260905-090000.pdf")
|
||||||
|
|
||||||
|
try makePDF(at: pdfURL, pageCount: 1, creator: "Redline", annotations: [])
|
||||||
|
|
||||||
|
let found = try await watcher.scanNow()
|
||||||
|
#expect(found.count == 1)
|
||||||
|
#expect(found.first?.isCommented == false)
|
||||||
|
|
||||||
|
let all = try await ledger.all()
|
||||||
|
#expect(all.count == 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test("recordUncommented=false: an unmarked PDF is not recorded or returned; marking it up in place gets it recorded")
|
||||||
|
func recordUncommentedFalseSkipsUnmarkedThenRecordsAfterInPlaceMarkup() 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)
|
||||||
|
await watcher.setRecordUncommented(false)
|
||||||
|
let pdfURL = paths.watchFolder.appendingPathComponent("Redline-20260905-091500.pdf")
|
||||||
|
|
||||||
|
// OneDrive mode: the PDF is freshly written here (by "send"), unmarked so far.
|
||||||
|
try makePDF(at: pdfURL, pageCount: 1, creator: "Redline", annotations: [])
|
||||||
|
|
||||||
|
let beforeMarkup = try await watcher.scanNow()
|
||||||
|
#expect(beforeMarkup.isEmpty)
|
||||||
|
let allBefore = try await ledger.all()
|
||||||
|
#expect(allBefore.isEmpty)
|
||||||
|
|
||||||
|
// What the iPad does: mark it up in place, in the SAME folder, then save.
|
||||||
|
let document = try #require(PDFDocument(url: pdfURL))
|
||||||
|
let page = try #require(document.page(at: 0))
|
||||||
|
page.addAnnotation(makeAnnotation(.ink, bounds: CGRect(x: 100, y: 100, width: 120, height: 50)))
|
||||||
|
#expect(document.write(to: pdfURL))
|
||||||
|
|
||||||
|
let afterMarkup = try await watcher.scanNow()
|
||||||
|
#expect(afterMarkup.count == 1)
|
||||||
|
#expect(afterMarkup.first?.isCommented == true)
|
||||||
|
|
||||||
|
let commented = try await ledger.commented()
|
||||||
|
#expect(commented.count == 1)
|
||||||
|
#expect(commented.first?.fileURL.resolvingSymlinksInPath().path == pdfURL.resolvingSymlinksInPath().path)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Launch-paths BLOCKER regression (adversarial review, 20260905)
|
||||||
|
//
|
||||||
|
// The bug: AppDelegate.makeLaunchModel() built `paths` via the AirDrop-only
|
||||||
|
// FolderSettings.resolvedAppSupportPaths(), so ReturnWatcher's internal watchFolder
|
||||||
|
// (seeded from paths.watchFolder in its own init) was the AirDrop folder even when
|
||||||
|
// OneDrive was the persisted transport, and bootstrap() never reconciled it before
|
||||||
|
// starting. Net effect: PDFs went to OneDrive but FSEvents kept watching the stale
|
||||||
|
// AirDrop folder for the whole session — marked-up returns were never detected.
|
||||||
|
// The fix: launch paths now come from TransportSettings.resolvedAppSupportPaths()
|
||||||
|
// (transport-aware), and AppModel.bootstrap() unconditionally reconciles the watcher's
|
||||||
|
// folder via updateWatchFolder() before it starts. These two tests characterize the
|
||||||
|
// bug (still reproducible via the old AirDrop-only construction) and prove the fix
|
||||||
|
// (the real launch-construction path, end to end).
|
||||||
|
|
||||||
|
@Test("Launch regression (fix): OneDrive persisted -> transport-aware launch paths -> bootstrap-style reconcile -> a marked PDF is detected")
|
||||||
|
func launchStyleConstructionWithOneDriveTransportDetectsAMarkedReturn() async throws {
|
||||||
|
let suite = try makeTransportDefaultsSuite()
|
||||||
|
defer { tearDownTransportSuite(suite) }
|
||||||
|
let oneDriveFolder = try makeTransportTemporaryDirectory(prefix: "shotdeck-launch-onedrive")
|
||||||
|
defer { try? FileManager.default.removeItem(at: oneDriveFolder) }
|
||||||
|
let appSupportRoot = try makeTransportTemporaryDirectory(prefix: "shotdeck-launch-approot")
|
||||||
|
defer { try? FileManager.default.removeItem(at: appSupportRoot) }
|
||||||
|
|
||||||
|
TransportSettings.setTransport(.oneDrive, defaults: suite.defaults)
|
||||||
|
TransportSettings.setOneDriveFolder(oneDriveFolder, defaults: suite.defaults)
|
||||||
|
|
||||||
|
// Exactly what AppDelegate.makeLaunchModel() now does: build launch paths from the
|
||||||
|
// transport-aware resolver — the fix, NOT FolderSettings.resolvedAppSupportPaths(),
|
||||||
|
// which is AirDrop-only and is the root cause the next test characterizes.
|
||||||
|
let paths = try TransportSettings.resolvedAppSupportPaths(
|
||||||
|
root: appSupportRoot, defaults: suite.defaults, fileManager: .default
|
||||||
|
)
|
||||||
|
#expect(paths.outbox.path == oneDriveFolder.path)
|
||||||
|
#expect(paths.watchFolder.path == oneDriveFolder.path)
|
||||||
|
|
||||||
|
let ledger = try ReturnLedger(paths: paths)
|
||||||
|
let watcher = ReturnWatcher(paths: paths, ledger: ledger)
|
||||||
|
|
||||||
|
// What AppModel.bootstrap() now does, unconditionally, before watcher.start():
|
||||||
|
await watcher.setRecordUncommented(false) // transport == .oneDrive
|
||||||
|
try await watcher.updateWatchFolder(paths.watchFolder)
|
||||||
|
|
||||||
|
let pdfURL = oneDriveFolder.appendingPathComponent("Redline-20260905-100000.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.contains(where: {
|
||||||
|
$0.fileURL.resolvingSymlinksInPath().path == pdfURL.resolvingSymlinksInPath().path && $0.isCommented
|
||||||
|
}))
|
||||||
|
|
||||||
|
let commented = try await ledger.commented()
|
||||||
|
#expect(commented.contains(where: {
|
||||||
|
$0.fileURL.resolvingSymlinksInPath().path == pdfURL.resolvingSymlinksInPath().path
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test("Launch regression (characterizes the bug): AirDrop-only launch paths with no reconcile miss an OneDrive-mode return")
|
||||||
|
func airDropOnlyLaunchPathsWithoutReconcileMissesAMarkedOneDriveReturn() async throws {
|
||||||
|
let suite = try makeTransportDefaultsSuite()
|
||||||
|
defer { tearDownTransportSuite(suite) }
|
||||||
|
let oneDriveFolder = try makeTransportTemporaryDirectory(prefix: "shotdeck-buggy-onedrive")
|
||||||
|
defer { try? FileManager.default.removeItem(at: oneDriveFolder) }
|
||||||
|
// A configured AirDrop watch-folder override, isolated to a temp dir — NOT the real
|
||||||
|
// ~/Downloads, which may already hold real marked-up Redline PDFs from actual use
|
||||||
|
// and would make this test's "found.isEmpty" assertion depend on the state of
|
||||||
|
// Ben's real Downloads folder instead of the isolated fixture under test.
|
||||||
|
let staleAirDropFolder = try makeTransportTemporaryDirectory(prefix: "shotdeck-buggy-airdrop-stale")
|
||||||
|
defer { try? FileManager.default.removeItem(at: staleAirDropFolder) }
|
||||||
|
let appSupportRoot = try makeTransportTemporaryDirectory(prefix: "shotdeck-buggy-approot")
|
||||||
|
defer { try? FileManager.default.removeItem(at: appSupportRoot) }
|
||||||
|
|
||||||
|
TransportSettings.setTransport(.oneDrive, defaults: suite.defaults)
|
||||||
|
TransportSettings.setOneDriveFolder(oneDriveFolder, defaults: suite.defaults)
|
||||||
|
FolderSettings.setWatchFolder(staleAirDropFolder, defaults: suite.defaults)
|
||||||
|
|
||||||
|
// The BUG's exact construction: FolderSettings.resolvedAppSupportPaths() ignores
|
||||||
|
// the persisted transport entirely and always resolves the AirDrop folders.
|
||||||
|
let buggyPaths = try FolderSettings.resolvedAppSupportPaths(root: appSupportRoot, defaults: suite.defaults)
|
||||||
|
#expect(buggyPaths.watchFolder.path == staleAirDropFolder.path)
|
||||||
|
#expect(buggyPaths.watchFolder.path != oneDriveFolder.path)
|
||||||
|
|
||||||
|
let ledger = try ReturnLedger(paths: buggyPaths)
|
||||||
|
let watcher = ReturnWatcher(paths: buggyPaths, ledger: ledger)
|
||||||
|
// The old bootstrap(): recordUncommented was set, but there was NO
|
||||||
|
// updateWatchFolder() call before start() to reconcile the folder.
|
||||||
|
await watcher.setRecordUncommented(false)
|
||||||
|
|
||||||
|
let pdfURL = oneDriveFolder.appendingPathComponent("Redline-20260905-100100.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)
|
||||||
|
))]
|
||||||
|
)
|
||||||
|
|
||||||
|
// The watcher is still pointed at the stale (configured-AirDrop) watch folder, so
|
||||||
|
// scanning it — NOT the OneDrive folder the PDF actually landed in — finds nothing.
|
||||||
|
// This is the exact BLOCKER the fix above closes.
|
||||||
|
let found = try await watcher.scanNow()
|
||||||
|
#expect(found.isEmpty)
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,271 @@
|
|||||||
|
import CoreGraphics
|
||||||
|
import Foundation
|
||||||
|
import ImageIO
|
||||||
|
import Testing
|
||||||
|
import ShotdeckCore
|
||||||
|
|
||||||
|
// Session lifecycle + retention (MMDB-2925): "Start new session" keeps the current
|
||||||
|
// screenshots as a past session, and the newest 10 sessions are retained in the one
|
||||||
|
// archive folder.
|
||||||
|
|
||||||
|
// MARK: - 1. closeCurrentSession keeps the captures as a past session
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func closeCurrentSessionKeepsCapturesAsAPastSessionAndStartsFresh() async throws {
|
||||||
|
let (root, paths) = try makeIsolatedPaths()
|
||||||
|
defer { try? FileManager.default.removeItem(at: root) }
|
||||||
|
|
||||||
|
let store = try SpoolStore(paths: paths)
|
||||||
|
let c1 = try await store.append(
|
||||||
|
pngData: try makePNGData(width: 8, height: 8, red: 1, green: 0, blue: 0),
|
||||||
|
pixelWidth: 8, pixelHeight: 8, scale: 1.0, capturedAt: Date())
|
||||||
|
let c2 = try await store.append(
|
||||||
|
pngData: try makePNGData(width: 8, height: 8, red: 0, green: 1, blue: 0),
|
||||||
|
pixelWidth: 8, pixelHeight: 8, scale: 1.0, capturedAt: Date())
|
||||||
|
|
||||||
|
let closedID = try await store.currentSession().id
|
||||||
|
let archived = try #require(try await store.closeCurrentSession())
|
||||||
|
|
||||||
|
#expect(archived.id == closedID)
|
||||||
|
#expect(archived.state == .archived)
|
||||||
|
#expect(archived.pdfFileName == nil) // never sent — shown as "Not sent"
|
||||||
|
#expect(archived.captures.map(\.id) == [c1.id, c2.id])
|
||||||
|
|
||||||
|
// Nothing is deleted: both PNGs live on under archive/<id>/.
|
||||||
|
let archiveDir = paths.archiveDirectory(closedID)
|
||||||
|
for capture in archived.captures {
|
||||||
|
#expect(FileManager.default.fileExists(
|
||||||
|
atPath: archiveDir.appendingPathComponent(capture.fileName).path))
|
||||||
|
}
|
||||||
|
#expect(!FileManager.default.fileExists(atPath: paths.sessionDirectory(closedID).path))
|
||||||
|
|
||||||
|
let fresh = try await store.currentSession()
|
||||||
|
#expect(fresh.id != closedID)
|
||||||
|
#expect(fresh.state == .open)
|
||||||
|
#expect(fresh.isEmpty)
|
||||||
|
|
||||||
|
let past = try await store.archivedSessions()
|
||||||
|
#expect(past.map(\.id) == [closedID])
|
||||||
|
#expect(past.first?.captures.count == 2)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - 2. closeCurrentSession on an empty open session just starts fresh
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func closeCurrentSessionOnAnEmptyOpenSessionStartsFreshWithoutArchiving() async throws {
|
||||||
|
let (root, paths) = try makeIsolatedPaths()
|
||||||
|
defer { try? FileManager.default.removeItem(at: root) }
|
||||||
|
|
||||||
|
let store = try SpoolStore(paths: paths)
|
||||||
|
let before = try await store.currentSession().id
|
||||||
|
|
||||||
|
let archived = try await store.closeCurrentSession()
|
||||||
|
#expect(archived == nil)
|
||||||
|
|
||||||
|
let after = try await store.currentSession()
|
||||||
|
#expect(after.id != before)
|
||||||
|
#expect(after.isEmpty)
|
||||||
|
let past = try await store.archivedSessions()
|
||||||
|
#expect(past.isEmpty)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - 3. sent and unsent sessions are distinguishable in the past list
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func pastSessionsDistinguishSentFromUnsentByPDFFileName() async throws {
|
||||||
|
let (root, paths) = try makeIsolatedPaths()
|
||||||
|
defer { try? FileManager.default.removeItem(at: root) }
|
||||||
|
|
||||||
|
let store = try SpoolStore(paths: paths)
|
||||||
|
_ = try await store.append(
|
||||||
|
pngData: try makePNGData(width: 6, height: 6, red: 1, green: 0, blue: 0),
|
||||||
|
pixelWidth: 6, pixelHeight: 6, scale: 1.0, capturedAt: Date())
|
||||||
|
let sent = try await store.archiveCurrent(pdfFileName: "Redline-20261011-120000.pdf")
|
||||||
|
|
||||||
|
_ = try await store.append(
|
||||||
|
pngData: try makePNGData(width: 6, height: 6, red: 0, green: 0, blue: 1),
|
||||||
|
pixelWidth: 6, pixelHeight: 6, scale: 1.0, capturedAt: Date())
|
||||||
|
let closed = try #require(try await store.closeCurrentSession())
|
||||||
|
|
||||||
|
#expect(sent.pdfFileName == "Redline-20261011-120000.pdf")
|
||||||
|
#expect(closed.pdfFileName == nil)
|
||||||
|
|
||||||
|
let past = try await store.archivedSessions()
|
||||||
|
#expect(past.map(\.id) == [closed.id, sent.id]) // newest first
|
||||||
|
#expect(past.map(\.pdfFileName) == [nil, "Redline-20261011-120000.pdf"])
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - 4. retention keeps the newest 10 sessions, in the one archive folder
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func retentionKeepsTheNewestTenSessionsAndRemovesTheRest() async throws {
|
||||||
|
let (root, paths) = try makeIsolatedPaths()
|
||||||
|
defer { try? FileManager.default.removeItem(at: root) }
|
||||||
|
|
||||||
|
let store = try SpoolStore(paths: paths)
|
||||||
|
var closedIDs: [UUID] = []
|
||||||
|
for index in 0..<12 {
|
||||||
|
_ = try await store.append(
|
||||||
|
pngData: try makePNGData(width: 4, height: 4, red: 0.1, green: 0.1, blue: 0.1),
|
||||||
|
pixelWidth: 4, pixelHeight: 4, scale: 1.0,
|
||||||
|
capturedAt: Date(timeIntervalSince1970: 1_700_000_000 + Double(index)))
|
||||||
|
let closed = try #require(try await store.closeCurrentSession())
|
||||||
|
closedIDs.append(closed.id)
|
||||||
|
}
|
||||||
|
|
||||||
|
// All 12 sessions live in the single archive/ folder as UUID session folders.
|
||||||
|
let fm = FileManager.default
|
||||||
|
let entries = try fm.contentsOfDirectory(at: paths.archive, includingPropertiesForKeys: nil)
|
||||||
|
let sessionDirs = entries.filter { UUID(uuidString: $0.lastPathComponent) != nil }
|
||||||
|
#expect(sessionDirs.count == SpoolStore.defaultRetainedSessionCount)
|
||||||
|
|
||||||
|
let kept = try await store.archivedSessions().map(\.id)
|
||||||
|
#expect(kept == Array(closedIDs.suffix(SpoolStore.defaultRetainedSessionCount).reversed()))
|
||||||
|
|
||||||
|
// The two oldest sessions are gone; the newest ten are fully on disk.
|
||||||
|
for id in closedIDs.prefix(2) {
|
||||||
|
#expect(!fm.fileExists(atPath: paths.archiveDirectory(id).path))
|
||||||
|
}
|
||||||
|
for id in closedIDs.suffix(SpoolStore.defaultRetainedSessionCount) {
|
||||||
|
#expect(fm.fileExists(atPath: paths.archiveDirectory(id).appendingPathComponent("session.json").path))
|
||||||
|
}
|
||||||
|
|
||||||
|
// The open session is never touched by retention.
|
||||||
|
let open = try await store.currentSession()
|
||||||
|
#expect(open.state == .open)
|
||||||
|
#expect(open.isEmpty)
|
||||||
|
#expect(fm.fileExists(atPath: paths.sessionDirectory(open.id).path))
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - 5. explicit prune keeps exactly the requested count
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func pruneArchivedSessionsKeepingNRemovesExactlyTheOldest() async throws {
|
||||||
|
let (root, paths) = try makeIsolatedPaths()
|
||||||
|
defer { try? FileManager.default.removeItem(at: root) }
|
||||||
|
|
||||||
|
let store = try SpoolStore(paths: paths)
|
||||||
|
var closedIDs: [UUID] = []
|
||||||
|
for _ in 0..<4 {
|
||||||
|
_ = try await store.append(
|
||||||
|
pngData: try makePNGData(width: 4, height: 4, red: 0.2, green: 0.2, blue: 0.2),
|
||||||
|
pixelWidth: 4, pixelHeight: 4, scale: 1.0, capturedAt: Date())
|
||||||
|
closedIDs.append(try #require(try await store.closeCurrentSession()).id)
|
||||||
|
}
|
||||||
|
|
||||||
|
let removed = try await store.pruneArchivedSessions(keeping: 2)
|
||||||
|
#expect(removed == Array(closedIDs.prefix(2).reversed())) // newest-first walk order
|
||||||
|
let kept = try await store.archivedSessions().map(\.id)
|
||||||
|
#expect(kept == Array(closedIDs.suffix(2).reversed()))
|
||||||
|
|
||||||
|
// Idempotent: nothing left to prune at that limit.
|
||||||
|
let removedAgain = try await store.pruneArchivedSessions(keeping: 2)
|
||||||
|
#expect(removedAgain.isEmpty)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - 6. retention runs on the send path too
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func theSendArchivePathAppliesRetention() async throws {
|
||||||
|
let (root, paths) = try makeIsolatedPaths()
|
||||||
|
defer { try? FileManager.default.removeItem(at: root) }
|
||||||
|
|
||||||
|
let store = try SpoolStore(paths: paths)
|
||||||
|
var sentIDs: [UUID] = []
|
||||||
|
for index in 0..<(SpoolStore.defaultRetainedSessionCount + 3) {
|
||||||
|
_ = try await store.append(
|
||||||
|
pngData: try makePNGData(width: 4, height: 4, red: 0.3, green: 0.3, blue: 0.3),
|
||||||
|
pixelWidth: 4, pixelHeight: 4, scale: 1.0,
|
||||||
|
capturedAt: Date(timeIntervalSince1970: 1_700_100_000 + Double(index)))
|
||||||
|
let archived = try await store.archiveCurrent(pdfFileName: "Redline-\(index).pdf")
|
||||||
|
sentIDs.append(archived.id)
|
||||||
|
}
|
||||||
|
|
||||||
|
let kept = try await store.archivedSessions()
|
||||||
|
#expect(kept.count == SpoolStore.defaultRetainedSessionCount)
|
||||||
|
#expect(kept.map(\.id) == Array(sentIDs.suffix(SpoolStore.defaultRetainedSessionCount).reversed()))
|
||||||
|
#expect(kept.allSatisfy { $0.pdfFileName != nil })
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - 7. a stale open session is never returned as current (truth guard)
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func aStaleOpenSessionIsNeverReturnedAsCurrent() async throws {
|
||||||
|
let (root, paths) = try makeIsolatedPaths()
|
||||||
|
defer { try? FileManager.default.removeItem(at: root) }
|
||||||
|
|
||||||
|
let store = try SpoolStore(paths: paths)
|
||||||
|
_ = try await store.append(
|
||||||
|
pngData: try makePNGData(width: 6, height: 6, red: 0.7, green: 0.7, blue: 0.1),
|
||||||
|
pixelWidth: 6, pixelHeight: 6, scale: 1.0, capturedAt: Date())
|
||||||
|
let archived = try await store.archiveCurrent(pdfFileName: "Redline-20261011-120200.pdf")
|
||||||
|
|
||||||
|
// Simulate the mid-run failure the truth guard exists for: the archived session
|
||||||
|
// moved away and the replacement open session's folder is gone (e.g. the fresh
|
||||||
|
// session could not be created / survive). The store must mint a real fresh
|
||||||
|
// session — never report the already-archived one as open.
|
||||||
|
let fresh = try await store.currentSession()
|
||||||
|
try FileManager.default.removeItem(at: paths.sessionDirectory(fresh.id))
|
||||||
|
|
||||||
|
let recovered = try await store.currentSession()
|
||||||
|
#expect(recovered.id != fresh.id)
|
||||||
|
#expect(recovered.id != archived.id)
|
||||||
|
#expect(recovered.state == .open)
|
||||||
|
#expect(recovered.isEmpty)
|
||||||
|
let past = try await store.archivedSessions()
|
||||||
|
#expect(past.map(\.id) == [archived.id])
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Fixtures
|
||||||
|
|
||||||
|
private enum FixtureError: Error {
|
||||||
|
case pngGenerationFailed
|
||||||
|
}
|
||||||
|
|
||||||
|
private func makeIsolatedPaths() throws -> (root: URL, paths: AppSupportPaths) {
|
||||||
|
let root = FileManager.default.temporaryDirectory
|
||||||
|
.appendingPathComponent("shotdeck-retention-\(UUID().uuidString)", isDirectory: true)
|
||||||
|
let paths = try AppSupportPaths(
|
||||||
|
root: root,
|
||||||
|
outbox: root.appendingPathComponent("outbox", isDirectory: true),
|
||||||
|
watchFolder: root.appendingPathComponent("watch", isDirectory: true)
|
||||||
|
)
|
||||||
|
return (root, paths)
|
||||||
|
}
|
||||||
|
|
||||||
|
private func makePNGData(
|
||||||
|
width: Int,
|
||||||
|
height: Int,
|
||||||
|
red: CGFloat,
|
||||||
|
green: CGFloat,
|
||||||
|
blue: CGFloat
|
||||||
|
) throws -> Data {
|
||||||
|
let colorSpace = CGColorSpaceCreateDeviceRGB()
|
||||||
|
guard let context = CGContext(
|
||||||
|
data: nil,
|
||||||
|
width: width,
|
||||||
|
height: height,
|
||||||
|
bitsPerComponent: 8,
|
||||||
|
bytesPerRow: width * 4,
|
||||||
|
space: colorSpace,
|
||||||
|
bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue
|
||||||
|
) else {
|
||||||
|
throw FixtureError.pngGenerationFailed
|
||||||
|
}
|
||||||
|
context.setFillColor(red: red, green: green, blue: blue, alpha: 1)
|
||||||
|
context.fill(CGRect(x: 0, y: 0, width: width, height: height))
|
||||||
|
guard let image = context.makeImage() else {
|
||||||
|
throw FixtureError.pngGenerationFailed
|
||||||
|
}
|
||||||
|
let data = NSMutableData()
|
||||||
|
guard let destination = CGImageDestinationCreateWithData(
|
||||||
|
data, "public.png" as CFString, 1, nil
|
||||||
|
) else {
|
||||||
|
throw FixtureError.pngGenerationFailed
|
||||||
|
}
|
||||||
|
CGImageDestinationAddImage(destination, image, nil)
|
||||||
|
guard CGImageDestinationFinalize(destination) else {
|
||||||
|
throw FixtureError.pngGenerationFailed
|
||||||
|
}
|
||||||
|
return data as Data
|
||||||
|
}
|
||||||
@@ -0,0 +1,227 @@
|
|||||||
|
import Foundation
|
||||||
|
import Testing
|
||||||
|
import ShotdeckCore
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func transportDefaultsToAirDropWhenUnset() throws {
|
||||||
|
let suite = try makeTransportDefaultsSuite()
|
||||||
|
defer { tearDownTransportSuite(suite) }
|
||||||
|
|
||||||
|
#expect(TransportSettings.transport(defaults: suite.defaults) == .airDrop)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func setTransportRoundTrips() throws {
|
||||||
|
let suite = try makeTransportDefaultsSuite()
|
||||||
|
defer { tearDownTransportSuite(suite) }
|
||||||
|
|
||||||
|
TransportSettings.setTransport(.oneDrive, defaults: suite.defaults)
|
||||||
|
#expect(TransportSettings.transport(defaults: suite.defaults) == .oneDrive)
|
||||||
|
|
||||||
|
TransportSettings.setTransport(.airDrop, defaults: suite.defaults)
|
||||||
|
#expect(TransportSettings.transport(defaults: suite.defaults) == .airDrop)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func garbageStoredTransportFallsBackToAirDrop() throws {
|
||||||
|
let suite = try makeTransportDefaultsSuite()
|
||||||
|
defer { tearDownTransportSuite(suite) }
|
||||||
|
|
||||||
|
suite.defaults.set("not-a-real-transport", forKey: TransportSettings.transportDefaultsKey)
|
||||||
|
#expect(TransportSettings.transport(defaults: suite.defaults) == .airDrop)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func oneDriveFolderStoreAndReset() throws {
|
||||||
|
let suite = try makeTransportDefaultsSuite()
|
||||||
|
defer { tearDownTransportSuite(suite) }
|
||||||
|
let folder = try makeTransportTemporaryDirectory(prefix: "shotdeck-onedrive-folder")
|
||||||
|
defer { try? FileManager.default.removeItem(at: folder) }
|
||||||
|
|
||||||
|
#expect(TransportSettings.storedOneDriveFolderPath(defaults: suite.defaults) == nil)
|
||||||
|
|
||||||
|
TransportSettings.setOneDriveFolder(folder, defaults: suite.defaults)
|
||||||
|
#expect(TransportSettings.storedOneDriveFolderPath(defaults: suite.defaults) == folder.path)
|
||||||
|
|
||||||
|
TransportSettings.resetOneDriveFolder(defaults: suite.defaults)
|
||||||
|
#expect(TransportSettings.storedOneDriveFolderPath(defaults: suite.defaults) == nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func effectiveFoldersForAirDropMatchesFolderSettings() throws {
|
||||||
|
let suite = try makeTransportDefaultsSuite()
|
||||||
|
defer { tearDownTransportSuite(suite) }
|
||||||
|
let outbox = try makeTransportTemporaryDirectory(prefix: "shotdeck-effective-outbox")
|
||||||
|
defer { try? FileManager.default.removeItem(at: outbox) }
|
||||||
|
FolderSettings.setOutbox(outbox, defaults: suite.defaults)
|
||||||
|
|
||||||
|
let effective = TransportSettings.effectiveFolders(defaults: suite.defaults)
|
||||||
|
let expected = FolderSettings.resolve(defaults: suite.defaults)
|
||||||
|
|
||||||
|
#expect(effective.transport == .airDrop)
|
||||||
|
#expect(effective.outbox.path == expected.outbox.path)
|
||||||
|
#expect(effective.watch.path == expected.watch.path)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func effectiveFoldersForOneDriveWithAResolvableFolderUsesItForBoth() throws {
|
||||||
|
let suite = try makeTransportDefaultsSuite()
|
||||||
|
defer { tearDownTransportSuite(suite) }
|
||||||
|
let folder = try makeTransportTemporaryDirectory(prefix: "shotdeck-effective-onedrive")
|
||||||
|
defer { try? FileManager.default.removeItem(at: folder) }
|
||||||
|
|
||||||
|
TransportSettings.setTransport(.oneDrive, defaults: suite.defaults)
|
||||||
|
TransportSettings.setOneDriveFolder(folder, defaults: suite.defaults)
|
||||||
|
|
||||||
|
let effective = TransportSettings.effectiveFolders(defaults: suite.defaults)
|
||||||
|
|
||||||
|
#expect(effective.transport == .oneDrive)
|
||||||
|
#expect(effective.outbox.path == folder.path)
|
||||||
|
#expect(effective.watch.path == folder.path)
|
||||||
|
#expect(effective.outbox.path == effective.watch.path)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func oneDriveFolderUnavailableErrorDescriptionContainsThePath() throws {
|
||||||
|
let path = "/Users/example/Library/CloudStorage/OneDrive-Example/Redline"
|
||||||
|
let error = ShotdeckError.oneDriveFolderUnavailable(path: path)
|
||||||
|
let description = try #require(error.errorDescription)
|
||||||
|
#expect(!description.isEmpty)
|
||||||
|
#expect(description.contains(path))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func isWritableDirectoryTrueForAnOrdinaryWritableDirectory() throws {
|
||||||
|
let dir = try makeTransportTemporaryDirectory(prefix: "shotdeck-writable")
|
||||||
|
defer { try? FileManager.default.removeItem(at: dir) }
|
||||||
|
#expect(OneDriveLocator.isWritableDirectory(at: dir))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func isWritableDirectoryFalseForAnExistingButUnwritableDirectory() throws {
|
||||||
|
let dir = try makeTransportTemporaryDirectory(prefix: "shotdeck-unwritable")
|
||||||
|
defer {
|
||||||
|
// Restore perms BEFORE removal — an unwritable dir can't otherwise be cleaned up.
|
||||||
|
try? FileManager.default.setAttributes([.posixPermissions: 0o755], ofItemAtPath: dir.path)
|
||||||
|
try? FileManager.default.removeItem(at: dir)
|
||||||
|
}
|
||||||
|
#expect(OneDriveLocator.isWritableDirectory(at: dir)) // sanity check before chmod
|
||||||
|
|
||||||
|
try FileManager.default.setAttributes([.posixPermissions: 0o500], ofItemAtPath: dir.path)
|
||||||
|
#expect(!OneDriveLocator.isWritableDirectory(at: dir))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func isWritableDirectoryFalseForAPlainFileAndForANonexistentPath() throws {
|
||||||
|
let dir = try makeTransportTemporaryDirectory(prefix: "shotdeck-writable-check-parent")
|
||||||
|
defer { try? FileManager.default.removeItem(at: dir) }
|
||||||
|
let filePath = dir.appendingPathComponent("plain-file.txt")
|
||||||
|
FileManager.default.createFile(atPath: filePath.path, contents: Data("x".utf8))
|
||||||
|
|
||||||
|
#expect(!OneDriveLocator.isWritableDirectory(at: filePath))
|
||||||
|
#expect(!OneDriveLocator.isWritableDirectory(at: dir.appendingPathComponent("does-not-exist")))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func probeWritableTrueForAnOrdinaryWritableDirectoryAndLeavesNoProbeFileBehind() throws {
|
||||||
|
let dir = try makeTransportTemporaryDirectory(prefix: "shotdeck-probe-writable")
|
||||||
|
defer { try? FileManager.default.removeItem(at: dir) }
|
||||||
|
|
||||||
|
#expect(OneDriveLocator.probeWritable(at: dir))
|
||||||
|
|
||||||
|
let leftovers = try FileManager.default.contentsOfDirectory(atPath: dir.path)
|
||||||
|
#expect(leftovers.isEmpty)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func probeWritableFalseForAChmod500Directory() throws {
|
||||||
|
// The File Provider edge case this probe exists for: isWritableDirectory can be
|
||||||
|
// true (as verified by the isWritableDirectory tests above) while an actual write
|
||||||
|
// still fails. A chmod 500 directory reproduces that "looks writable, isn't"
|
||||||
|
// shape closely enough to prove the probe itself does a real write, not just
|
||||||
|
// another permissions-bit check.
|
||||||
|
let dir = try makeTransportTemporaryDirectory(prefix: "shotdeck-probe-unwritable")
|
||||||
|
defer {
|
||||||
|
try? FileManager.default.setAttributes([.posixPermissions: 0o755], ofItemAtPath: dir.path)
|
||||||
|
try? FileManager.default.removeItem(at: dir)
|
||||||
|
}
|
||||||
|
try FileManager.default.setAttributes([.posixPermissions: 0o500], ofItemAtPath: dir.path)
|
||||||
|
|
||||||
|
#expect(!OneDriveLocator.probeWritable(at: dir))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func probeWritableFalseForAPlainFilePath() throws {
|
||||||
|
let dir = try makeTransportTemporaryDirectory(prefix: "shotdeck-probe-file-parent")
|
||||||
|
defer { try? FileManager.default.removeItem(at: dir) }
|
||||||
|
let filePath = dir.appendingPathComponent("plain-file.txt")
|
||||||
|
FileManager.default.createFile(atPath: filePath.path, contents: Data("x".utf8))
|
||||||
|
|
||||||
|
#expect(!OneDriveLocator.probeWritable(at: filePath))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The write itself succeeds (a real probe file lands on disk via AtomicFile.write,
|
||||||
|
/// which never touches this injected FileManager — it uses raw POSIX calls), but the
|
||||||
|
/// FIRST call to `removeItem(at:)` throws, simulating a transient File Provider
|
||||||
|
/// removal failure. probeWritable's own defer-based cleanup must retry and succeed
|
||||||
|
/// (the second call through this same override falls through to `super`), so no
|
||||||
|
/// probe file is left behind even though the function correctly still reports false
|
||||||
|
/// (the removal it explicitly attempted did fail).
|
||||||
|
private final class ThrowOnceOnRemoveFileManager: FileManager, @unchecked Sendable {
|
||||||
|
private let lock = NSLock()
|
||||||
|
private var hasThrown = false
|
||||||
|
|
||||||
|
override func removeItem(at URL: URL) throws {
|
||||||
|
lock.lock()
|
||||||
|
let shouldThrow = !hasThrown
|
||||||
|
hasThrown = true
|
||||||
|
lock.unlock()
|
||||||
|
if shouldThrow {
|
||||||
|
throw NSError(domain: "ShotdeckCoreTests.ThrowOnceOnRemove", code: 1)
|
||||||
|
}
|
||||||
|
try super.removeItem(at: URL)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
func probeWritableFalseAndLeavesNoProbeFileWhenRemoveItemThrowsOnce() throws {
|
||||||
|
// Directory fsync failure (the OTHER way probeWritable's cleanup can be needed) has
|
||||||
|
// no injectable seam: AtomicFile.write's directory fsync is a raw Darwin fsync(2)
|
||||||
|
// call on an already-open file descriptor, not parameterized by any FileManager or
|
||||||
|
// other dependency this test can substitute, and there is no portable way to make
|
||||||
|
// fsync(2) itself fail via chmod or other standard test techniques (fsync failures
|
||||||
|
// are OS/filesystem/hardware-level events). Covering the removeItem-throws path
|
||||||
|
// (below) is what this test does; the fsync-throws path is covered by code
|
||||||
|
// inspection only — the same `defer` block guards both.
|
||||||
|
let dir = try makeTransportTemporaryDirectory(prefix: "shotdeck-probe-remove-throws")
|
||||||
|
defer { try? FileManager.default.removeItem(at: dir) }
|
||||||
|
let injectedFileManager = ThrowOnceOnRemoveFileManager()
|
||||||
|
|
||||||
|
#expect(!OneDriveLocator.probeWritable(at: dir, fileManager: injectedFileManager))
|
||||||
|
|
||||||
|
let leftovers = try FileManager.default.contentsOfDirectory(atPath: dir.path)
|
||||||
|
#expect(leftovers.isEmpty)
|
||||||
|
}
|
||||||
|
|
||||||
|
struct TransportDefaultsSuite {
|
||||||
|
let name: String
|
||||||
|
let defaults: UserDefaults
|
||||||
|
}
|
||||||
|
|
||||||
|
func makeTransportDefaultsSuite() throws -> TransportDefaultsSuite {
|
||||||
|
let name = "shotdeck-transport-test-\(UUID().uuidString)"
|
||||||
|
let defaults = try #require(UserDefaults(suiteName: name))
|
||||||
|
defaults.removePersistentDomain(forName: name)
|
||||||
|
return TransportDefaultsSuite(name: name, defaults: defaults)
|
||||||
|
}
|
||||||
|
|
||||||
|
func tearDownTransportSuite(_ suite: TransportDefaultsSuite) {
|
||||||
|
suite.defaults.removePersistentDomain(forName: suite.name)
|
||||||
|
}
|
||||||
|
|
||||||
|
func makeTransportTemporaryDirectory(prefix: String) throws -> URL {
|
||||||
|
let url = FileManager.default.temporaryDirectory
|
||||||
|
.appendingPathComponent("\(prefix)-\(UUID().uuidString)", isDirectory: true)
|
||||||
|
try FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
|
||||||
|
return url
|
||||||
|
}
|
||||||
@@ -0,0 +1,142 @@
|
|||||||
|
import AppKit
|
||||||
|
import Foundation
|
||||||
|
import PDFKit
|
||||||
|
import Testing
|
||||||
|
import ShotdeckCore
|
||||||
|
@testable import Shotdeck
|
||||||
|
|
||||||
|
/// Coverage gap closed (adversarial review, rounds 3 and 4): the Core-level regression
|
||||||
|
/// tests in ShotdeckCoreTests hand-replicate what `AppDelegate.makeLaunchModel()` and
|
||||||
|
/// `AppModel.bootstrap()` do, rather than calling them — so a future revert of
|
||||||
|
/// `makeLaunchModel()` back to the AirDrop-only resolver, or a dropped
|
||||||
|
/// `updateWatchFolder` call inside `bootstrap()`, would NOT fail `swift test`. This
|
||||||
|
/// test goes through the real, unmodified call sites in the `Shotdeck` executable
|
||||||
|
/// target via `@testable import`, which `ShotdeckCoreTests` cannot reach (it only
|
||||||
|
/// depends on `ShotdeckCore`) — hence this separate `ShotdeckTests` target.
|
||||||
|
///
|
||||||
|
/// Round 4 correction: the first version of this test asserted only
|
||||||
|
/// `model.watchFolderURL`, which `AppModel.init` computes independently via
|
||||||
|
/// `TransportSettings.effectiveFolders()` — so it stayed correct (and the test kept
|
||||||
|
/// passing) even when `makeLaunchModel()` was reverted to the AirDrop-only resolver,
|
||||||
|
/// because `bootstrap()`'s own unconditional `updateWatchFolder` reconcile papered
|
||||||
|
/// over the reverted resolver. That made the "verified this catches the blocker"
|
||||||
|
/// claim in the previous round's commit message empirically false. This version
|
||||||
|
/// asserts `model.paths`/the watcher's `currentWatchFolder` BEFORE `bootstrap()` runs,
|
||||||
|
/// which actually depends on what `makeLaunchModel()` built — see this file's git
|
||||||
|
/// history (or the round-4 commit message) for the verbatim before/after
|
||||||
|
/// `swift test --filter` output proving it now discriminates correctly.
|
||||||
|
@MainActor
|
||||||
|
@Test("Real wiring: AppDelegate.makeLaunchModel() + AppModel.bootstrap() detect a marked OneDrive return")
|
||||||
|
func realLaunchModelAndBootstrapDetectAMarkedOneDriveReturn() async throws {
|
||||||
|
let fm = FileManager.default
|
||||||
|
|
||||||
|
// UserDefaults.standard is the ONLY defaults instance makeLaunchModel()/bootstrap()
|
||||||
|
// actually read — there is no defaults-threading through AppModel/AppDelegate (the
|
||||||
|
// same reasoning documented in PickerSelfTest.swift's ONEDRIVE-SELFTEST phase).
|
||||||
|
// "Isolated" here means snapshot-and-restore around the real keys, not a separate
|
||||||
|
// UserDefaults(suiteName:) instance that these real, unmodified call sites would
|
||||||
|
// never actually consult.
|
||||||
|
let defaults = UserDefaults.standard
|
||||||
|
let previousTransport = defaults.string(forKey: TransportSettings.transportDefaultsKey)
|
||||||
|
let previousFolder = defaults.string(forKey: TransportSettings.oneDriveFolderDefaultsKey)
|
||||||
|
defer {
|
||||||
|
if let previousTransport {
|
||||||
|
defaults.set(previousTransport, forKey: TransportSettings.transportDefaultsKey)
|
||||||
|
} else {
|
||||||
|
defaults.removeObject(forKey: TransportSettings.transportDefaultsKey)
|
||||||
|
}
|
||||||
|
if let previousFolder {
|
||||||
|
defaults.set(previousFolder, forKey: TransportSettings.oneDriveFolderDefaultsKey)
|
||||||
|
} else {
|
||||||
|
defaults.removeObject(forKey: TransportSettings.oneDriveFolderDefaultsKey)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let oneDriveFolderRaw = fm.temporaryDirectory
|
||||||
|
.appendingPathComponent("shotdeck-real-wiring-onedrive-\(UUID().uuidString)", isDirectory: true)
|
||||||
|
try fm.createDirectory(at: oneDriveFolderRaw, withIntermediateDirectories: true)
|
||||||
|
defer { try? fm.removeItem(at: oneDriveFolderRaw) }
|
||||||
|
// FileManager's directory enumeration (inside the real ReturnWatcher/AppSupportPaths
|
||||||
|
// call sites this test exercises) can canonicalize /var -> /private/var for a path
|
||||||
|
// that actually exists; resolve here so every comparison below agrees.
|
||||||
|
let oneDriveFolder = oneDriveFolderRaw.resolvingSymlinksInPath()
|
||||||
|
|
||||||
|
let appSupportRoot = fm.temporaryDirectory
|
||||||
|
.appendingPathComponent("shotdeck-real-wiring-approot-\(UUID().uuidString)", isDirectory: true)
|
||||||
|
defer { try? fm.removeItem(at: appSupportRoot) }
|
||||||
|
|
||||||
|
TransportSettings.setTransport(.oneDrive, defaults: defaults)
|
||||||
|
TransportSettings.setOneDriveFolder(oneDriveFolder, defaults: defaults)
|
||||||
|
|
||||||
|
// Best-effort: keeps AppModel.bootstrap()'s real update-check schedule (a real
|
||||||
|
// HTTP GET after 10s, plus a RunLoop timer) from starting during this test.
|
||||||
|
// ProcessInfo.processInfo.environment on Darwin reads `environ` fresh each call,
|
||||||
|
// so a setenv() here is visible to bootstrap()'s own check immediately.
|
||||||
|
setenv("SHOTDECK_ONEDRIVE_SELFTEST", "1", 1)
|
||||||
|
defer { unsetenv("SHOTDECK_ONEDRIVE_SELFTEST") }
|
||||||
|
|
||||||
|
// The REAL, unmodified call sites — not a reimplementation. This is exactly what
|
||||||
|
// launching Redline with OneDrive as the persisted transport does.
|
||||||
|
let model = AppDelegate.makeLaunchModel(appSupportRoot: appSupportRoot)
|
||||||
|
// bootstrap() registers a REAL, process-wide Carbon global hotkey (capture combo,
|
||||||
|
// e.g. Option-Shift-2). Carbon registrations are not scoped to this test/model —
|
||||||
|
// they must be released before this test ends, or ShotdeckCoreTests'
|
||||||
|
// HotkeyCenterCarbonTests (a separate test target, same test process) can find the
|
||||||
|
// combo already taken / the global hotkey table in an unexpected state.
|
||||||
|
defer { model.hotkeys.unregisterAll() }
|
||||||
|
|
||||||
|
// PRE-bootstrap assertions — this is the actual proof of the launch RESOLVER
|
||||||
|
// (AppDelegate.makeLaunchModel() -> TransportSettings.resolvedAppSupportPaths()),
|
||||||
|
// independent of bootstrap()'s own reconcile. `model.watchFolderURL` alone does
|
||||||
|
// NOT prove this: AppModel.init computes it separately via
|
||||||
|
// TransportSettings.effectiveFolders(), so it would read as correct even if
|
||||||
|
// makeLaunchModel's `paths` were built by the AirDrop-only resolver — which is
|
||||||
|
// exactly how the first version of this test was empirically shown to be vacuous
|
||||||
|
// for the launch-resolver path (see this commit's message). `model.paths` is
|
||||||
|
// `internal` on AppModel, so @testable import already exposes it without any
|
||||||
|
// production API change; `currentWatchFolder` is the one new (internal-facing,
|
||||||
|
// `public` on the actor) seam added to ReturnWatcher for this purpose.
|
||||||
|
#expect(model.paths.watchFolder.path == oneDriveFolder.path)
|
||||||
|
#expect(model.paths.outbox.path == oneDriveFolder.path)
|
||||||
|
let seededWatchFolder = await model.watcher.currentWatchFolder
|
||||||
|
#expect(seededWatchFolder.path == oneDriveFolder.path)
|
||||||
|
|
||||||
|
#expect(model.transport == .oneDrive)
|
||||||
|
#expect(model.watchFolderURL.path == oneDriveFolder.path)
|
||||||
|
|
||||||
|
await model.bootstrap()
|
||||||
|
|
||||||
|
// Drop a marked-up Redline PDF into the folder in place — what OneDrive syncing
|
||||||
|
// down an already-marked copy after a relaunch looks like.
|
||||||
|
let pdfURL = oneDriveFolder.appendingPathComponent("Redline-realwiring-\(UUID().uuidString).pdf")
|
||||||
|
let document = PDFDocument()
|
||||||
|
let page = PDFPage()
|
||||||
|
page.setBounds(CGRect(x: 0, y: 0, width: 612, height: 792), for: .mediaBox)
|
||||||
|
document.insert(page, at: 0)
|
||||||
|
document.documentAttributes = [
|
||||||
|
PDFDocumentAttribute.creatorAttribute: "Redline",
|
||||||
|
PDFDocumentAttribute.subjectAttribute: UUID().uuidString,
|
||||||
|
]
|
||||||
|
let ink = PDFAnnotation(
|
||||||
|
bounds: CGRect(x: 20, y: 20, width: 60, height: 60), forType: .ink, withProperties: nil
|
||||||
|
)
|
||||||
|
let stroke = NSBezierPath()
|
||||||
|
stroke.move(to: NSPoint(x: 20, y: 20))
|
||||||
|
stroke.line(to: NSPoint(x: 80, y: 80))
|
||||||
|
ink.add(stroke)
|
||||||
|
page.addAnnotation(ink)
|
||||||
|
let written = document.write(to: pdfURL)
|
||||||
|
#expect(written)
|
||||||
|
guard written else { return }
|
||||||
|
|
||||||
|
// .resolvingSymlinksInPath().path — not plain URL equality — matching how the rest
|
||||||
|
// of the suite compares a temp-dir-derived expected URL against a returned one.
|
||||||
|
let expectedPath = pdfURL.resolvingSymlinksInPath().path
|
||||||
|
let found = try await model.watcher.scanNow()
|
||||||
|
#expect(found.first(where: { $0.fileURL.resolvingSymlinksInPath().path == expectedPath })?.isCommented == true)
|
||||||
|
|
||||||
|
let commented = try await model.ledger.commented()
|
||||||
|
#expect(commented.contains(where: { $0.fileURL.resolvingSymlinksInPath().path == expectedPath }))
|
||||||
|
|
||||||
|
await model.watcher.stop()
|
||||||
|
}
|
||||||
@@ -0,0 +1,227 @@
|
|||||||
|
import AppKit
|
||||||
|
import CoreGraphics
|
||||||
|
import Foundation
|
||||||
|
import ImageIO
|
||||||
|
import Testing
|
||||||
|
import ShotdeckCore
|
||||||
|
@testable import Shotdeck
|
||||||
|
|
||||||
|
/// MMDB-2925, through the REAL app-target seams the menu rows invoke (`AppModel`
|
||||||
|
/// actions + `SpoolStore`): "Start new session" keeps the current screenshots as a
|
||||||
|
/// past session, the Past submissions state reflects what was sent, and session
|
||||||
|
/// retention keeps the newest 10 sessions in the one archive folder. `bootstrap()`
|
||||||
|
/// itself is covered by LaunchWiringTests; here `addCapture` refreshes the session
|
||||||
|
/// from the store exactly the way `AppModel.captureNow()` does after a real capture.
|
||||||
|
@MainActor
|
||||||
|
@Test("Menu actions: start new session keeps captures, lists past submissions, retains 10")
|
||||||
|
func startNewSessionKeepsCapturesListsPastSubmissionsAndRetainsTen() async throws {
|
||||||
|
let fm = FileManager.default
|
||||||
|
let root = fm.temporaryDirectory
|
||||||
|
.appendingPathComponent("shotdeck-session-workflow-\(UUID().uuidString)", isDirectory: true)
|
||||||
|
defer { try? fm.removeItem(at: root) }
|
||||||
|
let model = AppDelegate.makeLaunchModel(appSupportRoot: root)
|
||||||
|
|
||||||
|
// Two captures in the open session, then the menu's "Start new session".
|
||||||
|
let c1 = try await addCapture(to: model, red: 1, green: 0, blue: 0)
|
||||||
|
let c2 = try await addCapture(to: model, red: 0, green: 1, blue: 0)
|
||||||
|
let closedID = model.session.id
|
||||||
|
#expect(model.canStartNewSession)
|
||||||
|
|
||||||
|
await model.startNewSession()
|
||||||
|
|
||||||
|
// The fresh session is active and the captures are kept as a past session.
|
||||||
|
#expect(model.session.id != closedID)
|
||||||
|
#expect(model.session.isEmpty)
|
||||||
|
#expect(!model.canStartNewSession)
|
||||||
|
#expect(model.pastSessions.map(\.id) == [closedID])
|
||||||
|
#expect(model.pastSessions.first?.captures.map(\.id) == [c1.id, c2.id])
|
||||||
|
#expect(model.pastSessions.first?.pdfFileName == nil) // never sent
|
||||||
|
#expect(model.statusLine?.contains("kept as a past session") == true)
|
||||||
|
|
||||||
|
// Nothing was deleted on close: both PNGs live in the single archive folder.
|
||||||
|
let archiveDir = model.paths.archiveDirectory(closedID)
|
||||||
|
for capture in [c1, c2] {
|
||||||
|
#expect(fm.fileExists(atPath: archiveDir.appendingPathComponent(capture.fileName).path))
|
||||||
|
}
|
||||||
|
|
||||||
|
// "PDF" on a never-sent row: visible missing state, no silent substitute.
|
||||||
|
#expect(model.sentPDFURL(for: model.pastSessions[0]) == nil)
|
||||||
|
model.revealSentPDF(model.pastSessions[0])
|
||||||
|
#expect(model.statusLine == "That session was never sent.")
|
||||||
|
}
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
@Test("Retention: 12 sessions through the menu action leave the newest 10 on disk")
|
||||||
|
func twelveSessionsLeaveTheNewestTenInTheOneArchiveFolder() async throws {
|
||||||
|
let fm = FileManager.default
|
||||||
|
let root = fm.temporaryDirectory
|
||||||
|
.appendingPathComponent("shotdeck-session-workflow-\(UUID().uuidString)", isDirectory: true)
|
||||||
|
defer { try? fm.removeItem(at: root) }
|
||||||
|
let model = AppDelegate.makeLaunchModel(appSupportRoot: root)
|
||||||
|
|
||||||
|
var closedIDs: [UUID] = []
|
||||||
|
for _ in 0..<12 {
|
||||||
|
_ = try await addCapture(to: model, red: 0.2, green: 0.2, blue: 0.2)
|
||||||
|
closedIDs.append(model.session.id)
|
||||||
|
await model.startNewSession()
|
||||||
|
}
|
||||||
|
|
||||||
|
#expect(model.pastSessions.count == SpoolStore.defaultRetainedSessionCount)
|
||||||
|
#expect(model.pastSessions.map(\.id)
|
||||||
|
== Array(closedIDs.suffix(SpoolStore.defaultRetainedSessionCount).reversed()))
|
||||||
|
|
||||||
|
let entries = try fm.contentsOfDirectory(at: model.paths.archive, includingPropertiesForKeys: nil)
|
||||||
|
let sessionDirs = entries.filter { UUID(uuidString: $0.lastPathComponent) != nil }
|
||||||
|
#expect(sessionDirs.count == SpoolStore.defaultRetainedSessionCount)
|
||||||
|
for id in closedIDs.prefix(2) {
|
||||||
|
#expect(!fm.fileExists(atPath: model.paths.archiveDirectory(id).path))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
@Test("Menu action on an empty session reports it started without inventing a past session")
|
||||||
|
func startNewSessionOnEmptySessionCreatesNoPastSession() async throws {
|
||||||
|
let fm = FileManager.default
|
||||||
|
let root = fm.temporaryDirectory
|
||||||
|
.appendingPathComponent("shotdeck-session-workflow-\(UUID().uuidString)", isDirectory: true)
|
||||||
|
defer { try? fm.removeItem(at: root) }
|
||||||
|
let model = AppDelegate.makeLaunchModel(appSupportRoot: root)
|
||||||
|
|
||||||
|
#expect(model.session.isEmpty)
|
||||||
|
await model.startNewSession()
|
||||||
|
|
||||||
|
#expect(model.session.isEmpty)
|
||||||
|
#expect(model.pastSessions.isEmpty)
|
||||||
|
#expect(model.statusLine == "New session started.")
|
||||||
|
}
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
@Test("Send seam refreshes past submissions after archiving (menu count stays true)")
|
||||||
|
func successfulSendRefreshesPastSubmissions() async throws {
|
||||||
|
let fm = FileManager.default
|
||||||
|
let root = fm.temporaryDirectory
|
||||||
|
.appendingPathComponent("shotdeck-session-workflow-\(UUID().uuidString)", isDirectory: true)
|
||||||
|
defer { try? fm.removeItem(at: root) }
|
||||||
|
let model = AppDelegate.makeLaunchModel(appSupportRoot: root)
|
||||||
|
|
||||||
|
_ = try await addCapture(to: model, red: 0.4, green: 0.4, blue: 0.4)
|
||||||
|
await model.handleDidShareItems(
|
||||||
|
fileName: "Redline-20261011-120000.pdf", sentSummary: "Sent — 1 page.")
|
||||||
|
|
||||||
|
#expect(model.statusLine == "Sent — 1 page.")
|
||||||
|
#expect(model.session.isEmpty)
|
||||||
|
#expect(model.pastSessions.count == 1)
|
||||||
|
#expect(model.pastSessions.first?.pdfFileName == "Redline-20261011-120000.pdf")
|
||||||
|
#expect(model.pastSessions.first?.captures.count == 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
@Test("Start new session and send refuse to overlap (no mid-flight session close)")
|
||||||
|
func sessionStartAndSendRefuseToOverlap() async throws {
|
||||||
|
let fm = FileManager.default
|
||||||
|
let root = fm.temporaryDirectory
|
||||||
|
.appendingPathComponent("shotdeck-session-workflow-\(UUID().uuidString)", isDirectory: true)
|
||||||
|
defer { try? fm.removeItem(at: root) }
|
||||||
|
let model = AppDelegate.makeLaunchModel(appSupportRoot: root)
|
||||||
|
|
||||||
|
let capture = try await addCapture(to: model, red: 0.1, green: 0.1, blue: 0.1)
|
||||||
|
let before = model.session.id
|
||||||
|
|
||||||
|
// A send in flight: "Start new session" must refuse instead of renaming the
|
||||||
|
// session directory out from under the compose.
|
||||||
|
model.setSending(true)
|
||||||
|
await model.startNewSession()
|
||||||
|
#expect(model.session.id == before)
|
||||||
|
#expect(model.session.captures.map(\.id) == [capture.id])
|
||||||
|
#expect(model.statusLine == "Finish the current send first.")
|
||||||
|
model.setSending(false)
|
||||||
|
|
||||||
|
// A session start in flight: send must refuse before composing anything.
|
||||||
|
model.setStartingNewSession(true)
|
||||||
|
await model.send(anchor: nil)
|
||||||
|
#expect(model.statusLine == "Finish starting the new session first.")
|
||||||
|
#expect(model.session.id == before)
|
||||||
|
#expect(model.session.captures.map(\.id) == [capture.id])
|
||||||
|
model.setStartingNewSession(false)
|
||||||
|
|
||||||
|
// Both settled: the normal path still works.
|
||||||
|
await model.startNewSession()
|
||||||
|
#expect(model.session.id != before)
|
||||||
|
#expect(model.pastSessions.count == 1)
|
||||||
|
#expect(model.pastSessions.first?.captures.map(\.id) == [capture.id])
|
||||||
|
}
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
@Test("The OneDrive send summary survives archiving (never overwritten by the archive path)")
|
||||||
|
func oneDriveSendSummarySurvivesArchiving() async throws {
|
||||||
|
let fm = FileManager.default
|
||||||
|
let root = fm.temporaryDirectory
|
||||||
|
.appendingPathComponent("shotdeck-session-workflow-\(UUID().uuidString)", isDirectory: true)
|
||||||
|
defer { try? fm.removeItem(at: root) }
|
||||||
|
let model = AppDelegate.makeLaunchModel(appSupportRoot: root)
|
||||||
|
|
||||||
|
_ = try await addCapture(to: model, red: 0.6, green: 0.2, blue: 0.2)
|
||||||
|
let summary = "Saved to OneDrive — 1 page. Open it in Files on your iPad."
|
||||||
|
await model.handleDidShareItems(fileName: "Redline-20261011-120100.pdf", sentSummary: summary)
|
||||||
|
|
||||||
|
#expect(model.statusLine == summary)
|
||||||
|
#expect(model.pastSessions.count == 1)
|
||||||
|
#expect(model.pastSessions.first?.pdfFileName == "Redline-20261011-120100.pdf")
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Fixtures
|
||||||
|
|
||||||
|
/// Appends one generated PNG through the store and refreshes `model.session` from
|
||||||
|
/// it — the same refresh `AppModel.captureNow()` performs after a real capture.
|
||||||
|
@MainActor
|
||||||
|
private func addCapture(
|
||||||
|
to model: AppModel,
|
||||||
|
red: CGFloat,
|
||||||
|
green: CGFloat,
|
||||||
|
blue: CGFloat
|
||||||
|
) async throws -> Capture {
|
||||||
|
let capture = try await model.spool.append(
|
||||||
|
pngData: try makePNGData(width: 8, height: 8, red: red, green: green, blue: blue),
|
||||||
|
pixelWidth: 8, pixelHeight: 8, scale: 1.0, capturedAt: Date())
|
||||||
|
model.replaceSession(try await model.spool.currentSession())
|
||||||
|
return capture
|
||||||
|
}
|
||||||
|
|
||||||
|
private enum FixtureError: Error {
|
||||||
|
case pngGenerationFailed
|
||||||
|
}
|
||||||
|
|
||||||
|
private func makePNGData(
|
||||||
|
width: Int,
|
||||||
|
height: Int,
|
||||||
|
red: CGFloat,
|
||||||
|
green: CGFloat,
|
||||||
|
blue: CGFloat
|
||||||
|
) throws -> Data {
|
||||||
|
let colorSpace = CGColorSpaceCreateDeviceRGB()
|
||||||
|
guard let context = CGContext(
|
||||||
|
data: nil,
|
||||||
|
width: width,
|
||||||
|
height: height,
|
||||||
|
bitsPerComponent: 8,
|
||||||
|
bytesPerRow: width * 4,
|
||||||
|
space: colorSpace,
|
||||||
|
bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue
|
||||||
|
) else {
|
||||||
|
throw FixtureError.pngGenerationFailed
|
||||||
|
}
|
||||||
|
context.setFillColor(red: red, green: green, blue: blue, alpha: 1)
|
||||||
|
context.fill(CGRect(x: 0, y: 0, width: width, height: height))
|
||||||
|
guard let image = context.makeImage() else {
|
||||||
|
throw FixtureError.pngGenerationFailed
|
||||||
|
}
|
||||||
|
let buffer = NSMutableData()
|
||||||
|
guard let destination = CGImageDestinationCreateWithData(buffer, "public.png" as CFString, 1, nil) else {
|
||||||
|
throw FixtureError.pngGenerationFailed
|
||||||
|
}
|
||||||
|
CGImageDestinationAddImage(destination, image, nil)
|
||||||
|
guard CGImageDestinationFinalize(destination) else {
|
||||||
|
throw FixtureError.pngGenerationFailed
|
||||||
|
}
|
||||||
|
return buffer as Data
|
||||||
|
}
|
||||||
@@ -11,7 +11,7 @@ cd "$ROOT"
|
|||||||
|
|
||||||
IDENTITY="Apple Development: ben@flow-master.ai (QH2H9G2LK5)"
|
IDENTITY="Apple Development: ben@flow-master.ai (QH2H9G2LK5)"
|
||||||
BUNDLE_ID="ai.flowmaster.shotdeck"
|
BUNDLE_ID="ai.flowmaster.shotdeck"
|
||||||
APP_BUNDLE="${ROOT}/.build/Shotdeck.app"
|
APP_BUNDLE="${ROOT}/.build/Redline.app"
|
||||||
|
|
||||||
SKIP_SIGN=0
|
SKIP_SIGN=0
|
||||||
for arg in "$@"; do
|
for arg in "$@"; do
|
||||||
@@ -27,7 +27,7 @@ for arg in "$@"; do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "==> Building Shotdeck (release)"
|
echo "==> Building Redline (release)"
|
||||||
swift build -c release --product Shotdeck
|
swift build -c release --product Shotdeck
|
||||||
|
|
||||||
BIN_PATH="$(swift build -c release --product Shotdeck --show-bin-path)/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"
|
cp "${BIN_PATH}" "${APP_BUNDLE}/Contents/MacOS/Shotdeck"
|
||||||
chmod +x "${APP_BUNDLE}/Contents/MacOS/Shotdeck"
|
chmod +x "${APP_BUNDLE}/Contents/MacOS/Shotdeck"
|
||||||
cp "${ROOT}/Info.plist" "${APP_BUNDLE}/Contents/Info.plist"
|
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
|
if [[ "${SKIP_SIGN}" -eq 1 ]]; then
|
||||||
echo
|
echo
|
||||||
|
|||||||
Executable
+95
@@ -0,0 +1,95 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
|
cd "$ROOT"
|
||||||
|
|
||||||
|
APP_BUNDLE="${ROOT}/.build/Redline.app"
|
||||||
|
STAGING="${ROOT}/.build/dmg-staging"
|
||||||
|
DMG="${ROOT}/.build/Redline.dmg"
|
||||||
|
MOUNT_POINT="${ROOT}/.build/dmg-mnt"
|
||||||
|
|
||||||
|
SKIP_SIGN=0
|
||||||
|
for arg in "$@"; do
|
||||||
|
case "${arg}" in
|
||||||
|
--skip-sign)
|
||||||
|
SKIP_SIGN=1
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Unknown argument: ${arg}" >&2
|
||||||
|
echo "Usage: $0 [--skip-sign]" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "==> Building Redline.app"
|
||||||
|
if [[ "${SKIP_SIGN}" -eq 1 ]]; then
|
||||||
|
./scripts/build-app.sh --skip-sign
|
||||||
|
else
|
||||||
|
./scripts/build-app.sh
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ! -d "${APP_BUNDLE}" ]]; then
|
||||||
|
echo "App bundle not found at ${APP_BUNDLE}" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "==> Staging DMG contents"
|
||||||
|
rm -rf "${STAGING}"
|
||||||
|
mkdir -p "${STAGING}"
|
||||||
|
ditto "${APP_BUNDLE}" "${STAGING}/Redline.app"
|
||||||
|
ln -s /Applications "${STAGING}/Applications"
|
||||||
|
|
||||||
|
echo "==> Creating ${DMG}"
|
||||||
|
mkdir -p "$(dirname "${DMG}")"
|
||||||
|
hdiutil create -volname "Redline" -srcfolder "${STAGING}" -ov -format UDZO "${DMG}"
|
||||||
|
|
||||||
|
MOUNTED=0
|
||||||
|
detach_dmg() {
|
||||||
|
if [[ "${MOUNTED}" -eq 1 ]]; then
|
||||||
|
hdiutil detach "${MOUNT_POINT}" || hdiutil detach "${MOUNT_POINT}" -force || true
|
||||||
|
MOUNTED=0
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
trap detach_dmg EXIT
|
||||||
|
|
||||||
|
if [[ -d "${MOUNT_POINT}" ]] && /sbin/mount | grep -F -q "${MOUNT_POINT}"; then
|
||||||
|
hdiutil detach "${MOUNT_POINT}" || hdiutil detach "${MOUNT_POINT}" -force
|
||||||
|
fi
|
||||||
|
rm -rf "${MOUNT_POINT}"
|
||||||
|
mkdir -p "${MOUNT_POINT}"
|
||||||
|
|
||||||
|
echo "==> Verifying ${DMG}"
|
||||||
|
hdiutil attach "${DMG}" -nobrowse -readonly -mountpoint "${MOUNT_POINT}"
|
||||||
|
MOUNTED=1
|
||||||
|
|
||||||
|
echo "==> Mount contents"
|
||||||
|
ls -la "${MOUNT_POINT}"
|
||||||
|
|
||||||
|
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
|
||||||
|
echo "Verification failed: Applications symlink missing from mounted DMG" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ "$(readlink "${MOUNT_POINT}/Applications")" != "/Applications" ]]; then
|
||||||
|
echo "Verification failed: Applications does not point at /Applications" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "==> codesign --verify --deep"
|
||||||
|
codesign --verify --deep --verbose=2 "${MOUNT_POINT}/Redline.app"
|
||||||
|
|
||||||
|
echo "==> Detaching ${MOUNT_POINT}"
|
||||||
|
hdiutil detach "${MOUNT_POINT}"
|
||||||
|
MOUNTED=0
|
||||||
|
trap - EXIT
|
||||||
|
|
||||||
|
SHA256="$(shasum -a 256 "${DMG}" | awk '{print $1}')"
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo "DMG path: ${DMG}"
|
||||||
|
echo "SHA256: ${SHA256}"
|
||||||
@@ -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
+469
@@ -0,0 +1,469 @@
|
|||||||
|
#!/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"
|
||||||
|
BUNDLE_ID="ai.flowmaster.shotdeck"
|
||||||
|
# Used both as the fallback signing identity and as what build-app.sh itself
|
||||||
|
# still hardcodes for its own (pre-final) signing pass.
|
||||||
|
FALLBACK_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
|
||||||
|
|
||||||
|
APP_BUNDLE="${ROOT}/.build/Redline.app"
|
||||||
|
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
|
||||||
|
|
||||||
|
# --- Resolve the signing identity for the shipped artifacts -----------------
|
||||||
|
# REDLINE_KEYCHAIN (optional): a specific keychain to search/sign against,
|
||||||
|
# for hosts where the Developer ID identity does not live in the login
|
||||||
|
# keychain that codesign searches by default.
|
||||||
|
FIND_IDENTITY_ARGS=(-v -p codesigning)
|
||||||
|
CODESIGN_KEYCHAIN_ARGS=()
|
||||||
|
if [[ -n "${REDLINE_KEYCHAIN:-}" ]]; then
|
||||||
|
FIND_IDENTITY_ARGS+=("${REDLINE_KEYCHAIN}")
|
||||||
|
CODESIGN_KEYCHAIN_ARGS=(--keychain "${REDLINE_KEYCHAIN}")
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n "${REDLINE_SIGN_IDENTITY:-}" ]]; then
|
||||||
|
SIGN_IDENTITY="${REDLINE_SIGN_IDENTITY}"
|
||||||
|
echo "==> Signing identity: ${SIGN_IDENTITY} (REDLINE_SIGN_IDENTITY)"
|
||||||
|
else
|
||||||
|
DEVELOPER_ID_LINE="$(security find-identity "${FIND_IDENTITY_ARGS[@]}" 2>/dev/null \
|
||||||
|
| grep -o '"Developer ID Application:[^"]*"' | head -n1 || true)"
|
||||||
|
DEVELOPER_ID="${DEVELOPER_ID_LINE//\"/}"
|
||||||
|
if [[ -n "${DEVELOPER_ID}" ]]; then
|
||||||
|
SIGN_IDENTITY="${DEVELOPER_ID}"
|
||||||
|
echo "==> Signing identity: ${SIGN_IDENTITY} (auto-detected Developer ID Application)"
|
||||||
|
else
|
||||||
|
SIGN_IDENTITY="${FALLBACK_SIGN_IDENTITY}"
|
||||||
|
echo
|
||||||
|
echo "************************************************************************"
|
||||||
|
echo "WARNING: signing with Apple Development identity — not Developer ID;"
|
||||||
|
echo "Gatekeeper will block first install on other Macs."
|
||||||
|
echo "************************************************************************"
|
||||||
|
echo
|
||||||
|
fi
|
||||||
|
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 "${APP_BUNDLE}" ]]; then
|
||||||
|
echo "Signed app missing at ${APP_BUNDLE}" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# build-app.sh always signs with its own hardcoded Apple Development identity
|
||||||
|
# first (it has to — that identifier+identity pair is what keeps the Screen
|
||||||
|
# Recording grant alive). Re-sign here with the identity actually resolved
|
||||||
|
# above, which is what ships. A no-op when the two happen to be the same.
|
||||||
|
echo "==> Signing ${APP_BUNDLE} with resolved identity"
|
||||||
|
run_signed codesign --force --options runtime --timestamp \
|
||||||
|
${CODESIGN_KEYCHAIN_ARGS[@]+"${CODESIGN_KEYCHAIN_ARGS[@]}"} \
|
||||||
|
--sign "${SIGN_IDENTITY}" \
|
||||||
|
--identifier "${BUNDLE_ID}" \
|
||||||
|
"${APP_BUNDLE}"
|
||||||
|
|
||||||
|
build_zip() {
|
||||||
|
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
|
||||||
|
}
|
||||||
|
|
||||||
|
# Rebuilds the manual-installer DMG from whatever is currently at
|
||||||
|
# ${APP_BUNDLE} — never re-invokes build-app.sh, so a prior custom signature
|
||||||
|
# or notarization staple on ${APP_BUNDLE} survives into the DMG untouched.
|
||||||
|
build_dmg() {
|
||||||
|
local staging="${ROOT}/.build/dmg-staging"
|
||||||
|
local mount_point="${ROOT}/.build/dmg-mnt"
|
||||||
|
|
||||||
|
rm -rf "${staging}"
|
||||||
|
mkdir -p "${staging}"
|
||||||
|
ditto "${APP_BUNDLE}" "${staging}/Redline.app"
|
||||||
|
ln -s /Applications "${staging}/Applications"
|
||||||
|
|
||||||
|
mkdir -p "$(dirname "${DMG_PATH}")"
|
||||||
|
rm -f "${DMG_PATH}"
|
||||||
|
hdiutil create -volname "Redline" -srcfolder "${staging}" -ov -format UDZO "${DMG_PATH}"
|
||||||
|
|
||||||
|
if [[ -d "${mount_point}" ]] && /sbin/mount | grep -F -q "${mount_point}"; then
|
||||||
|
hdiutil detach "${mount_point}" || hdiutil detach "${mount_point}" -force
|
||||||
|
fi
|
||||||
|
rm -rf "${mount_point}"
|
||||||
|
mkdir -p "${mount_point}"
|
||||||
|
|
||||||
|
hdiutil attach "${DMG_PATH}" -nobrowse -readonly -mountpoint "${mount_point}"
|
||||||
|
|
||||||
|
local ok=1
|
||||||
|
if [[ ! -d "${mount_point}/Redline.app" ]]; then
|
||||||
|
echo "Verification failed: Redline.app missing from mounted DMG" >&2
|
||||||
|
ok=0
|
||||||
|
fi
|
||||||
|
if [[ "${ok}" -eq 1 && "$(readlink "${mount_point}/Applications" 2>/dev/null || true)" != "/Applications" ]]; then
|
||||||
|
echo "Verification failed: Applications does not point at /Applications" >&2
|
||||||
|
ok=0
|
||||||
|
fi
|
||||||
|
if [[ "${ok}" -eq 1 ]] && ! codesign --verify --deep --verbose=2 "${mount_point}/Redline.app"; then
|
||||||
|
ok=0
|
||||||
|
fi
|
||||||
|
|
||||||
|
hdiutil detach "${mount_point}" || hdiutil detach "${mount_point}" -force || true
|
||||||
|
|
||||||
|
if [[ "${ok}" -ne 1 ]]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ ! -s "${DMG_PATH}" ]]; then
|
||||||
|
echo "DMG was not created at ${DMG_PATH}" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "==> Zipping Redline.app -> ${ZIP_PATH}"
|
||||||
|
build_zip
|
||||||
|
|
||||||
|
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}"
|
||||||
|
|
||||||
|
# --- Notarization (optional) -------------------------------------------------
|
||||||
|
# Either REDLINE_NOTARY_PROFILE (a `notarytool store-credentials` keychain
|
||||||
|
# profile) or all three of REDLINE_NOTARY_KEY_ID / REDLINE_NOTARY_ISSUER /
|
||||||
|
# REDLINE_NOTARY_KEY_PATH (App Store Connect API key). Absent both: skip.
|
||||||
|
NOTARIZED=0
|
||||||
|
NOTARY_CONFIGURED=0
|
||||||
|
if [[ -n "${REDLINE_NOTARY_PROFILE:-}" ]]; then
|
||||||
|
NOTARY_CONFIGURED=1
|
||||||
|
elif [[ -n "${REDLINE_NOTARY_KEY_ID:-}" && -n "${REDLINE_NOTARY_ISSUER:-}" && -n "${REDLINE_NOTARY_KEY_PATH:-}" ]]; then
|
||||||
|
NOTARY_CONFIGURED=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "${NOTARY_CONFIGURED}" -eq 1 ]]; then
|
||||||
|
echo "==> Submitting ${ZIP_PATH} to notarytool"
|
||||||
|
NOTARY_ARGS=(xcrun notarytool submit "${ZIP_PATH}" --wait --timeout 30m)
|
||||||
|
if [[ -n "${REDLINE_NOTARY_PROFILE:-}" ]]; then
|
||||||
|
NOTARY_ARGS+=(--keychain-profile "${REDLINE_NOTARY_PROFILE}")
|
||||||
|
else
|
||||||
|
NOTARY_ARGS+=(
|
||||||
|
--key "${REDLINE_NOTARY_KEY_PATH}"
|
||||||
|
--key-id "${REDLINE_NOTARY_KEY_ID}"
|
||||||
|
--issuer "${REDLINE_NOTARY_ISSUER}"
|
||||||
|
)
|
||||||
|
fi
|
||||||
|
|
||||||
|
set +e
|
||||||
|
NOTARY_OUTPUT="$("${NOTARY_ARGS[@]}" 2>&1)"
|
||||||
|
NOTARY_STATUS=$?
|
||||||
|
set -e
|
||||||
|
echo "${NOTARY_OUTPUT}"
|
||||||
|
if [[ "${NOTARY_STATUS}" -ne 0 ]]; then
|
||||||
|
echo "notarytool submit failed (exit ${NOTARY_STATUS})." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if ! grep -qi 'status: *Accepted' <<<"${NOTARY_OUTPUT}"; then
|
||||||
|
echo "notarytool did not report Accepted." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
NOTARIZED=1
|
||||||
|
|
||||||
|
echo "==> Stapling ${APP_BUNDLE}"
|
||||||
|
xcrun stapler staple "${APP_BUNDLE}"
|
||||||
|
|
||||||
|
echo "==> Rebuilding zip from the stapled app"
|
||||||
|
build_zip
|
||||||
|
SHA256="$(shasum -a 256 "${ZIP_PATH}" | awk '{print $1}')"
|
||||||
|
ZIP_BYTES="$(stat -f%z "${ZIP_PATH}")"
|
||||||
|
echo " Zip SHA256: ${SHA256}"
|
||||||
|
echo " Zip bytes: ${ZIP_BYTES}"
|
||||||
|
|
||||||
|
echo "==> Rebuilding DMG from the stapled app"
|
||||||
|
build_dmg
|
||||||
|
|
||||||
|
echo "==> Stapling ${DMG_PATH}"
|
||||||
|
xcrun stapler staple "${DMG_PATH}"
|
||||||
|
else
|
||||||
|
echo "==> REDLINE_NOTARY_KEY_ID/ISSUER/KEY_PATH (or REDLINE_NOTARY_PROFILE) not set"
|
||||||
|
echo "NOT NOTARIZED"
|
||||||
|
echo "==> Building manual installer DMG"
|
||||||
|
build_dmg
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "==> Gatekeeper check: spctl -a -vv -t exec ${APP_BUNDLE}"
|
||||||
|
set +e
|
||||||
|
SPCTL_OUTPUT="$(spctl -a -vv -t exec "${APP_BUNDLE}" 2>&1)"
|
||||||
|
SPCTL_STATUS=$?
|
||||||
|
set -e
|
||||||
|
echo "${SPCTL_OUTPUT}"
|
||||||
|
if [[ "${SPCTL_STATUS}" -ne 0 ]] || ! grep -qi 'accepted' <<<"${SPCTL_OUTPUT}"; then
|
||||||
|
if [[ "${NOTARIZED}" -eq 1 ]]; then
|
||||||
|
echo "spctl did not report accepted for ${APP_BUNDLE} although it was notarized." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "WARNING: Gatekeeper does not accept this build (not notarized). First install on other Macs needs right-click > Open." >&2
|
||||||
|
fi
|
||||||
|
|
||||||
|
TEAM_IDENTIFIER="$(codesign -dv "${APP_BUNDLE}" 2>&1 | awk -F= '/^TeamIdentifier=/{print $2}')"
|
||||||
|
if [[ -z "${TEAM_IDENTIFIER}" ]]; then
|
||||||
|
echo "No TeamIdentifier on ${APP_BUNDLE} — the build is not signed with a team identity; refusing to publish." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "==> Writing ${APPCAST_PATH}"
|
||||||
|
python3 - "${VERSION}" "${ZIP_URL}" "${SHA256}" "${NOTES}" "${PUBDATE}" "${APPCAST_PATH}" "${NOTARIZED}" "${TEAM_IDENTIFIER}" <<'PY'
|
||||||
|
import json
|
||||||
|
import sys
|
||||||
|
|
||||||
|
version, zip_url, sha256, notes, pub_date, out_path, notarized, team_identifier = sys.argv[1:]
|
||||||
|
payload = {
|
||||||
|
"version": version,
|
||||||
|
"zipURL": zip_url,
|
||||||
|
"sha256": sha256,
|
||||||
|
"notes": notes,
|
||||||
|
"pubDate": pub_date,
|
||||||
|
"notarized": notarized == "1",
|
||||||
|
"teamIdentifier": team_identifier,
|
||||||
|
}
|
||||||
|
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 " identity: ${SIGN_IDENTITY}"
|
||||||
|
if [[ "${NOTARIZED}" -eq 1 ]]; then
|
||||||
|
echo " notarized: yes"
|
||||||
|
else
|
||||||
|
echo " notarized: no"
|
||||||
|
fi
|
||||||
|
echo " spctl: ${SPCTL_OUTPUT}"
|
||||||
|
echo " team: ${TEAM_IDENTIFIER}"
|
||||||
|
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