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
@@ -18,8 +18,19 @@ final class CompanionLibraryAuthority {
|
||||
try Task.checkCancellation()
|
||||
try await Task.sleep(nanoseconds: 50_000_000)
|
||||
}
|
||||
guard let catalog = model.catalog else { throw failure(model.error ?? "VCC Plus's Software Library is unavailable.") }
|
||||
let disks = catalog.companionDisks(includingOwnedTitles: request.ownedTitlesVersion == 1)
|
||||
guard model.catalog != nil || !model.personalEntries.isEmpty else { throw failure(model.error ?? "VCC Plus's Software Library is unavailable.") }
|
||||
let available = model.combinedCatalog.companionDisks(includingOwnedTitles: request.ownedTitlesVersion == 1,
|
||||
includingPersonalTitles: request.personalTitlesVersion == 1)
|
||||
let privateDisks = Set(model.personalEntries.filter { entry in
|
||||
entry.files.contains { $0.kind == "disk" && Self.diskMember($0.path) }
|
||||
}.map(\.releaseID))
|
||||
// The emulator accepts additional disk containers that this real-CoCo
|
||||
// handoff cannot offer. Keep those entries in VCC Plus's own library.
|
||||
let disks = SoftwareLibraryCatalog(titles: available.titles.compactMap { title in
|
||||
let releases = title.releases.filter { !$0.isPersonal || privateDisks.contains($0.id) }
|
||||
return releases.isEmpty ? nil : .init(id: title.id, name: title.name,
|
||||
identityStatus: title.identityStatus, releases: releases)
|
||||
}, metadata: available.metadata)
|
||||
func release() throws -> SoftwareLibraryRelease {
|
||||
guard let id = request.releaseID, let value = disks.releases.first(where: { $0.id == id }) else {
|
||||
throw failure("Choose a disk edition from VCC Plus's catalog.")
|
||||
@@ -45,6 +56,7 @@ final class CompanionLibraryAuthority {
|
||||
return .init(snapshot: snapshot(disks))
|
||||
case .install:
|
||||
let selected = try release()
|
||||
if selected.isPersonal { return try await installStatus(selected, catalog: disks) }
|
||||
guard model.installingReleaseID == nil || model.installingReleaseID == selected.id else {
|
||||
throw failure("VCC Plus is already installing another title. Let it finish or cancel it there.")
|
||||
}
|
||||
@@ -59,6 +71,7 @@ final class CompanionLibraryAuthority {
|
||||
return .init(snapshot: snapshot(disks), isInstalling: model.installingReleaseID == selected.id)
|
||||
case .removeInstallation:
|
||||
let selected = try release()
|
||||
guard !selected.isPersonal else { throw failure("Manage or remove this private entry in VCC Plus's Personal Library. DriveWire disk copies are separate from its retained files.") }
|
||||
await model.removeInstallation(selected.id)
|
||||
if let message = model.installationErrors[selected.id] { throw failure(message) }
|
||||
return .init(snapshot: snapshot(disks))
|
||||
@@ -89,6 +102,13 @@ final class CompanionLibraryAuthority {
|
||||
return .init(assetData: data)
|
||||
}
|
||||
guard asset.isManual else { throw failure("Choose a manual or instructions asset.") }
|
||||
if asset.matchStatus == "personal", let local = asset.manualURL, local.isFileURL {
|
||||
try await Task.detached(priority: .userInitiated) {
|
||||
try SoftwareLibraryLocalAsset.validate(asset, url: local,
|
||||
maximumBytes: local.pathExtension.lowercased() == "txt" ? 1024 * 1024 : 512 * 1024 * 1024)
|
||||
}.value
|
||||
return .init(assetFileURL: local)
|
||||
}
|
||||
let local = try await SoftwareLibraryManualCache.shared.localCopy(for: asset,
|
||||
directory: model.state.directory.appendingPathComponent("Manuals", isDirectory: true))
|
||||
return .init(assetFileURL: local)
|
||||
@@ -98,12 +118,29 @@ final class CompanionLibraryAuthority {
|
||||
private func failure(_ message: String) -> CompanionLibraryFailure { .init(message: message) }
|
||||
private func snapshot(_ catalog: SoftwareLibraryCatalog) -> CompanionLibrarySnapshot {
|
||||
let titleIDs = Set(catalog.titles.map(\.id)), releaseIDs = Set(catalog.releases.map(\.id))
|
||||
let personal = model.personalEntries.filter { releaseIDs.contains($0.releaseID) }.map {
|
||||
$0.receipt(in: model.personalDirectory($0))
|
||||
}.map { SoftwareLibraryState.Installation(releaseID: $0.releaseID, packageSHA256: $0.packageSHA256,
|
||||
installedAt: $0.installedAt, workingDirectory: $0.workingDirectory) }
|
||||
return .init(catalog: catalog,
|
||||
favorites: model.state.favoriteTitleIDs.intersection(titleIDs),
|
||||
preferredReleaseIDs: model.state.preferredReleaseIDs.filter { titleIDs.contains($0.key) && releaseIDs.contains($0.value) },
|
||||
installations: model.state.installedReleases.values.filter { releaseIDs.contains($0.releaseID) })
|
||||
installations: model.state.installedReleases.values.filter { releaseIDs.contains($0.releaseID) && !$0.releaseID.hasPrefix("personal:") } + personal)
|
||||
}
|
||||
private func installedReceipt(_ release: SoftwareLibraryRelease) async throws -> SoftwareLibraryInstallationReceipt {
|
||||
if release.isPersonal {
|
||||
// Reload the store to reject entries hidden since the catalog snapshot.
|
||||
let entries = try await model.personalStore.entries()
|
||||
guard let entry = entries.first(where: {
|
||||
$0.releaseID == release.id && $0.packageSHA256 == release.packageSHA256
|
||||
}) else { throw failure("This private disk entry is no longer available. Open Personal Library in VCC Plus.") }
|
||||
let directory = model.personalDirectory(entry)
|
||||
for location in [directory.deletingLastPathComponent(), directory, directory.appendingPathComponent("Working")] {
|
||||
let values = try location.resourceValues(forKeys: [.isDirectoryKey, .isSymbolicLinkKey])
|
||||
guard values.isDirectory == true, values.isSymbolicLink != true else { throw failure("The private disk location is not a safe directory. Its retained files were preserved.") }
|
||||
}
|
||||
return entry.receipt(in: directory)
|
||||
}
|
||||
let receipts = try await model.installer.recoverInstallations()
|
||||
guard let receipt = receipts.first(where: { $0.releaseID == release.id && $0.packageSHA256 == release.packageSHA256 }) else {
|
||||
throw failure("Install this disk edition in VCC Plus first.")
|
||||
@@ -111,6 +148,10 @@ final class CompanionLibraryAuthority {
|
||||
return receipt
|
||||
}
|
||||
private func installStatus(_ release: SoftwareLibraryRelease, catalog: SoftwareLibraryCatalog) async throws -> CompanionLibraryResponse {
|
||||
if release.isPersonal {
|
||||
let receipt = try await installedReceipt(release)
|
||||
return .init(snapshot: snapshot(catalog), receipt: receipt, isInstalling: false)
|
||||
}
|
||||
if let message = model.installationErrors[release.id] { throw failure(message) }
|
||||
let active = model.installingReleaseID == release.id
|
||||
return .init(snapshot: snapshot(catalog), progress: active ? model.installProgress : nil,
|
||||
@@ -127,16 +168,19 @@ final class CompanionLibraryAuthority {
|
||||
nonisolated private static func exportDisk(receipt: SoftwareLibraryInstallationReceipt, member: String, destination: URL) throws -> URL {
|
||||
guard diskMember(member), receipt.relativeFiles.contains(member) else { throw CompanionLibraryFailure(message: "Invalid disk member.") }
|
||||
let root = receipt.workingDirectory.standardizedFileURL
|
||||
var source = root
|
||||
for component in member.split(separator: "/") {
|
||||
source.appendPathComponent(String(component))
|
||||
let values = try source.resourceValues(forKeys: [.isSymbolicLinkKey])
|
||||
guard values.isSymbolicLink != true else { throw CompanionLibraryFailure(message: "The disk path contains a symbolic link.") }
|
||||
guard root.isFileURL else { throw CompanionLibraryFailure(message: "Invalid installation location.") }
|
||||
// Resolve members relative to opened directories so a swapped symlink
|
||||
// cannot redirect an intermediate path outside the working tree.
|
||||
var directory = open(root.path, O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC)
|
||||
guard directory >= 0 else { throw CompanionLibraryFailure(message: "The disk working directory could not be read safely.") }
|
||||
defer { close(directory) }
|
||||
let components = member.split(separator: "/").map(String.init)
|
||||
for component in components.dropLast() {
|
||||
let next = openat(directory, component, O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC)
|
||||
guard next >= 0 else { throw CompanionLibraryFailure(message: "The disk path contains an unavailable directory or symbolic link.") }
|
||||
close(directory); directory = next
|
||||
}
|
||||
guard source.resolvingSymlinksInPath().path.hasPrefix(root.resolvingSymlinksInPath().path + "/") else {
|
||||
throw CompanionLibraryFailure(message: "The disk path leaves its installation.")
|
||||
}
|
||||
let descriptor = open(source.path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC)
|
||||
let descriptor = openat(directory, components.last!, O_RDONLY | O_NOFOLLOW | O_CLOEXEC)
|
||||
guard descriptor >= 0 else { throw CompanionLibraryFailure(message: "The installed disk could not be read.") }
|
||||
let handle = FileHandle(fileDescriptor: descriptor, closeOnDealloc: true)
|
||||
defer { try? handle.close() }
|
||||
@@ -146,12 +190,21 @@ final class CompanionLibraryAuthority {
|
||||
throw CompanionLibraryFailure(message: "Choose a floppy image within the 16 MiB limit.")
|
||||
}
|
||||
let data = try handle.read(upToCount: 16 * 1024 * 1024 + 1) ?? Data()
|
||||
guard data.count == Int(info.st_size) else { throw CompanionLibraryFailure(message: "The installed disk changed while being read.") }
|
||||
var after = stat()
|
||||
guard data.count == Int(info.st_size), fstat(descriptor, &after) == 0,
|
||||
info.st_size == after.st_size, info.st_mtimespec.tv_sec == after.st_mtimespec.tv_sec,
|
||||
info.st_mtimespec.tv_nsec == after.st_mtimespec.tv_nsec,
|
||||
info.st_ctimespec.tv_sec == after.st_ctimespec.tv_sec,
|
||||
info.st_ctimespec.tv_nsec == after.st_ctimespec.tv_nsec else { throw CompanionLibraryFailure(message: "The installed disk changed while being read.") }
|
||||
try FileManager.default.createDirectory(at: destination, withIntermediateDirectories: true, attributes: [.posixPermissions: 0o700])
|
||||
let destinationValues = try destination.resourceValues(forKeys: [.isDirectoryKey, .isSymbolicLinkKey])
|
||||
guard destinationValues.isDirectory == true, destinationValues.isSymbolicLink != true else {
|
||||
throw CompanionLibraryFailure(message: "The DriveWire disk-copy location is not a safe directory.")
|
||||
}
|
||||
let folder = destination.appendingPathComponent(UUID().uuidString, isDirectory: true)
|
||||
try FileManager.default.createDirectory(at: folder, withIntermediateDirectories: false, attributes: [.posixPermissions: 0o700])
|
||||
do {
|
||||
let copy = folder.appendingPathComponent(source.lastPathComponent)
|
||||
let copy = folder.appendingPathComponent(components.last!)
|
||||
try data.write(to: copy, options: .atomic)
|
||||
return copy
|
||||
} catch { try? FileManager.default.removeItem(at: folder); throw error }
|
||||
|
||||
Reference in new issue
Block a user