Sync source edition with VCC Plus 3.7.0 build 63
This commit is contained in:
1 parent
c652a5276d
commit
b2ecec4d87
86 files changed
+10519
-472
No files matched your search
@@ -3,6 +3,7 @@ import CryptoKit
|
||||
import Foundation
|
||||
import PDFKit
|
||||
import SQLite3
|
||||
import SwiftUI
|
||||
import XCTest
|
||||
|
||||
@MainActor
|
||||
@@ -40,6 +41,33 @@ final class ArchiveReaderTests: XCTestCase {
|
||||
|
||||
private struct ReaderTimeout: Error {}
|
||||
|
||||
func testSavedPDFPageAndZoomResumeButExplicitLocationWins() async throws {
|
||||
let pdf = PDFDocument()
|
||||
for color in [NSColor.white, .gray] {
|
||||
let image = NSImage(size: NSSize(width: 240, height: 900), flipped: false) { rect in color.setFill(); rect.fill(); return true }
|
||||
pdf.insert(try XCTUnwrap(PDFPage(image: image)), at: pdf.pageCount)
|
||||
}
|
||||
let bytes = try XCTUnwrap(pdf.dataRepresentation())
|
||||
let digest = SHA256.hash(data: bytes).map { String(format: "%02x", $0) }.joined()
|
||||
let item = ArchiveDocument(id: digest, title: "Resume", collection: "Books",
|
||||
sourceURL: URL(string: "https://colorcomputerarchive.com/repo/Documents/Books/Resume.pdf")!, memberPath: nil,
|
||||
pageCount: 2, deliveryURL: URL(string: "https://vccplus.brianholman.com/dl/software/CoCoLibrary/Documents/Books/Resume.pdf")!, deliveryBytes: Int64(bytes.count))
|
||||
try bytes.write(to: directory.appendingPathComponent(digest + ".pdf"))
|
||||
let store = LibraryContinuityStore(directory: directory.appendingPathComponent("State"))
|
||||
store.setReading(LibraryReadingPosition(documentID: digest, page: 2, offset: 0.7, zoom: 1.75, autoScales: false), for: "archive:" + digest)
|
||||
let resumed = ArchiveReaderModel(remembersPage: true, cache: cache, continuity: store)
|
||||
defer { resumed.reset() }
|
||||
resumed.view.frame = NSRect(x: 0, y: 0, width: 300, height: 300)
|
||||
resumed.open(item, page: resumed.savedPage(for: digest), resumePosition: true)
|
||||
try await waitFor { resumed.progress == nil }
|
||||
XCTAssertNil(resumed.error)
|
||||
XCTAssertEqual(resumed.page, 2)
|
||||
XCTAssertEqual(resumed.view.scaleFactor, 1.75, accuracy: 0.01)
|
||||
resumed.open(item, page: 1)
|
||||
XCTAssertEqual(resumed.page, 1)
|
||||
XCTAssertTrue(resumed.view.currentPage === resumed.document?.page(at: 0))
|
||||
}
|
||||
|
||||
func testSelectingPDFPagesReusesTheVerifiedDocumentAndOpensTheCitedPage() async throws {
|
||||
let pdf = PDFDocument()
|
||||
for color in [NSColor.white, .gray] {
|
||||
@@ -75,6 +103,36 @@ final class ArchiveReaderTests: XCTestCase {
|
||||
XCTAssertTrue(model.view.currentPage === rendered.page(at: 0))
|
||||
}
|
||||
|
||||
func testExplicitSamePageDuringPDFResumeDiscardsSavedZoomAndOffset() async throws {
|
||||
let pdf = PDFDocument()
|
||||
let image = NSImage(size: NSSize(width: 240, height: 900), flipped: false) { rect in NSColor.white.setFill(); rect.fill(); return true }
|
||||
pdf.insert(try XCTUnwrap(PDFPage(image: image)), at: 0)
|
||||
let bytes = try XCTUnwrap(pdf.dataRepresentation())
|
||||
let digest = SHA256.hash(data: bytes).map { String(format: "%02x", $0) }.joined()
|
||||
let item = ArchiveDocument(id: digest, title: "Same page", collection: "Books",
|
||||
sourceURL: URL(string: "https://colorcomputerarchive.com/repo/Documents/Books/Same.pdf")!, memberPath: nil,
|
||||
pageCount: 1, deliveryURL: URL(string: "https://vccplus.brianholman.com/dl/software/CoCoLibrary/Documents/Books/Same.pdf")!, deliveryBytes: Int64(bytes.count))
|
||||
try bytes.write(to: directory.appendingPathComponent(digest + ".pdf"))
|
||||
let store = LibraryContinuityStore(directory: directory.appendingPathComponent("State"))
|
||||
store.setReading(LibraryReadingPosition(documentID: digest, page: 1, offset: 0.7, horizontalOffset: 0.6, zoom: 9, autoScales: false), for: "archive:" + digest)
|
||||
let model = ArchiveReaderModel(remembersPage: true, cache: cache, continuity: store)
|
||||
defer { model.reset() }
|
||||
model.view.frame = NSRect(x: 0, y: 0, width: 300, height: 300)
|
||||
model.open(item, page: 1, resumePosition: true)
|
||||
XCTAssertNotNil(model.progress)
|
||||
// Both calls occur before the load task gets its first execution turn:
|
||||
// same bytes and same page, but the second action is an explicit link.
|
||||
model.open(item, page: 1, resumePosition: false)
|
||||
try await waitFor { model.progress == nil }
|
||||
XCTAssertNil(model.error)
|
||||
XCTAssertEqual(model.page, 1)
|
||||
XCTAssertTrue(model.view.autoScales, "An explicit target must not inherit the pending resume's manual zoom")
|
||||
XCTAssertNotEqual(model.view.scaleFactor, 9)
|
||||
let position = try XCTUnwrap(store.reading(for: "archive:" + digest))
|
||||
XCTAssertNotEqual(position.offset, 0.7, "An explicit target must not restore the old within-page offset")
|
||||
XCTAssertNotEqual(position.horizontalOffset, 0.6)
|
||||
}
|
||||
|
||||
func testSelectingTextThenCachedImageReplacesThePreview() async throws {
|
||||
let model = ArchiveReaderModel(remembersPage: false, cache: cache)
|
||||
defer { model.reset() }
|
||||
@@ -108,6 +166,49 @@ final class ArchiveReaderTests: XCTestCase {
|
||||
XCTAssertNil(model.referenceID)
|
||||
}
|
||||
|
||||
func testExplicitTextNavigationOverridesInFlightAndVisibleResume() async throws {
|
||||
_ = NSApplication.shared
|
||||
let bytes = Data((0..<250).map { "Line \($0): Archive reading position fixture." }.joined(separator: "\n").utf8)
|
||||
let item = record("Resume.txt", format: "text", bytes: bytes)
|
||||
try bytes.write(to: directory.appendingPathComponent(item.id + ".txt"))
|
||||
let store = LibraryContinuityStore(directory: directory.appendingPathComponent("State"))
|
||||
store.setReading(LibraryReadingPosition(documentID: item.id, offset: 0.65), for: "archive:" + item.id)
|
||||
let model = ArchiveReaderModel(remembersPage: true, cache: cache, continuity: store)
|
||||
defer { model.reset() }
|
||||
model.open(item, page: 1, resumePosition: true)
|
||||
model.open(item, page: 1, resumePosition: false)
|
||||
try await waitFor { model.progress == nil }
|
||||
XCTAssertNil(model.error)
|
||||
XCTAssertEqual(model.inlinePosition?.offset, 0, "Explicit intent must replace the in-flight resume's saved inline position")
|
||||
|
||||
model.updateInlinePosition(offset: 0.65)
|
||||
let host = NSHostingView(rootView: ArchiveReaderPane(record: item, hit: nil, reader: model,
|
||||
requestedPage: 1, catalog: ArchiveLibraryCatalog(url: nil), resumesPosition: true))
|
||||
host.frame = NSRect(x: 0, y: 0, width: 700, height: 500)
|
||||
func textView(_ root: NSView) -> NSTextView? {
|
||||
if let text = root as? NSTextView, text.accessibilityIdentifier() == "archive-inline-text" { return text }
|
||||
return root.subviews.lazy.compactMap { textView($0) }.first
|
||||
}
|
||||
host.layoutSubtreeIfNeeded()
|
||||
try await waitFor {
|
||||
host.layoutSubtreeIfNeeded()
|
||||
return textView(host)?.enclosingScrollView?.contentView.bounds.minY ?? 0 > 100
|
||||
}
|
||||
let resumedText = try XCTUnwrap(textView(host))
|
||||
let revision = model.inlineNavigationRevision
|
||||
model.open(item, page: 1, resumePosition: true)
|
||||
XCTAssertEqual(model.inlineNavigationRevision, revision)
|
||||
XCTAssertGreaterThan(resumedText.enclosingScrollView?.contentView.bounds.minY ?? 0, 100)
|
||||
model.open(item, page: 1, resumePosition: false)
|
||||
try await waitFor {
|
||||
host.layoutSubtreeIfNeeded()
|
||||
guard let current = textView(host), current !== resumedText else { return false }
|
||||
return (current.enclosingScrollView?.contentView.bounds.minY ?? 1) == 0
|
||||
}
|
||||
XCTAssertEqual(model.inlinePosition?.offset, 0)
|
||||
withExtendedLifetime(host) {}
|
||||
}
|
||||
|
||||
func testTextReaderPreservesLegacyEncodingsAndRemovesFloppyPadding() throws {
|
||||
let url = directory.appendingPathComponent("Letter.txt")
|
||||
let accented = "Café\n£5"
|
||||
|
||||
Reference in new issue
Block a user