Open source CapCut alternative.
TypeScript
fix(ios): load visible project details sequentially [rebuild]
David Leadf8dd841a2c
diff --git a/apps/ios/DonkeyKit/Sources/DonkeyKitModels/Projects.swift b/apps/ios/DonkeyKit/Sources/DonkeyKitModels/Projects.swiftindex f0c24c58..2492fb93 100644--- a/apps/ios/DonkeyKit/Sources/DonkeyKitModels/Projects.swift+++ b/apps/ios/DonkeyKit/Sources/DonkeyKitModels/Projects.swift@@ -114,6 +114,7 @@ struct ProjectListingCache {public final class ProjectsModel {public private(set) var projects: [Project]public private(set) var isLoading = false+ public private(set) var listingRevision = 0/// Renders in flight, by project id. A run outlives the screen that asked/// for it, so closing the player and coming back finds it where it was.public private(set) var exportRuns: [String: ProjectExportState] = [:]@@ -122,6 +123,8 @@ public final class ProjectsModel {private var latestExports: [String: RemoteExport] = [:]private var thumbnails: [String: URL] = [:]private var exportTasks: [String: Task<Void, Never>] = [:]+ private var detailTask: Task<Void, Never>?+ private var accountRevision = UUID()private let service: (any CloudProjectsServicing)?private let cache: ProjectListingCache@@ -130,11 +133,16 @@ public final class ProjectsModel {self.service = servicecache = ProjectListingCache(directory: cacheDirectory)projects = cache.read()+ thumbnails = Dictionary(uniqueKeysWithValues: projects.compactMap { project in+ project.thumbnail.map { (project.id, $0) }+ })}/// Drop what this device knows about the account's projects. Sign-out/// calls it, so the next account never opens on someone else's listing.public func forget() {+ accountRevision = UUID()+ detailTask?.cancel()for id in exportRuns.keys { clearExport(id) }projects = []summaries = [:]@@ -188,6 +196,7 @@ public final class ProjectsModel {// The finished render is a new export on the project, so the// card stops offering the preview the moment it lands.await refresh()+ await loadDetails(for: id)return}}@@ -236,20 +245,16 @@ public final class ProjectsModel {}}- /// Pull the listing and per-project latest exports, then fill thumbnails- /// as they cache. A card keeps the poster and export it already carries- /// while the refresh runs, so revisiting the screen repaints in place.+ /// Refresh the shelf. Visible cards fetch their own export and poster.public func refresh() async {guard let service, !isLoading else { return }+ let account = accountRevisionisLoading = truedefer { isLoading = false }- guard let remote = try? await service.fetchProjects() else { return }+ guard let remote = try? await service.fetchProjects(),+ !Task.isCancelled, account == accountRevision else { return }adopt(remote)- async let exports: Void = fillExports(remote, service: service)- async let posters: Void = fillThumbnails(remote, service: service)- _ = await (exports, posters)- // The whole pass landed — names, exports and posters — so this is the- // listing the next launch opens on.+ listingRevision += 1cache.write(projects)}@@ -263,33 +268,38 @@ public final class ProjectsModel {projects = remote.map { project(for: $0, latest: latestExports[$0.id], thumbnail: thumbnails[$0.id]) }}- private func fillExports(_ remote: [RemoteProject], service: any CloudProjectsServicing) async {- await withTaskGroup(of: (String, [RemoteExport]?).self) { group in- for summary in remote {- group.addTask { (summary.id, try? await service.fetchExports(projectId: summary.id)) }- }- for await (id, exports) in group {- // A fetch that failed comes back nil and leaves the export the- // card already plays alone; only an answer from the server —- // a list, empty or not — changes what a card offers.- guard let exports else { continue }+ /// One visible card at a time reads details. Its view owns cancellation,+ /// so scrolling away drops queued work and cancels an active request.+ public func loadDetails(for id: String) async {+ let account = accountRevision+ let revision = listingRevision+ while let pending = detailTask {+ await pending.value+ guard !Task.isCancelled else { return }+ }+ guard !Task.isCancelled, account == accountRevision, revision == listingRevision,+ let service, let summary = summaries[id] else { return }+ let task = Task {+ defer { detailTask = nil }+ let exports = try? await service.fetchExports(projectId: id)+ guard !Task.isCancelled, account == accountRevision, revision == listingRevision else { return }+ if let exports {latestExports[id] = exports.firstrebuild(id)}- }- }-- private func fillThumbnails(_ remote: [RemoteProject], service: any CloudProjectsServicing) async {- await withTaskGroup(of: (String, URL?).self) { group in- for summary in remote {- group.addTask { (summary.id, await service.thumbnailFile(for: summary)) }- }- for await (id, file) in group {- guard let file else { continue }+ let file = await service.thumbnailFile(for: summary)+ guard !Task.isCancelled, account == accountRevision, revision == listingRevision else { return }+ if let file {thumbnails[id] = file- guard let index = projects.firstIndex(where: { $0.id == id }) else { continue }- projects[index].thumbnail = file+ rebuild(id)}+ cache.write(projects)+ }+ detailTask = task+ await withTaskCancellationHandler {+ await task.value+ } onCancel: {+ task.cancel()}}@@ -324,7 +334,7 @@ public final class ProjectsModel {private func rebuild(_ id: String) {guard let summary = summaries[id],let index = projects.firstIndex(where: { $0.id == id }) else { return }- projects[index] = project(for: summary, latest: latestExports[id], thumbnail: projects[index].thumbnail)+ projects[index] = project(for: summary, latest: latestExports[id], thumbnail: thumbnails[id] ?? projects[index].thumbnail)}private func project(for summary: RemoteProject, latest: RemoteExport?, thumbnail: URL?) -> Project {diff --git a/apps/ios/DonkeyKit/Sources/DonkeyKitUI/ProjectsScreen.swift b/apps/ios/DonkeyKit/Sources/DonkeyKitUI/ProjectsScreen.swiftindex 9e88abf1..63f59f9c 100644--- a/apps/ios/DonkeyKit/Sources/DonkeyKitUI/ProjectsScreen.swift+++ b/apps/ios/DonkeyKit/Sources/DonkeyKitUI/ProjectsScreen.swift@@ -31,6 +31,9 @@ struct ProjectsScreen: View {LazyVGrid(columns: columns, spacing: 12) {ForEach(projects.projects) { project inProjectCard(project: project) { playing = project }+ .task(id: projects.listingRevision) {+ await projects.loadDetails(for: project.id)+ }}}.padding(.horizontal, 20)diff --git a/apps/ios/DonkeyKit/Tests/DonkeyKitModelsTests/DonkeyKitModelsTests.swift b/apps/ios/DonkeyKit/Tests/DonkeyKitModelsTests/DonkeyKitModelsTests.swiftindex 4f11d44d..8bbd12f8 100644--- a/apps/ios/DonkeyKit/Tests/DonkeyKitModelsTests/DonkeyKitModelsTests.swift+++ b/apps/ios/DonkeyKit/Tests/DonkeyKitModelsTests/DonkeyKitModelsTests.swift@@ -1096,20 +1096,38 @@ import Testing@MainActor@Suite struct ProjectsListingTests {+ @MainActorfinal class FakeProjects: CloudProjectsServicing {let remote: [RemoteProject]+ var exports: [RemoteExport] = []+ var exportRequests: [String] = []+ var thumbnailRequests: [String] = []+ var concurrentExports = 0+ var maximumConcurrentExports = 0+ var exportDelay: Duration = .zero+ var thumbnail: URL?init(remote: [RemoteProject] = []) { self.remote = remote }func fetchProjects() async throws -> [RemoteProject] { remote }- func fetchExports(projectId: String) async throws -> [RemoteExport] { [] }+ func fetchExports(projectId: String) async throws -> [RemoteExport] {+ exportRequests.append(projectId)+ concurrentExports += 1+ maximumConcurrentExports = max(maximumConcurrentExports, concurrentExports)+ defer { concurrentExports -= 1 }+ try await Task.sleep(for: exportDelay)+ return exports+ }func startExport(projectId: String, preset: String) async throws -> String { "job" }func exportProgress(jobId: String) async throws -> RenderProgress { .done }func exportFile(jobId: String) async throws -> URL { URL(string: "https://example.com/e.mp4")! }func streamURL(project: RemoteProject, export: RemoteExport?) async throws -> URL {URL(string: "https://example.com/s.mp4")!}- func thumbnailFile(for project: RemoteProject) async -> URL? { nil }+ func thumbnailFile(for project: RemoteProject) async -> URL? {+ thumbnailRequests.append(project.id)+ return thumbnail+ }}private func scratch() -> URL {@@ -1119,6 +1137,69 @@ import Testingreturn directory}+ @Test func shelfRefreshDoesNotRequestEveryProjectsDetails() async {+ let directory = scratch()+ defer { try? FileManager.default.removeItem(at: directory) }+ let service = FakeProjects(remote: (0..<100).map {+ RemoteProject(id: "p\($0)", name: "Project", duration: 4, updatedAt: Date(), hasPreview: false)+ })+ let model = ProjectsModel(service: service, cacheDirectory: directory)+ await model.refresh()+ #expect(model.projects.count == 100)+ #expect(service.exportRequests.isEmpty)+ #expect(service.thumbnailRequests.isEmpty)+ let revision = model.listingRevision+ await model.refresh()+ #expect(model.listingRevision > revision)+ #expect(service.exportRequests.isEmpty)+ }++ @Test func visibleCardsReadDetailsOneAtATime() async {+ let directory = scratch()+ defer { try? FileManager.default.removeItem(at: directory) }+ let service = FakeProjects(remote: (0..<20).map {+ RemoteProject(id: "p\($0)", name: "Project", duration: 4, updatedAt: Date(), hasPreview: false)+ })+ service.exportDelay = .milliseconds(5)+ service.exports = [RemoteExport(file: "export.mp4", modifiedAt: Date())]+ service.thumbnail = directory.appending(path: "poster.jpg")+ let model = ProjectsModel(service: service, cacheDirectory: directory)+ await model.refresh()+ await withTaskGroup(of: Void.self) { group in+ for project in model.projects.prefix(6) {+ group.addTask { await model.loadDetails(for: project.id) }+ }+ }+ #expect(service.exportRequests.count == 6)+ #expect(service.thumbnailRequests.count == 6)+ #expect(service.maximumConcurrentExports == 1)+ #expect(model.projects.prefix(6).allSatisfy {+ if case .ready(_, isPreview: false) = $0.export { return $0.thumbnail == service.thumbnail }+ return false+ })+ #expect(model.projects.dropFirst(6).allSatisfy { $0.export == .none && $0.thumbnail == nil })+ }++ @Test func cancelledVisibleCardDoesNotContinueLoadingDetails() async {+ let directory = scratch()+ defer { try? FileManager.default.removeItem(at: directory) }+ let service = FakeProjects(remote: [+ RemoteProject(id: "p1", name: "Project", duration: 4, updatedAt: Date(), hasPreview: false)+ ])+ service.exportDelay = .seconds(60)+ let model = ProjectsModel(service: service, cacheDirectory: directory)+ await model.refresh()+ let card = Task { await model.loadDetails(for: "p1") }+ while service.exportRequests.isEmpty { await Task.yield() }+ card.cancel()+ await card.value+ #expect(service.thumbnailRequests.isEmpty)+ #expect(service.concurrentExports == 0)+ service.exportDelay = .zero+ await model.loadDetails(for: "p1")+ #expect(service.thumbnailRequests == ["p1"])+ }+@Test func listingIsThereBeforeTheNetworkIs() async {let directory = scratch()defer { try? FileManager.default.removeItem(at: directory) }