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
@@ -38,11 +38,26 @@ final class ArchiveLibraryQuery: ObservableObject {
|
||||
init(_ text: String = "") { self.text = text }
|
||||
}
|
||||
|
||||
private struct ArchiveVisibleRows: PreferenceKey {
|
||||
static let defaultValue: [String: CGFloat] = [:]
|
||||
static func reduce(value: inout [String: CGFloat], nextValue: () -> [String: CGFloat]) { value.merge(nextValue(), uniquingKeysWith: { _, last in last }) }
|
||||
}
|
||||
|
||||
struct ArchiveLibraryView: View {
|
||||
@AppStorage("archive-library.collection") private var collection = ""
|
||||
@AppStorage("archive-library.browse-selection") private var browseID: String?
|
||||
@AppStorage("archive-library.browse-offset") private var browseOffset = 0
|
||||
@AppStorage("archive-library.scope") private var localScope = false
|
||||
@State private var collection = ""
|
||||
@State private var browseID: String?
|
||||
@State private var browseOffset = 0
|
||||
@State private var localScope = false
|
||||
@ObservedObject private var navigation = ArchiveLibraryNavigation.shared
|
||||
private let continuity: LibraryContinuityStore
|
||||
@State private var browseTopID: String?
|
||||
@State private var searchTopID: String?
|
||||
@State private var restoreBrowseTop: String?
|
||||
@State private var restoreSearchTop: String?
|
||||
@State private var restoringSearchSelection = false
|
||||
@State private var navigationDocument: ArchiveDocument?
|
||||
@State private var navigationPage: Int?
|
||||
@State private var navigationError: String?
|
||||
@State private var collections: [ArchiveCollection] = []
|
||||
@State private var documents: [ArchiveDocument] = []
|
||||
@State private var hits: [ArchiveHit] = []
|
||||
@@ -66,20 +81,49 @@ struct ArchiveLibraryView: View {
|
||||
private let batch = 35
|
||||
private let catalog: ArchiveLibraryCatalog
|
||||
|
||||
init(catalog: ArchiveLibraryCatalog = .shared, query: ArchiveLibraryQuery? = nil, searchReader: ArchiveReaderModel? = nil) {
|
||||
self.catalog = catalog
|
||||
_browseReader = StateObject(wrappedValue: ArchiveReaderModel(remembersPage: true, catalog: catalog))
|
||||
_archiveQuery = StateObject(wrappedValue: query ?? ArchiveLibraryQuery())
|
||||
_searchReader = StateObject(wrappedValue: searchReader ?? ArchiveReaderModel(remembersPage: false, catalog: catalog))
|
||||
init(catalog: ArchiveLibraryCatalog = .shared, query: ArchiveLibraryQuery? = nil, searchReader: ArchiveReaderModel? = nil,
|
||||
continuity suppliedContinuity: LibraryContinuityStore? = nil) {
|
||||
let continuity = suppliedContinuity ?? .shared
|
||||
self.catalog = catalog; self.continuity = continuity
|
||||
let saved = continuity.browse(for: "archive-main")
|
||||
let defaults = UserDefaults.standard
|
||||
_collection = State(initialValue: saved?.scope ?? defaults.string(forKey: "archive-library.collection") ?? "")
|
||||
_browseID = State(initialValue: saved?.filters["browseID"] ?? defaults.string(forKey: "archive-library.browse-selection"))
|
||||
_browseOffset = State(initialValue: saved?.pageOffset ?? max(0, defaults.integer(forKey: "archive-library.browse-offset")))
|
||||
_localScope = State(initialValue: saved?.filters["localScope"].map { $0 == "true" } ?? defaults.bool(forKey: "archive-library.scope"))
|
||||
_searchID = State(initialValue: saved?.filters["searchID"])
|
||||
_searchOffset = State(initialValue: Int(saved?.filters["searchOffset"] ?? "0") ?? 0)
|
||||
_searchFolder = State(initialValue: saved?.filters["searchFolder"])
|
||||
_searchBrowseCollection = State(initialValue: saved?.filters["searchBrowseCollection"])
|
||||
_browseTopID = State(initialValue: saved?.filters["browseTop"])
|
||||
_searchTopID = State(initialValue: saved?.filters["searchTop"])
|
||||
_restoreBrowseTop = State(initialValue: saved?.filters["browseTop"])
|
||||
_restoreSearchTop = State(initialValue: saved?.filters["searchTop"])
|
||||
_restoringSearchSelection = State(initialValue: saved?.filters["searchID"] != nil)
|
||||
_browseReader = StateObject(wrappedValue: ArchiveReaderModel(remembersPage: true, catalog: catalog, continuity: continuity))
|
||||
_archiveQuery = StateObject(wrappedValue: query ?? ArchiveLibraryQuery(saved?.query ?? ""))
|
||||
_searchReader = StateObject(wrappedValue: searchReader ?? ArchiveReaderModel(remembersPage: true, catalog: catalog, continuity: continuity))
|
||||
}
|
||||
|
||||
private var query: String { archiveQuery.text }
|
||||
private var searching: Bool { !query.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty }
|
||||
private var browseDocument: ArchiveDocument? { documents.first { $0.id == browseID } }
|
||||
private var browseDocument: ArchiveDocument? { navigationDocument.flatMap { $0.id == browseID ? $0 : nil } ?? documents.first { $0.id == browseID } }
|
||||
private var hit: ArchiveHit? { hits.first { $0.id == searchID } }
|
||||
private var selected: ArchiveDocument? { searching ? hit?.document : browseDocument }
|
||||
private var reader: ArchiveReaderModel { searching ? searchReader : browseReader }
|
||||
private var requestedPage: Int { searching ? (hit?.locationNumber ?? 1) : browseID.map(ArchiveReaderModel.savedPage) ?? 1 }
|
||||
private var requestedPage: Int {
|
||||
if searching { return restoringSearchSelection ? hit.map { searchReader.savedPage(for: $0.document.id) } ?? 1 : hit?.locationNumber ?? 1 }
|
||||
return navigationPage ?? browseID.map { browseReader.savedPage(for: $0) } ?? 1
|
||||
}
|
||||
private var browseState: LibraryBrowseState {
|
||||
var state = LibraryBrowseState()
|
||||
state.scope = collection; state.query = query; state.selectedID = searching ? searchID : browseID; state.pageOffset = browseOffset
|
||||
state.filters = ["localScope": String(localScope), "searchOffset": String(searchOffset)]
|
||||
for (key,value) in [("browseID",browseID),("searchID",searchID),("searchFolder",searchFolder),("searchBrowseCollection",searchBrowseCollection),("browseTop",browseTopID),("searchTop",searchTopID)] {
|
||||
if let value { state.filters[key] = value }
|
||||
}
|
||||
return state
|
||||
}
|
||||
private var sidebarPath: String { searching ? (searchFolder ?? collection) : collection }
|
||||
private var scopePath: String? {
|
||||
if searching, let searchFolder, !searchFolder.isEmpty { return searchFolder }
|
||||
@@ -106,29 +150,51 @@ struct ArchiveLibraryView: View {
|
||||
}
|
||||
.frame(minWidth: 430, minHeight: 320)
|
||||
.task(id: retry) {
|
||||
do { let paths = try await catalog.collections(); try Task.checkCancellation(); collections = ArchiveCollection.tree(paths) }
|
||||
do {
|
||||
let paths = try await catalog.collections(); try Task.checkCancellation()
|
||||
collections = ArchiveCollection.tree(paths)
|
||||
let valid = Set(paths.flatMap { path -> [String] in
|
||||
let parts = path.split(separator: "/")
|
||||
guard !parts.isEmpty else { return [] }
|
||||
return (1...parts.count).map { parts.prefix($0).joined(separator: "/") }
|
||||
})
|
||||
if !collection.isEmpty, !valid.contains(collection) {
|
||||
collection = ""; browseID = nil; browseOffset = 0
|
||||
}
|
||||
}
|
||||
catch { if !Task.isCancelled { browseError = error.localizedDescription } }
|
||||
}
|
||||
.task(id: ArchiveBrowseRequest(collection: collection, offset: browseOffset, retry: retry)) { await loadBrowse() }
|
||||
.task(id: key) { await loadSearch(key) }
|
||||
.task(id: navigation.request?.id) { if let request = navigation.request { await openRequested(request) } }
|
||||
.onChange(of: browseState) { _, value in continuity.setBrowse(value, for: "archive-main") }
|
||||
.onChange(of: query) { old, new in
|
||||
navigationError = nil
|
||||
if old.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty && !new.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
|
||||
searchBrowseCollection = browseDocument?.collection
|
||||
if browseReader.progress != nil { browseReader.stop() }
|
||||
}
|
||||
restoringSearchSelection = false; restoreSearchTop = nil
|
||||
searchID = nil; searchOffset = 0; compactReader = false; searchReader.reset()
|
||||
if !searching { searchBrowseCollection = nil; searchFolder = nil }
|
||||
}
|
||||
.onChange(of: localScope) { _, _ in searchOffset = 0; searchID = nil; compactReader = false; searchReader.reset() }
|
||||
.onChange(of: browseID) { _, id in
|
||||
navigationError = nil
|
||||
if id != navigationDocument?.id { navigationDocument = nil; navigationPage = nil }
|
||||
if id == nil { browseReader.reset() }
|
||||
else if !searching { compactReader = true }
|
||||
}
|
||||
.onChange(of: searchID) { _, id in
|
||||
navigationError = nil
|
||||
// Initial restoration sets State before observation starts. A later
|
||||
// selection change (including keyboard arrows) is an explicit hit.
|
||||
if id != nil { restoringSearchSelection = false }
|
||||
if id == nil { searchReader.reset() }
|
||||
else if searching { compactReader = true }
|
||||
}
|
||||
.onDisappear { browseReader.stop(); searchReader.stop() }
|
||||
.onDisappear { continuity.setBrowse(browseState, for: "archive-main"); continuity.checkpoint(); browseReader.stop(); searchReader.stop() }
|
||||
.onReceive(NotificationCenter.default.publisher(for: NSApplication.willTerminateNotification)) { _ in continuity.setBrowse(browseState, for: "archive-main"); continuity.checkpoint() }
|
||||
}
|
||||
|
||||
private func header(narrow: Bool, sidebar side: Bool) -> some View {
|
||||
@@ -176,7 +242,7 @@ struct ArchiveLibraryView: View {
|
||||
}
|
||||
|
||||
private func chooseCollection(_ path: String) {
|
||||
showCollections = false
|
||||
showCollections = false; navigationError = nil; navigationDocument = nil; navigationPage = nil; restoreBrowseTop = nil; restoreSearchTop = nil
|
||||
if searching {
|
||||
if path != sidebarPath { searchID = nil; searchReader.reset() }
|
||||
searchFolder = path; searchOffset = 0; localScope = !path.isEmpty; compactReader = false
|
||||
@@ -215,17 +281,25 @@ struct ArchiveLibraryView: View {
|
||||
}
|
||||
|
||||
private var browseList: some View {
|
||||
ScrollViewReader { proxy in
|
||||
List(selection: $browseID) {
|
||||
ForEach(documents) { doc in
|
||||
VStack(alignment: .leading, spacing: 3) {
|
||||
Text(doc.title).lineLimit(2)
|
||||
Text(doc.collection.replacingOccurrences(of: "/", with: " › ")).font(.caption).foregroundStyle(.secondary).lineLimit(1)
|
||||
}.padding(.vertical, 2).frame(maxWidth: .infinity, alignment: .leading).contentShape(Rectangle()).tag(doc.id)
|
||||
}.padding(.vertical, 2).frame(maxWidth: .infinity, alignment: .leading).contentShape(Rectangle()).tag(doc.id).id(doc.id)
|
||||
.background(GeometryReader { value in Color.clear.preference(key: ArchiveVisibleRows.self, value: [doc.id: value.frame(in: .named("archive-browse")).minY]) })
|
||||
.simultaneousGesture(TapGesture().onEnded { browseID = doc.id; compactReader = true })
|
||||
}
|
||||
}.accessibilityLabel("Browse Archive documents").accessibilityIdentifier("archive-browse-list")
|
||||
}.coordinateSpace(name: "archive-browse")
|
||||
.onPreferenceChange(ArchiveVisibleRows.self) { rows in if !searching { browseTopID = topRow(rows) } }
|
||||
.onChange(of: documents.map(\.id)) { _, ids in
|
||||
if let target = restoreBrowseTop, ids.contains(target) { proxy.scrollTo(target, anchor: .top); restoreBrowseTop = nil }
|
||||
}
|
||||
.accessibilityLabel("Browse Archive documents").accessibilityIdentifier("archive-browse-list")
|
||||
.onKeyPress(.return, action: readSelectedWithKeyboard)
|
||||
.overlay { if documents.isEmpty, !browseBusy { ContentUnavailableView("No documents in this collection", systemImage: "books.vertical") } }
|
||||
}
|
||||
}
|
||||
|
||||
private var groups: [ArchiveResultGroup] {
|
||||
@@ -237,27 +311,64 @@ struct ArchiveLibraryView: View {
|
||||
return ordered
|
||||
}
|
||||
private var resultsList: some View {
|
||||
ScrollViewReader { proxy in
|
||||
List(selection: $searchID) {
|
||||
ForEach(groups) { group in
|
||||
Section {
|
||||
ForEach(group.hits) { result in
|
||||
HStack { Text(result.locator); if result.ocr { Text("OCR").font(.caption).foregroundStyle(.secondary) } }
|
||||
.frame(maxWidth: .infinity, alignment: .leading).contentShape(Rectangle()).tag(result.id)
|
||||
.simultaneousGesture(TapGesture().onEnded { searchID = result.id; compactReader = true })
|
||||
.frame(maxWidth: .infinity, alignment: .leading).contentShape(Rectangle()).tag(result.id).id(result.id)
|
||||
.background(GeometryReader { value in Color.clear.preference(key: ArchiveVisibleRows.self, value: [result.id: value.frame(in: .named("archive-search")).minY]) })
|
||||
.simultaneousGesture(TapGesture().onEnded { restoringSearchSelection = false; restoreSearchTop = nil; searchID = result.id; compactReader = true })
|
||||
}
|
||||
} header: { Text(group.document.title).lineLimit(3).textCase(nil) }
|
||||
}
|
||||
}.accessibilityLabel("Matching Archive pages").accessibilityIdentifier("archive-results-list")
|
||||
}.coordinateSpace(name: "archive-search")
|
||||
.onPreferenceChange(ArchiveVisibleRows.self) { rows in if searching { searchTopID = topRow(rows) } }
|
||||
.onChange(of: hits.map(\.id)) { _, ids in
|
||||
if let target = restoreSearchTop, ids.contains(target) { proxy.scrollTo(target, anchor: .top); restoreSearchTop = nil }
|
||||
}
|
||||
.accessibilityLabel("Matching Archive pages").accessibilityIdentifier("archive-results-list")
|
||||
.onKeyPress(.return, action: readSelectedWithKeyboard)
|
||||
.overlay { if hits.isEmpty, !searchBusy { ContentUnavailableView("No matching pages", systemImage: "magnifyingglass") } }
|
||||
}
|
||||
}
|
||||
private func topRow(_ positions: [String: CGFloat]) -> String? {
|
||||
positions.filter { $0.value <= 0 }.max(by: { $0.value < $1.value })?.key ?? positions.min(by: { $0.value < $1.value })?.key
|
||||
}
|
||||
|
||||
@ViewBuilder private var detail: some View {
|
||||
if let selected {
|
||||
ArchiveReaderPane(record: selected, hit: searching ? hit : nil, reader: reader, requestedPage: requestedPage, catalog: catalog)
|
||||
if let navigationError {
|
||||
ContentUnavailableView("Reference unavailable", systemImage: "book.closed", description: Text(navigationError))
|
||||
} else if let selected {
|
||||
ArchiveReaderPane(record: selected, hit: searching ? hit : nil, reader: reader, requestedPage: requestedPage, catalog: catalog, resumesPosition: searching ? restoringSearchSelection : navigationPage == nil)
|
||||
} else { ContentUnavailableView("Choose a document", systemImage: "book.pages", description: Text("Browse a collection or search the Archive.")) }
|
||||
}
|
||||
private func openRequested(_ request: ArchiveLibraryOpenRequest) async {
|
||||
do {
|
||||
guard let record = try await catalog.document(id: request.documentID),
|
||||
request.expectedSHA256 == nil || request.expectedSHA256 == record.id,
|
||||
request.location.map({ $0 > 0 && $0 <= (record.pageCount ?? 1_000_000) }) != false else {
|
||||
throw ArchiveLibraryError.input("This reference no longer matches the installed Archive index. The software selection has not changed.")
|
||||
}
|
||||
guard let offset = try await catalog.browseOffset(documentID: record.id, collection: record.collection, batchSize: batch) else {
|
||||
throw ArchiveLibraryError.input("The reference could not be located in the installed Archive collection.")
|
||||
}
|
||||
try Task.checkCancellation()
|
||||
guard navigation.request?.id == request.id else { return }
|
||||
navigationError = nil; archiveQuery.text = ""; collection = record.collection; browseOffset = offset
|
||||
navigationDocument = record; navigationPage = request.location; browseID = record.id
|
||||
restoreBrowseTop = record.id; compactReader = true
|
||||
browseReader.open(record, page: request.location ?? browseReader.savedPage(for: record.id), resumePosition: request.location == nil)
|
||||
navigation.consumed(request.id)
|
||||
} catch {
|
||||
guard !Task.isCancelled, navigation.request?.id == request.id else { return }
|
||||
navigationError = error.localizedDescription; compactReader = true; navigation.consumed(request.id)
|
||||
}
|
||||
}
|
||||
private func moveBatch(_ direction: Int) {
|
||||
navigationError = nil; navigationDocument = nil; navigationPage = nil; restoringSearchSelection = false
|
||||
restoreBrowseTop = nil; restoreSearchTop = nil
|
||||
if searching { searchOffset = max(0, searchOffset + direction * batch); searchID = nil }
|
||||
else { browseOffset = max(0, browseOffset + direction * batch); browseID = nil }
|
||||
}
|
||||
@@ -274,6 +385,7 @@ struct ArchiveLibraryView: View {
|
||||
let rows = try await catalog.browse(collection: collection.isEmpty ? nil : collection, limit: batch + 1, offset: browseOffset)
|
||||
try Task.checkCancellation()
|
||||
guard request == ArchiveBrowseRequest(collection: collection, offset: browseOffset, retry: retry) else { return }
|
||||
if rows.isEmpty, browseOffset > 0 { browseOffset = 0; browseID = nil; browseBusy = false; return }
|
||||
documents = Array(rows.prefix(batch)); browseMore = rows.count > batch
|
||||
if !documents.contains(where: { $0.id == browseID }) { browseID = nil }
|
||||
browseBusy = false
|
||||
|
||||
Reference in new issue
Block a user