Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use correct format spec for integer placeholder in predicate

Browse Source
This commit is contained in:
Satindar Dhillon
2022-04-26 07:44:52 -07:00
parent 584f216d99
commit f51338083e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift
View File

@ -57,6 +57,7 @@ import Views
Task { _ = try? await dataService.fetchViewer() }
}
// TODO: fix issues with this list
dataService.libraryItemsPublisher(
limit: 10,
sortDescending: true,
@ -70,7 +71,7 @@ import Views
let fetchRequest: NSFetchRequest<Models.LinkedItem> = LinkedItem.fetchRequest()
fetchRequest.sortDescriptors = [NSSortDescriptor(keyPath: \LinkedItem.savedAt, ascending: false)]
fetchRequest.predicate = NSPredicate(
format: "serverSyncStatus != %@", ServerSyncStatus.needsDeletion.rawValue
format: "serverSyncStatus != %i", Int64(ServerSyncStatus.needsDeletion.rawValue)
)
if let fetchedItems = try? dataService.viewContext.fetch(fetchRequest) {
self?.items = fetchedItems

4
apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
View File

@ -11,13 +11,13 @@ extension DataService {
// LinkedItems
let itemsFetchRequest: NSFetchRequest<Models.LinkedItem> = LinkedItem.fetchRequest()
itemsFetchRequest.predicate = NSPredicate(
format: "serverSyncStatus != %@", ServerSyncStatus.isNSync.rawValue
format: "serverSyncStatus != %i", Int64(ServerSyncStatus.isNSync.rawValue)
)
// Highlights
let highlightsFetchRequest: NSFetchRequest<Models.Highlight> = Highlight.fetchRequest()
highlightsFetchRequest.predicate = NSPredicate(
format: "serverSyncStatus != %@", ServerSyncStatus.isNSync.rawValue
format: "serverSyncStatus != %i", Int64(ServerSyncStatus.isNSync.rawValue)
)
try await backgroundContext.perform { [weak self] in