Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f0e9b41d90 | ||
|
|
36071aed84 | ||
|
|
5e61cd735c | ||
|
|
461f4e4d75 | ||
|
|
4e7c575455 | ||
|
|
7284568489 |
@@ -36,6 +36,8 @@ public final class AppModel {
|
||||
public private(set) var outboxURL: URL
|
||||
/// Live watch folder; WP-4c updates this alongside `ReturnWatcher.updateWatchFolder`.
|
||||
public private(set) var watchFolderURL: URL
|
||||
/// 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 }
|
||||
@@ -116,6 +118,42 @@ public final class AppModel {
|
||||
watchFolderURL = watch
|
||||
setFolderDisplayNames(outbox: outbox.lastPathComponent, watch: watch.lastPathComponent)
|
||||
}
|
||||
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 {
|
||||
if !screenRecordingGranted { return .recordingMissing }
|
||||
|
||||
@@ -95,6 +95,13 @@ struct MenuBarView: View {
|
||||
}
|
||||
.disabled(model.session.isEmpty || model.isSending)
|
||||
|
||||
Button {
|
||||
model.revealLastPDF()
|
||||
} label: {
|
||||
actionLabel("Reveal last PDF")
|
||||
}
|
||||
.disabled(!model.canRevealLastPDF)
|
||||
|
||||
Button {
|
||||
Task { await model.captureNow() }
|
||||
} label: {
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import AppKit
|
||||
import CoreGraphics
|
||||
import Darwin
|
||||
import Foundation
|
||||
import ImageIO
|
||||
import ShotdeckCore
|
||||
|
||||
/// In-process self-test for the region picker, driven by `SHOTDECK_PICKER_SELFTEST`.
|
||||
@@ -113,10 +115,10 @@ enum PickerSelfTest {
|
||||
fflush(stdout)
|
||||
|
||||
runRegionPersistPhase()
|
||||
if !startUpdateSelfTestIfRequested() {
|
||||
exit(0)
|
||||
}
|
||||
// UPDATE-SELFTEST hops to a later main-actor turn and exits itself.
|
||||
// Hop off this MainActor job so the SEND-TRUTH Task can run; do not
|
||||
// exit(0) here — runSendTruthPhase prints its own PASS/FAIL, then
|
||||
// chains to UPDATE-SELFTEST (or exits if that phase is not requested).
|
||||
runSendTruthPhase()
|
||||
}
|
||||
|
||||
/// Phase 2: writes a known region under `CaptureRegion.defaultsKey`, reloads it through
|
||||
@@ -160,7 +162,145 @@ enum PickerSelfTest {
|
||||
fflush(stdout)
|
||||
}
|
||||
|
||||
/// Phase 3: builds a fake 99.0.0 bundle, serves a local appcast, stages via
|
||||
/// Phase 3: drive SendController's share-outcome seams with no AirDrop sheet.
|
||||
/// Fail path must leave the session open in the temp spool; success path archives
|
||||
/// and mints a fresh empty session. Scheduled as a new MainActor job because this
|
||||
/// function is called from inside `execute()` — a nested run-loop wait would never
|
||||
/// let the Task start. On success, chains to UPDATE-SELFTEST instead of exiting.
|
||||
private static func runSendTruthPhase() {
|
||||
Task { @MainActor in
|
||||
do {
|
||||
try await executeSendTruth()
|
||||
print("SEND-TRUTH PASS")
|
||||
fflush(stdout)
|
||||
if !startUpdateSelfTestIfRequested() {
|
||||
exit(0)
|
||||
}
|
||||
} catch {
|
||||
print("SEND-TRUTH FAIL \(error)")
|
||||
fflush(stdout)
|
||||
exit(1)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static func executeSendTruth() async throws {
|
||||
let fm = FileManager.default
|
||||
let root = fm.temporaryDirectory
|
||||
.appendingPathComponent("shotdeck-send-truth-\(UUID().uuidString)", isDirectory: true)
|
||||
defer { try? fm.removeItem(at: root) }
|
||||
|
||||
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)
|
||||
|
||||
let png = try makeTinyPNGData()
|
||||
_ = try await model.spool.append(
|
||||
pngData: png,
|
||||
pixelWidth: 64,
|
||||
pixelHeight: 48,
|
||||
scale: 1,
|
||||
capturedAt: Date()
|
||||
)
|
||||
model.replaceSession(try await model.spool.currentSession())
|
||||
let openID = model.session.id
|
||||
guard !model.session.isEmpty else {
|
||||
sendTruthFail("seeded session was empty")
|
||||
}
|
||||
|
||||
let pending = try await model.composePDFForSend()
|
||||
guard fm.fileExists(atPath: pending.fileURL.path) else {
|
||||
sendTruthFail("PDF was not written")
|
||||
}
|
||||
|
||||
model.handleDidFailToShareItems(fileName: pending.fileName)
|
||||
let still = try await model.spool.currentSession()
|
||||
guard still.id == openID, !still.isEmpty, still.state == .open else {
|
||||
sendTruthFail("fail path archived or replaced the session")
|
||||
}
|
||||
let spoolDir = paths.sessionDirectory(openID)
|
||||
guard fm.fileExists(atPath: spoolDir.path) else {
|
||||
sendTruthFail("fail path: session missing from temp spool")
|
||||
}
|
||||
guard let status = model.statusLine, status.contains("nothing was sent") else {
|
||||
sendTruthFail("fail path status missing 'nothing was sent': \(model.statusLine ?? "nil")")
|
||||
}
|
||||
|
||||
await model.handleDidShareItems(fileName: pending.fileName, pageCount: pending.pageCount)
|
||||
let fresh = try await model.spool.currentSession()
|
||||
guard fresh.isEmpty, fresh.id != openID, fresh.state == .open else {
|
||||
sendTruthFail("success path did not mint a fresh empty session")
|
||||
}
|
||||
let archived = try await model.spool.archivedSessions()
|
||||
guard archived.contains(where: { $0.id == openID && $0.state == .archived }) else {
|
||||
sendTruthFail("success path did not archive the session")
|
||||
}
|
||||
let archiveDir = paths.archiveDirectory(openID)
|
||||
guard fm.fileExists(atPath: archiveDir.path) else {
|
||||
sendTruthFail("success path: archive dir missing")
|
||||
}
|
||||
guard !fm.fileExists(atPath: spoolDir.path) else {
|
||||
sendTruthFail("success path: session still in spool")
|
||||
}
|
||||
}
|
||||
|
||||
private static func makeTinyPNGData() throws -> Data {
|
||||
let width = 64
|
||||
let height = 48
|
||||
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 {
|
||||
sendTruthFail("could not create PNG context")
|
||||
}
|
||||
context.setFillColor(red: 0.2, green: 0.4, blue: 0.8, alpha: 1)
|
||||
context.fill(CGRect(x: 0, y: 0, width: width, height: height))
|
||||
guard let image = context.makeImage() else {
|
||||
sendTruthFail("could not make CGImage")
|
||||
}
|
||||
let buffer = NSMutableData()
|
||||
guard let destination = CGImageDestinationCreateWithData(
|
||||
buffer,
|
||||
"public.png" as CFString,
|
||||
1,
|
||||
nil
|
||||
) else {
|
||||
sendTruthFail("could not create PNG destination")
|
||||
}
|
||||
CGImageDestinationAddImage(destination, image, nil)
|
||||
guard CGImageDestinationFinalize(destination) else {
|
||||
sendTruthFail("could not finalize PNG")
|
||||
}
|
||||
return buffer as Data
|
||||
}
|
||||
|
||||
private static func sendTruthFail(_ reason: String) -> Never {
|
||||
print("SEND-TRUTH FAIL \(reason)")
|
||||
fflush(stdout)
|
||||
exit(1)
|
||||
}
|
||||
|
||||
/// Phase 4: builds a fake 99.0.0 bundle, serves a local appcast, stages via
|
||||
/// `checkNow`, then `installStaged` into the env dir — never `/Applications`.
|
||||
/// Returns true when the async phase was scheduled (it calls `exit` itself).
|
||||
@discardableResult
|
||||
|
||||
@@ -3,12 +3,59 @@ import Darwin
|
||||
import Foundation
|
||||
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 {
|
||||
public func send(anchor: NSView?) async {
|
||||
guard !session.isEmpty, !isSending else { return }
|
||||
setSending(true)
|
||||
defer { setSending(false) }
|
||||
|
||||
let pending: ComposedSend
|
||||
do {
|
||||
pending = try await composePDFForSend()
|
||||
} 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
|
||||
}
|
||||
|
||||
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 {
|
||||
await self.handleDidShareItems(
|
||||
fileName: pending.fileName,
|
||||
pageCount: pending.pageCount
|
||||
)
|
||||
} 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 the outbox and records its path. Does not archive the session
|
||||
/// and does not present AirDrop — that happens only after the share completes.
|
||||
func composePDFForSend() async throws -> ComposedSend {
|
||||
let workingSession = session
|
||||
let composer = self.composer
|
||||
// Live outbox (FolderSettings), not `paths.outbox` — Settings changes take effect.
|
||||
@@ -20,52 +67,54 @@ extension AppModel: SendCapable {
|
||||
let tempURL = outboxDir.appendingPathComponent(".shotdeck-\(UUID().uuidString).pdf")
|
||||
let title = "Redline – \(DubaiTime.stamp(workingSession.createdAt))"
|
||||
|
||||
do {
|
||||
// D-13: build off the main actor. Only Sendable values cross into the
|
||||
// detached task — never `anchor` (NSView is not Sendable).
|
||||
try await Task.detached(priority: .userInitiated) {
|
||||
_ = try composer.compose(
|
||||
session: workingSession,
|
||||
imageURL: { capture in sourceDir.appendingPathComponent(capture.fileName) },
|
||||
title: title,
|
||||
to: tempURL
|
||||
// D-13: build off the main actor. Only Sendable values cross into the
|
||||
// detached task — never `anchor` (NSView is not Sendable).
|
||||
try await Task.detached(priority: .userInitiated) {
|
||||
_ = try composer.compose(
|
||||
session: workingSession,
|
||||
imageURL: { capture in sourceDir.appendingPathComponent(capture.fileName) },
|
||||
title: title,
|
||||
to: tempURL
|
||||
)
|
||||
// POSIX rename onto `finalURL` replaces any same-name file in one
|
||||
// directory operation; there is never a window where the PDF is gone.
|
||||
if Darwin.rename(tempURL.path, finalURL.path) != 0 {
|
||||
throw ShotdeckError.pdfCompositionFailed(
|
||||
reason: "could not publish the PDF: \(String(cString: strerror(errno)))"
|
||||
)
|
||||
// POSIX rename onto `finalURL` replaces any same-name file in one
|
||||
// directory operation; there is never a window where the PDF is gone.
|
||||
if Darwin.rename(tempURL.path, finalURL.path) != 0 {
|
||||
throw ShotdeckError.pdfCompositionFailed(
|
||||
reason: "could not publish the PDF: \(String(cString: strerror(errno)))"
|
||||
)
|
||||
}
|
||||
try AtomicFile.fsyncDirectory(at: outboxDir)
|
||||
}.value
|
||||
|
||||
// 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 AtomicFile.fsyncDirectory(at: outboxDir)
|
||||
}.value
|
||||
|
||||
guard FileManager.default.fileExists(atPath: finalURL.path) else {
|
||||
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.
|
||||
func handleDidShareItems(fileName: String, pageCount: Int) async {
|
||||
guard !session.isEmpty else { return }
|
||||
do {
|
||||
_ = 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 {
|
||||
try Sharing.airDrop(fileURL: finalURL, from: anchor)
|
||||
} catch {
|
||||
setStatus(
|
||||
"AirDrop is not available right now — the PDF is on your \(outboxDisplayName)."
|
||||
)
|
||||
}
|
||||
let pageWord = pageCount == 1 ? "page" : "pages"
|
||||
setStatus("Sent — \(pageCount) \(pageWord).")
|
||||
} catch {
|
||||
// Never unlink the published PDF, and never unlink `tempURL` either:
|
||||
// a rename failure would leave the complete document at the temp name.
|
||||
setStatus((error as? ShotdeckError)?.errorDescription ?? "The PDF could not be built.")
|
||||
setStatus((error as? ShotdeckError)?.errorDescription ?? "Could not archive the session.")
|
||||
}
|
||||
}
|
||||
|
||||
/// `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)."
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,14 @@ enum Sharing {
|
||||
/// Throws `ShotdeckError.airDropUnavailable` when the service cannot be created,
|
||||
/// `canPerform` is false, or `view` is not in a visible window (a detached view
|
||||
/// 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),
|
||||
service.canPerform(withItems: [fileURL]) else {
|
||||
throw ShotdeckError.airDropUnavailable
|
||||
@@ -21,7 +28,12 @@ enum Sharing {
|
||||
window.makeKeyAndOrderFront(nil)
|
||||
|
||||
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)
|
||||
service.delegate = session
|
||||
service.perform(withItems: [fileURL])
|
||||
@@ -29,7 +41,9 @@ enum Sharing {
|
||||
}
|
||||
|
||||
/// 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
|
||||
private final class AirDropSession: NSObject, NSSharingServiceDelegate {
|
||||
static var live: [AirDropSession] = []
|
||||
@@ -37,11 +51,19 @@ private final class AirDropSession: NSObject, NSSharingServiceDelegate {
|
||||
let service: NSSharingService
|
||||
let window: NSWindow
|
||||
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.window = window
|
||||
self.view = view
|
||||
self.onFinished = onFinished
|
||||
}
|
||||
|
||||
static func keepAlive(_ session: AirDropSession) {
|
||||
@@ -52,6 +74,15 @@ private final class AirDropSession: NSObject, NSSharingServiceDelegate {
|
||||
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(
|
||||
_ sharingService: NSSharingService,
|
||||
sourceWindowForShareItems items: [Any],
|
||||
@@ -70,7 +101,7 @@ private final class AirDropSession: NSObject, NSSharingServiceDelegate {
|
||||
}
|
||||
|
||||
func sharingService(_ sharingService: NSSharingService, didShareItems items: [Any]) {
|
||||
drop()
|
||||
report(true)
|
||||
}
|
||||
|
||||
func sharingService(
|
||||
@@ -78,6 +109,6 @@ private final class AirDropSession: NSObject, NSSharingServiceDelegate {
|
||||
didFailToShareItems items: [Any],
|
||||
error: any Error
|
||||
) {
|
||||
drop()
|
||||
report(false)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,8 +70,8 @@ public struct PDFComposer: Sendable {
|
||||
}
|
||||
}
|
||||
|
||||
public static func fileName(for session: CaptureSession) -> String {
|
||||
"Redline-\(DubaiTime.fileStamp(session.createdAt)).pdf"
|
||||
public static func fileName(for _: CaptureSession) -> String {
|
||||
"Redline-\(DubaiTime.fileStamp(Date())).pdf"
|
||||
}
|
||||
|
||||
private static func writePDF(
|
||||
|
||||
@@ -203,6 +203,17 @@ private func pixelWindow(
|
||||
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")
|
||||
func threePageBasicCompose() throws {
|
||||
let directory = try makeScratchDirectory()
|
||||
|
||||
Executable
+287
@@ -0,0 +1,287 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
# One-command Redline release: bump Info.plist, commit, signed build, zip,
|
||||
# DMG, appcast, upload to mmd01, verify the public URLs.
|
||||
# Hidden flag: --test — upload under .../redline/test/ and skip the git commit.
|
||||
|
||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "${ROOT}"
|
||||
|
||||
PLIST="${ROOT}/Info.plist"
|
||||
PLISTBUDDY="/usr/libexec/PlistBuddy"
|
||||
REMOTE_HOST="mmd01"
|
||||
REMOTE_BASE="/opt/mmd-installer-content/cowork/redline"
|
||||
PUBLIC_BASE="https://get.baobab-ts.com/cowork/redline"
|
||||
SIGN_IDENTITY="Apple Development: ben@flow-master.ai (QH2H9G2LK5)"
|
||||
|
||||
usage() {
|
||||
echo "Usage: $0 <version> [\"notes\"]" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
TEST_MODE=0
|
||||
VERSION=""
|
||||
NOTES=""
|
||||
NOTES_SET=0
|
||||
for arg in "$@"; do
|
||||
case "${arg}" in
|
||||
--test)
|
||||
TEST_MODE=1
|
||||
;;
|
||||
--help|-h)
|
||||
usage
|
||||
;;
|
||||
--*)
|
||||
echo "Unknown argument: ${arg}" >&2
|
||||
usage
|
||||
;;
|
||||
*)
|
||||
if [[ -z "${VERSION}" ]]; then
|
||||
VERSION="${arg}"
|
||||
elif [[ "${NOTES_SET}" -eq 0 ]]; then
|
||||
NOTES="${arg}"
|
||||
NOTES_SET=1
|
||||
else
|
||||
echo "Unexpected extra argument: ${arg}" >&2
|
||||
usage
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [[ -z "${VERSION}" ]]; then
|
||||
usage
|
||||
fi
|
||||
|
||||
if [[ ! "${VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+([+-][A-Za-z0-9.-]+)*$ ]]; then
|
||||
echo "Version '${VERSION}' is not a semver (e.g. 1.2.3 or 0.0.0-test)." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ "${VERSION}" == *'/'* || "${VERSION}" == *'..'* ]]; then
|
||||
echo "Version contains illegal path characters: ${VERSION}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ "${TEST_MODE}" -eq 1 ]]; then
|
||||
REMOTE_DIR="${REMOTE_BASE}/test"
|
||||
PUBLIC_DIR="${PUBLIC_BASE}/test"
|
||||
else
|
||||
REMOTE_DIR="${REMOTE_BASE}"
|
||||
PUBLIC_DIR="${PUBLIC_BASE}"
|
||||
fi
|
||||
|
||||
ZIP_NAME="Redline-${VERSION}.zip"
|
||||
DMG_NAME="Redline-${VERSION}.dmg"
|
||||
ZIP_PATH="${ROOT}/.build/${ZIP_NAME}"
|
||||
DMG_PATH="${ROOT}/.build/Redline.dmg"
|
||||
APPCAST_PATH="${ROOT}/.build/appcast.json"
|
||||
ZIP_URL="${PUBLIC_DIR}/${ZIP_NAME}"
|
||||
APPCAST_URL="${PUBLIC_DIR}/appcast.json"
|
||||
|
||||
if [[ "${TEST_MODE}" -eq 1 ]]; then
|
||||
echo "==> Publish Redline ${VERSION} (test)"
|
||||
else
|
||||
echo "==> Publish Redline ${VERSION}"
|
||||
fi
|
||||
echo " remote: ${REMOTE_HOST}:${REMOTE_DIR}/"
|
||||
echo " public: ${PUBLIC_DIR}/"
|
||||
|
||||
if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
|
||||
echo "Not inside a git work tree." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Tracked files must match HEAD. Untracked files are ignored so this script
|
||||
# can be dry-run (--test) before it is itself committed.
|
||||
if [[ -n "$(git status --porcelain -uno)" ]]; then
|
||||
echo "git tree is not clean; commit or stash before publishing." >&2
|
||||
git status --porcelain -uno >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ ! -x "${PLISTBUDDY}" ]]; then
|
||||
echo "PlistBuddy not found at ${PLISTBUDDY}" >&2
|
||||
exit 1
|
||||
fi
|
||||
if [[ ! -f "${PLIST}" ]]; then
|
||||
echo "Info.plist not found at ${PLIST}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
restore_plist() {
|
||||
git checkout -- "${PLIST}" >/dev/null 2>&1 || true
|
||||
}
|
||||
|
||||
if [[ "${TEST_MODE}" -eq 1 ]]; then
|
||||
trap restore_plist EXIT
|
||||
fi
|
||||
|
||||
CURRENT_BUILD="$("${PLISTBUDDY}" -c 'Print :CFBundleVersion' "${PLIST}")"
|
||||
if [[ ! "${CURRENT_BUILD}" =~ ^[0-9]+$ ]]; then
|
||||
echo "CFBundleVersion is not an integer: ${CURRENT_BUILD}" >&2
|
||||
exit 1
|
||||
fi
|
||||
NEW_BUILD=$((CURRENT_BUILD + 1))
|
||||
|
||||
echo "==> Bumping Info.plist"
|
||||
echo " CFBundleShortVersionString -> ${VERSION}"
|
||||
echo " CFBundleVersion ${CURRENT_BUILD} -> ${NEW_BUILD}"
|
||||
"${PLISTBUDDY}" -c "Set :CFBundleShortVersionString ${VERSION}" "${PLIST}"
|
||||
"${PLISTBUDDY}" -c "Set :CFBundleVersion ${NEW_BUILD}" "${PLIST}"
|
||||
|
||||
if [[ "${TEST_MODE}" -eq 0 ]]; then
|
||||
echo "==> Committing version bump on $(git rev-parse --abbrev-ref HEAD)"
|
||||
git add "${PLIST}"
|
||||
git commit -m "release: v${VERSION}"
|
||||
else
|
||||
echo "==> --test: skipping git commit of version bump"
|
||||
fi
|
||||
|
||||
# Restricted HOMEs (agent sandboxes) hide the login keychain from codesign.
|
||||
# Re-run signed steps with the account's real home when the identity is missing.
|
||||
signing_home() {
|
||||
if security find-identity -v -p codesigning 2>/dev/null | grep -Fq "${SIGN_IDENTITY}"; then
|
||||
echo "${HOME}"
|
||||
return
|
||||
fi
|
||||
local rh
|
||||
rh="$(dscl . -read "/Users/$(id -un)" NFSHomeDirectory 2>/dev/null | awk '{print $2}')"
|
||||
if [[ -n "${rh}" && -d "${rh}" ]]; then
|
||||
echo "${rh}"
|
||||
else
|
||||
echo "${HOME}"
|
||||
fi
|
||||
}
|
||||
|
||||
run_signed() {
|
||||
local sign_home
|
||||
sign_home="$(signing_home)"
|
||||
if [[ "${sign_home}" != "${HOME}" ]]; then
|
||||
echo "==> Using HOME=${sign_home} so codesign can see the login keychain"
|
||||
fi
|
||||
HOME="${sign_home}" "$@"
|
||||
}
|
||||
|
||||
echo "==> Building signed Redline.app"
|
||||
run_signed ./scripts/build-app.sh
|
||||
|
||||
if [[ ! -d "${ROOT}/.build/Redline.app" ]]; then
|
||||
echo "Signed app missing at ${ROOT}/.build/Redline.app" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "==> Zipping Redline.app -> ${ZIP_PATH}"
|
||||
mkdir -p "${ROOT}/.build"
|
||||
(
|
||||
cd "${ROOT}/.build"
|
||||
rm -f "${ZIP_NAME}"
|
||||
ditto -c -k --keepParent Redline.app "${ZIP_NAME}"
|
||||
)
|
||||
|
||||
if [[ ! -s "${ZIP_PATH}" ]]; then
|
||||
echo "Zip was not created at ${ZIP_PATH}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "==> Building manual installer DMG"
|
||||
run_signed ./scripts/make-dmg.sh
|
||||
|
||||
if [[ ! -s "${DMG_PATH}" ]]; then
|
||||
echo "DMG was not created at ${DMG_PATH}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
SHA256="$(shasum -a 256 "${ZIP_PATH}" | awk '{print $1}')"
|
||||
ZIP_BYTES="$(stat -f%z "${ZIP_PATH}")"
|
||||
PUBDATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
|
||||
|
||||
echo "==> Zip SHA256: ${SHA256}"
|
||||
echo " Zip bytes: ${ZIP_BYTES}"
|
||||
|
||||
echo "==> Writing ${APPCAST_PATH}"
|
||||
python3 - "${VERSION}" "${ZIP_URL}" "${SHA256}" "${NOTES}" "${PUBDATE}" "${APPCAST_PATH}" <<'PY'
|
||||
import json
|
||||
import sys
|
||||
|
||||
version, zip_url, sha256, notes, pub_date, out_path = sys.argv[1:]
|
||||
payload = {
|
||||
"version": version,
|
||||
"zipURL": zip_url,
|
||||
"sha256": sha256,
|
||||
"notes": notes,
|
||||
"pubDate": pub_date,
|
||||
}
|
||||
with open(out_path, "w", encoding="utf-8") as fh:
|
||||
json.dump(payload, fh, indent=2)
|
||||
fh.write("\n")
|
||||
PY
|
||||
|
||||
echo "==> Uploading to ${REMOTE_HOST}:${REMOTE_DIR}/"
|
||||
ssh -o BatchMode=yes "${REMOTE_HOST}" "mkdir -p '${REMOTE_DIR}'"
|
||||
rsync -e "ssh -o BatchMode=yes" -av "${ZIP_PATH}" "${REMOTE_HOST}:${REMOTE_DIR}/${ZIP_NAME}"
|
||||
rsync -e "ssh -o BatchMode=yes" -av "${DMG_PATH}" "${REMOTE_HOST}:${REMOTE_DIR}/Redline.dmg"
|
||||
rsync -e "ssh -o BatchMode=yes" -av "${DMG_PATH}" "${REMOTE_HOST}:${REMOTE_DIR}/${DMG_NAME}"
|
||||
rsync -e "ssh -o BatchMode=yes" -av "${APPCAST_PATH}" "${REMOTE_HOST}:${REMOTE_DIR}/appcast.json"
|
||||
ssh -o BatchMode=yes "${REMOTE_HOST}" \
|
||||
"chmod 644 \
|
||||
'${REMOTE_DIR}/${ZIP_NAME}' \
|
||||
'${REMOTE_DIR}/Redline.dmg' \
|
||||
'${REMOTE_DIR}/${DMG_NAME}' \
|
||||
'${REMOTE_DIR}/appcast.json'"
|
||||
|
||||
echo "==> Verifying public appcast ${APPCAST_URL}"
|
||||
APPCAST_BODY=""
|
||||
ok=0
|
||||
attempt=1
|
||||
while [[ "${attempt}" -le 15 ]]; do
|
||||
if APPCAST_BODY="$(curl -fsS "${APPCAST_URL}")"; then
|
||||
echo "${APPCAST_BODY}"
|
||||
if grep -F -q "${VERSION}" <<<"${APPCAST_BODY}"; then
|
||||
echo "OK: appcast contains ${VERSION}"
|
||||
ok=1
|
||||
break
|
||||
fi
|
||||
echo "appcast fetched but does not contain '${VERSION}' (attempt ${attempt})" >&2
|
||||
else
|
||||
echo "appcast fetch failed (attempt ${attempt})" >&2
|
||||
fi
|
||||
attempt=$((attempt + 1))
|
||||
sleep 2
|
||||
done
|
||||
if [[ "${ok}" -ne 1 ]]; then
|
||||
echo "Public appcast verification failed for ${APPCAST_URL}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "==> Verifying public zip HEAD ${ZIP_URL}"
|
||||
ok=0
|
||||
attempt=1
|
||||
HEAD_OUT=""
|
||||
while [[ "${attempt}" -le 15 ]]; do
|
||||
HEAD_OUT="$(curl -sS -D - -o /dev/null -I "${ZIP_URL}" || true)"
|
||||
echo "${HEAD_OUT}"
|
||||
HTTP_CODE="$(awk 'BEGIN{c=""} toupper($1) ~ /^HTTP\//{c=$2} END{print c}' <<<"${HEAD_OUT}" | tr -d '\r')"
|
||||
CONTENT_LENGTH="$(awk 'tolower($1)=="content-length:" {gsub("\r","",$2); print $2}' <<<"${HEAD_OUT}" | tail -n 1)"
|
||||
if [[ "${HTTP_CODE}" == "200" && "${CONTENT_LENGTH}" == "${ZIP_BYTES}" ]]; then
|
||||
echo "OK: zip HTTP ${HTTP_CODE}, Content-Length ${CONTENT_LENGTH} matches local ${ZIP_BYTES}"
|
||||
ok=1
|
||||
break
|
||||
fi
|
||||
echo "zip HEAD mismatch (attempt ${attempt}): HTTP '${HTTP_CODE}', Content-Length '${CONTENT_LENGTH}', local '${ZIP_BYTES}'" >&2
|
||||
attempt=$((attempt + 1))
|
||||
sleep 2
|
||||
done
|
||||
if [[ "${ok}" -ne 1 ]]; then
|
||||
echo "Public zip verification failed for ${ZIP_URL}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "Published v${VERSION}"
|
||||
echo " appcast: ${APPCAST_URL}"
|
||||
echo " zip: ${ZIP_URL}"
|
||||
echo " sha256: ${SHA256}"
|
||||
echo " dmg: ${PUBLIC_DIR}/${DMG_NAME}"
|
||||
echo " dmg: ${PUBLIC_DIR}/Redline.dmg"
|
||||
Reference in New Issue
Block a user