Commit 3e845c2

committed

Fix: Properly keep the cancellables

DVDRental was stuck in connecting. This was because the Combine streams were not held onto. Originally I thought the streams could "self retain", but that doesn't fly anymore. So added tokens for - count query - range query - model fetch And DVDRental seems to be back in a working state.

1 parent 4faf1cf commit 3e845c2Copy full SHA for 3e845c2

File tree

2 files changed

+18

-5

lines changed

Sources/DirectToSwiftUI/ViewModel
- D2SDisplayGroup.swift
- D2SRuleEnvironment.swift

2 files changed

+18

-5

lines changed

`‎Sources/DirectToSwiftUI/ViewModel/D2SDisplayGroup.swift`

Lines changed: 13 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,8 @@ public final class D2SDisplayGroup<Object: OActiveRecord>`
`120`	`120`
`121`	`121`	`private func integrateCount(_ count: Int) {`
`122`	`122`	`assert(_dispatchPreconditionTest(.onQueue(.main)))`
`123`		`-`
	`123`	`+ self.countFetchToken = nil`
	`124`	`+`
`124`	`125`	`#if false // nope, a fetch count means we rebuild!`
`125`	`126`	`if count == results.count { return } // all good already`
`126`	`127`	`#endif`
`@@ -138,11 +139,14 @@ public final class D2SDisplayGroup<Object: OActiveRecord>`
`138`	`139`	`results.clearOrderAndApplyNewCount(count)`
`139`	`140`	`}`
`140`	`141`
	`142`	`+ private var countFetchToken : AnyCancellable?`
	`143`	`+`
`141`	`144`	`private func fetchCount(_ fetchSpecification: FetchSpecification) {`
`142`	`145`	`let fs = fetchSpecification // has to be done, can't use inside fetchCount?`
`143`		`- _ = dataSource.fetchCount(fs, on: D2SFetchQueue)`
	`146`	`+ countFetchToken = dataSource.fetchCount(fs, on: D2SFetchQueue)`
`144`	`147`	`.receive(on: RunLoop.main)`
`145`	`148`	`.catch { ( error : Swift.Error ) -> Just<Int> in`
	`149`	`+ self.countFetchToken = nil`
`146`	`150`	`self.handleError(error)`
`147`	`151`	`return Just(0)`
`148`	`152`	`}`
`@@ -196,8 +200,13 @@ public final class D2SDisplayGroup<Object: OActiveRecord>`
`196`	`200`	`self.results = newResults`
`197`	`201`	`}`
`198`	`202`
`199`		`- private struct Query: Equatable {`
	`203`	`+ private finalclass Query: Equatable {`
`200`	`204`	`let range : Range<Int>`
	`205`	`+ var token : AnyCancellable?`
	`206`	`+ init(range: Range<Int>) { self.range = range }`
	`207`	`+ static func ==(lhs: Query, rhs: Query) -> Bool {`
	`208`	`+ return lhs.range == rhs.range`
	`209`	`+ }`
`201`	`210`	`}`
`202`	`211`	`private var activeQueries = [ Query ]()`
`203`	`212`
`@@ -242,7 +251,7 @@ public final class D2SDisplayGroup<Object: OActiveRecord>`
`242`	`251`	`let query = Query(range: fetchRange)`
`243`	`252`	`activeQueries.append(query) // keep it alive`
`244`	`253`
`245`		`- _ = dataSource.fetchGlobalIDs(fs, on: D2SFetchQueue)`
	`254`	`+ query.token = dataSource.fetchGlobalIDs(fs, on: D2SFetchQueue)`
`246`	`255`	`.receive(on: RunLoop.main)`
`247`	`256`	`.flatMap { ( globalIDs ) -> AnyPublisher<[ Object ], Error> in`
`248`	`257`	`var missingGIDs = Set<GlobalID>()`

`‎Sources/DirectToSwiftUI/ViewModel/D2SRuleEnvironment.swift`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -43,18 +43,21 @@ public final class D2SRuleEnvironment: ObservableObject {`
`43`	`43`	`ruleContext[D2SKeys.model] = model`
`44`	`44`	`}`
`45`	`45`
	`46`	`+ private var modelFetch : AnyCancellable?`
	`47`	`+`
`46`	`48`	`public func resume() {`
`47`	`49`	`guard databaseModel == nil else { return }`
`48`	`50`
`49`	`51`	`// TODO: setup timer to refetch and compare model tag`
`50`		`- _ = adaptor.fetchModel(on: D2SFetchQueue)`
	`52`	`+ modelFetch = adaptor.fetchModel(on: D2SFetchQueue)`
`51`	`53`	`.map { ( model, tag ) in`
`52`	`54`	`FancyModelMaker(model: model).fancyfyModel()`
`53`	`55`	`}`
`54`	`56`	`.receive(on: RunLoop.main)`
`55`	`57`	`.catch { ( error : Swift.Error ) -> Just<Model> in`
`56`	`58`	`self.error = error`
`57`	`59`	`globalD2SLogger.error("failed to fetch model:", error)`
	`60`	`+ self.modelFetch = nil`
`58`	`61`	`return Just(Model(entities: [`
`59`	`62`	`ModelEntity(name: "Could not load model.")`
`60`	`63`	`]))`
`@@ -64,6 +67,7 @@ public final class D2SRuleEnvironment: ObservableObject {`
`64`	`67`	`self.adaptor.model = model`
`65`	`68`	`}`
`66`	`69`	`self.setupWithModel(model)`
	`70`	`+ self.modelFetch = nil`
`67`	`71`	`}`
`68`	`72`	`}`
`69`	`73`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 3e845c2

File tree

2 files changed

2 files changed

`‎Sources/DirectToSwiftUI/ViewModel/D2SDisplayGroup.swift`

`‎Sources/DirectToSwiftUI/ViewModel/D2SRuleEnvironment.swift`

0 commit comments