Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9201e74bfc |
@@ -1,53 +0,0 @@
|
||||
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))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
import AppKit
|
||||
import Darwin
|
||||
import Foundation
|
||||
import ShotdeckCore
|
||||
|
||||
extension AppModel: SendCapable {
|
||||
public func send(anchor: NSView?) async {
|
||||
guard !session.isEmpty, !isSending else { return }
|
||||
setSending(true)
|
||||
defer { setSending(false) }
|
||||
|
||||
let workingSession = session
|
||||
let composer = self.composer
|
||||
// Live outbox (FolderSettings), not `paths.outbox` — Settings changes take effect.
|
||||
let outboxDir = outboxURL
|
||||
let sourceDir = paths.sessionDirectory(workingSession.id)
|
||||
let fileName = PDFComposer.fileName(for: workingSession)
|
||||
let finalURL = outboxDir.appendingPathComponent(fileName)
|
||||
// Same directory as the final target so the rename below is same-volume (atomic).
|
||||
let tempURL = outboxDir.appendingPathComponent(".shotdeck-\(UUID().uuidString).pdf")
|
||||
let title = "Shotdeck – \(DubaiTime.stamp(workingSession.createdAt))"
|
||||
|
||||
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
|
||||
)
|
||||
// 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 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)."
|
||||
)
|
||||
}
|
||||
} 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.")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,98 +0,0 @@
|
||||
import AppKit
|
||||
import SwiftUI
|
||||
import ShotdeckCore
|
||||
|
||||
struct SettingsView: View {
|
||||
@Environment(AppModel.self) private var model
|
||||
|
||||
var body: some View {
|
||||
Form {
|
||||
Section("Hotkey") {
|
||||
LabeledContent("Capture", value: "⌥⇧2 — fixed in this version")
|
||||
}
|
||||
Section("Folders") {
|
||||
LabeledContent("Watch folder") {
|
||||
HStack(spacing: 8) {
|
||||
Text(model.watchFolderURL.path)
|
||||
.lineLimit(1)
|
||||
.truncationMode(.middle)
|
||||
.foregroundStyle(.secondary)
|
||||
Button("Choose…") { model.chooseWatchFolder() }
|
||||
}
|
||||
}
|
||||
LabeledContent("Output folder") {
|
||||
HStack(spacing: 8) {
|
||||
Text(model.outboxURL.path)
|
||||
.lineLimit(1)
|
||||
.truncationMode(.middle)
|
||||
.foregroundStyle(.secondary)
|
||||
Button("Choose…") { model.chooseOutboxFolder() }
|
||||
}
|
||||
}
|
||||
}
|
||||
Section {
|
||||
Button("Reveal spool folder") { model.openSpoolFolder() }
|
||||
}
|
||||
}
|
||||
.padding()
|
||||
.frame(width: 360)
|
||||
.controlSize(.small)
|
||||
}
|
||||
}
|
||||
|
||||
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 = "Shotdeck 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."
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
import AppKit
|
||||
import ShotdeckCore
|
||||
|
||||
@MainActor
|
||||
enum Sharing {
|
||||
/// Presents the AirDrop picker for `fileURL`, anchored to `view`.
|
||||
/// 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 {
|
||||
guard let service = NSSharingService(named: .sendViaAirDrop),
|
||||
service.canPerform(withItems: [fileURL]) else {
|
||||
throw ShotdeckError.airDropUnavailable
|
||||
}
|
||||
// Presenting from a detached NSView (no window) yields a sheet that never appears.
|
||||
guard let window = view.window, window.isVisible else {
|
||||
throw ShotdeckError.airDropUnavailable
|
||||
}
|
||||
|
||||
NSApp.activate()
|
||||
window.makeKeyAndOrderFront(nil)
|
||||
|
||||
service.subject = fileURL.lastPathComponent
|
||||
let session = AirDropSession(service: service, window: window, view: view)
|
||||
AirDropSession.keepAlive(session)
|
||||
service.delegate = session
|
||||
service.perform(withItems: [fileURL])
|
||||
}
|
||||
}
|
||||
|
||||
/// 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.
|
||||
@MainActor
|
||||
private final class AirDropSession: NSObject, NSSharingServiceDelegate {
|
||||
static var live: [AirDropSession] = []
|
||||
|
||||
let service: NSSharingService
|
||||
let window: NSWindow
|
||||
let view: NSView
|
||||
|
||||
init(service: NSSharingService, window: NSWindow, view: NSView) {
|
||||
self.service = service
|
||||
self.window = window
|
||||
self.view = view
|
||||
}
|
||||
|
||||
static func keepAlive(_ session: AirDropSession) {
|
||||
live.append(session)
|
||||
}
|
||||
|
||||
private func drop() {
|
||||
Self.live.removeAll { $0 === self }
|
||||
}
|
||||
|
||||
func sharingService(
|
||||
_ sharingService: NSSharingService,
|
||||
sourceWindowForShareItems items: [Any],
|
||||
sharingContentScope: UnsafeMutablePointer<NSSharingService.SharingContentScope>
|
||||
) -> NSWindow? {
|
||||
sharingContentScope.pointee = .item
|
||||
return window
|
||||
}
|
||||
|
||||
func sharingService(
|
||||
_ sharingService: NSSharingService,
|
||||
sourceFrameOnScreenForShareItem item: Any
|
||||
) -> NSRect {
|
||||
let inWindow = view.convert(view.bounds, to: nil)
|
||||
return window.convertToScreen(inWindow)
|
||||
}
|
||||
|
||||
func sharingService(_ sharingService: NSSharingService, didShareItems items: [Any]) {
|
||||
drop()
|
||||
}
|
||||
|
||||
func sharingService(
|
||||
_ sharingService: NSSharingService,
|
||||
didFailToShareItems items: [Any],
|
||||
error: any Error
|
||||
) {
|
||||
drop()
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user