prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduce max sync amount, defer after the second sync

Browse source
This commit is contained in:
Jackson Harper 2022-11-25 14:04:22 +08:00
parent c68dfef447
commit 23af75594d
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift
View file

@ -105,7 +105,9 @@ import Views
func syncItems(dataService: DataService, syncStartTime: Date) async {
let lastSyncDate = dateFormatter.date(from: dataService.lastItemSyncTime) ?? Date(timeIntervalSinceReferenceDate: 0)
let syncResult = try? await dataService.syncLinkedItems(since: lastSyncDate, cursor: nil)
let syncResult = try? await dataService.syncLinkedItems(since: lastSyncDate,
cursor: nil,
deferFetchingMore: true)
if syncResult != nil {
dataService.lastItemSyncTime = dateFormatter.string(from: syncStartTime)
@ -169,7 +171,6 @@ import Views
func loadItems(dataService: DataService, audioController _: AudioController, isRefresh: Bool) async {
let syncStartTime = Date()
let start = CFAbsoluteTimeGetCurrent()
isLoading = true
showLoadingBar = true

27
apple/OmnivoreKit/Sources/Services/DataService/Public/LinkedItemLoading.swift
View file

@ -14,7 +14,8 @@ public extension DataService {
func syncLinkedItems(
since date: Date,
cursor: String?,
previousQueryResult: LinkedItemSyncResult? = nil
previousQueryResult: LinkedItemSyncResult? = nil,
deferFetchingMore: Bool
) async throws -> LinkedItemSyncResult? {
if previousQueryResult == nil {
// Send offline changes to server before fetching items
@ -36,12 +37,24 @@ public extension DataService {
cursor: fetchResult.cursor
)
if fetchResult.hasMoreItems, (previousQueryResult?.updatedItemIDs.count ?? 0) < 200 {
return try await syncLinkedItems(
since: date,
cursor: fetchResult.cursor,
previousQueryResult: result
)
if fetchResult.hasMoreItems, (previousQueryResult?.updatedItemIDs.count ?? 0) < 40 {
if deferFetchingMore {
Task.detached(priority: .background) {
try await self.syncLinkedItems(
since: date,
cursor: fetchResult.cursor,
previousQueryResult: result,
deferFetchingMore: deferFetchingMore
)
}
} else {
return try await syncLinkedItems(
since: date,
cursor: fetchResult.cursor,
previousQueryResult: result,
deferFetchingMore: deferFetchingMore
)
}
}
return result