Sync source edition with VCC Plus 3.7.0 build 63

This commit is contained in:
Brian Holman committed 2026-11-14 01:43:46 -07:00
1 parent c652a5276d
commit b2ecec4d87
86 files changed
+10519 -472

No files matched your search

+97 -16
View File
@@ -313,6 +313,7 @@ final class ArchiveReaderModel: ObservableObject {
@Published private(set) var progress: ArchiveReadProgress?
@Published private(set) var error: String?
@Published private(set) var page = 1
@Published private(set) var inlineNavigationRevision = 0
@Published var find = "" { didSet { if find != oldValue { resetFind() } } }
@Published private(set) var findMessage: String?
@Published private(set) var isFinding = false
@@ -323,12 +324,17 @@ final class ArchiveReaderModel: ObservableObject {
private var localURL: URL?
private var lastMatch: (page: Int, range: NSRange)?
private var pendingPage = 1
private var resumePending = false
private var lastCheckpoint = Date.distantPast
private var tracking: [NSObjectProtocol] = []
private let continuity: LibraryContinuityStore?
let remembersPage: Bool
private let cache: ArchiveAssetCache
private let catalog: ArchiveLibraryCatalog
init(remembersPage: Bool, cache: ArchiveAssetCache = .shared, catalog: ArchiveLibraryCatalog = .shared) {
init(remembersPage: Bool, cache: ArchiveAssetCache = .shared, catalog: ArchiveLibraryCatalog = .shared, continuity: LibraryContinuityStore? = nil) {
self.remembersPage = remembersPage
self.continuity = remembersPage ? (continuity ?? .shared) : nil
self.cache = cache
self.catalog = catalog
view.displayMode = .singlePageContinuous
@@ -336,7 +342,9 @@ final class ArchiveReaderModel: ObservableObject {
view.displaysPageBreaks = true
view.setAccessibilityLabel("Archive PDF")
}
deinit { for token in tracking { NotificationCenter.default.removeObserver(token) } }
func stop() {
rememberPage(force: true)
requestID = UUID(); request?.cancel(); request = nil; progress = nil
resetFind()
}
@@ -350,12 +358,55 @@ final class ArchiveReaderModel: ObservableObject {
cancelled = true
}
func retry(_ record: ArchiveDocument) {
open(record, page: pendingPage)
open(record, page: pendingPage, resumePosition: resumePending)
}
private func rememberPage() {
if remembersPage, let referenceID { UserDefaults.standard.set(page, forKey: "archive-library.page." + referenceID) }
private func rememberPage(force: Bool = false) {
guard let continuity, let referenceID, document != nil || preview != nil,
force || Date().timeIntervalSince(lastCheckpoint) >= 1 else { return }
lastCheckpoint = Date()
var position = continuity.reading(for: "archive:" + referenceID) ?? LibraryReadingPosition(documentID: referenceID)
position.page = page
if let document, let destination = view.currentDestination, let destinationPage = destination.page {
let bounds = destinationPage.bounds(for: view.displayBox)
let index = document.index(for: destinationPage)
if index >= 0, index < document.pageCount { position.page = index + 1 }
if bounds.height > 0 { position.offset = min(1,max(0,(destination.point.y-bounds.minY)/bounds.height)) }
if bounds.width > 0 { position.horizontalOffset = min(1,max(0,(destination.point.x-bounds.minX)/bounds.width)) }
position.zoom = view.scaleFactor; position.autoScales = view.autoScales
}
continuity.setReading(position, for: "archive:" + referenceID)
}
static func savedPage(for id: String) -> Int {
LibraryContinuityStore.shared.reading(for: "archive:" + id)?.page ?? max(UserDefaults.standard.integer(forKey: "archive-library.page." + id), 1)
}
func savedPage(for id: String) -> Int {
continuity?.reading(for: "archive:" + id)?.page ?? max(UserDefaults.standard.integer(forKey: "archive-library.page." + id), 1)
}
var inlinePosition: LibraryReadingPosition? {
guard let referenceID, let value = continuity?.reading(for: "archive:" + referenceID), value.page == page else { return nil }
return value
}
func updateInlinePosition(offset: Double, horizontal: Double = 0, zoom: Double? = nil) {
guard let continuity, let referenceID else { return }
var position = LibraryReadingPosition(documentID: referenceID, page: page, offset: min(1,max(0,offset)), horizontalOffset: min(1,max(0,horizontal)), zoom: zoom)
position.autoScales = nil
continuity.setReading(position, for: "archive:" + referenceID)
}
private func trackPDFPosition() {
for token in tracking { NotificationCenter.default.removeObserver(token) }
tracking = []
for name in [Notification.Name.PDFViewPageChanged, .PDFViewScaleChanged] {
tracking.append(NotificationCenter.default.addObserver(forName: name, object: view, queue: .main) { [weak self] _ in
Task { @MainActor [weak self] in self?.updatePage() }
})
}
if let clip = view.documentView?.enclosingScrollView?.contentView {
clip.postsBoundsChangedNotifications = true
tracking.append(NotificationCenter.default.addObserver(forName: NSView.boundsDidChangeNotification, object: clip, queue: .main) { [weak self] _ in
Task { @MainActor [weak self] in self?.rememberPage() }
})
}
}
static func savedPage(for id: String) -> Int { max(UserDefaults.standard.integer(forKey: "archive-library.page." + id), 1) }
func updatePage() {
guard let document, let current = view.currentPage, current.document === document else { return }
let index = document.index(for: current)
@@ -367,18 +418,32 @@ final class ArchiveReaderModel: ObservableObject {
guard let document, number > 0, number <= document.pageCount, let target = document.page(at: number - 1) else { return }
view.go(to: target); updatePage()
}
func open(_ record: ArchiveDocument, page number: Int) {
func open(_ record: ArchiveDocument, page requestedNumber: Int, resumePosition: Bool = false) {
let number = resumePosition ? min(max(requestedNumber,1),record.pageCount ?? max(requestedNumber,1)) : requestedNumber
if referenceID == record.id {
if document != nil { go(to: number); return }
if preview != nil && page == number { return }
if document != nil {
if !resumePosition || page != number { go(to: number) }
return
}
if preview != nil && page == number {
if !resumePosition {
continuity?.setReading(LibraryReadingPosition(documentID: record.id, page: number), for: "archive:" + record.id)
// A deliberate same-section citation starts at that section,
// rather than keeping an already visible image/text viewport.
inlineNavigationRevision += 1
}
return
}
if progress != nil && (record.format == "pdf" || number == pendingPage) {
pendingPage = number
resumePending = resumePosition
return
}
}
reset()
referenceID = record.id
pendingPage = number
pendingPage = number; resumePending = resumePosition
let saved = resumePosition ? continuity?.reading(for: "archive:" + record.id) : nil
let identity = requestID
progress = .checking
request = Task {
@@ -396,13 +461,22 @@ final class ArchiveReaderModel: ObservableObject {
if record.format == "pdf" {
let parsed = await Task.detached(priority: .userInitiated) { PDFDocument(url: url) }.value
try Task.checkCancellation()
let target = pendingPage
guard let parsed, !parsed.isLocked, target > 0, target <= parsed.pageCount else { throw ArchiveReaderError.page }
guard let parsed, !parsed.isLocked, parsed.pageCount > 0 else { throw ArchiveReaderError.page }
let target = resumePending ? min(max(pendingPage,1),parsed.pageCount) : pendingPage
guard target > 0, target <= parsed.pageCount else { throw ArchiveReaderError.page }
localURL = url; document = parsed; view.document = parsed; view.autoScales = true; go(to: target)
if resumePending, let saved, saved.page == target, let page = parsed.page(at: target-1) {
if saved.autoScales == false, let zoom = saved.zoom { view.autoScales = false; view.scaleFactor = CGFloat(zoom) }
let bounds = page.bounds(for: view.displayBox)
view.go(to: PDFDestination(page: page, at: NSPoint(x: bounds.minX + saved.horizontalOffset*bounds.width, y: bounds.minY + saved.offset*bounds.height)))
}
trackPDFPosition(); rememberPage(force: true)
} else {
let content = try await ArchivePreviewDecoder.shared.read(url, format: record.format, number: number)
try Task.checkCancellation()
page = number; preview = content; rememberPage()
page = number; preview = content
if !resumePending { continuity?.setReading(LibraryReadingPosition(documentID: record.id, page: number), for: "archive:" + record.id) }
rememberPage(force: true)
}
default:
guard let section = try await catalog.readerSection(documentID: record.id, number: number) else {
@@ -411,7 +485,8 @@ final class ArchiveReaderModel: ObservableObject {
try Task.checkCancellation()
page = section.number; sectionLabel = section.label
preview = record.format == "office-xls" ? .worksheet(section.text) : .text(section.text)
rememberPage()
if !resumePending { continuity?.setReading(LibraryReadingPosition(documentID: record.id, page: page), for: "archive:" + record.id) }
rememberPage(force: true)
}
progress = nil
} catch {
@@ -469,6 +544,7 @@ struct ArchiveReaderPane: View {
@ObservedObject var reader: ArchiveReaderModel
let requestedPage: Int
let catalog: ArchiveLibraryCatalog
var resumesPosition = false
@Environment(\.openWindow) private var openWindow
@State private var examples: [ArchiveExample] = []
@State private var exampleError: String?
@@ -551,8 +627,13 @@ struct ArchiveReaderPane: View {
Spacer(minLength: 0)
}.padding(8)
}
ArchiveInlinePreview(content: preview, title: record.title)
.id(record.id + "/" + String(reader.page))
let revision = reader.inlineNavigationRevision
ArchiveInlinePreview(content: preview, title: record.title, position: reader.inlinePosition,
onPositionChange: { y,x,zoom in
guard reader.inlineNavigationRevision == revision else { return }
reader.updateInlinePosition(offset: y, horizontal: x, zoom: zoom)
})
.id(record.id + "/" + String(reader.page) + "/" + String(revision))
} else {
VStack(spacing: 12) {
if isCurrent, let progress = reader.progress {
@@ -586,7 +667,7 @@ struct ArchiveReaderPane: View {
.onChange(of: reader.page, initial: true) { _, value in pageField = String(value) }
.task(id: hit?.id ?? record.id) {
guard !Task.isCancelled else { return }
reader.open(record, page: requestedPage)
reader.open(record, page: requestedPage, resumePosition: resumesPosition)
}
.task(id: exampleKey) {
examples = []; loadedExampleKey = nil; exampleError = nil; copies = nil