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

add coredata model to Services package

Browse source
This commit is contained in:
Satindar Dhillon 2022-04-14 18:17:12 -07:00
parent 765be8314c
commit 31061abdcd
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,7 +43,7 @@ import Views
// Check if user has scrolled to the last five items in the list
if let itemIndex = itemIndex, itemIndex > thresholdIndex, items.count < thresholdIndex + 10 {
Task { await loadItems(dataService: dataService, isRefresh: false) }
loadItems(dataService: dataService, isRefresh: false)
}
}

4
apple/OmnivoreKit/Sources/Services/DataService/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="20086" systemVersion="21A559" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
<elements/>
</model>

34
apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
View file

@ -1,15 +1,9 @@
import Combine
import CoreData
import Foundation
import Models
public class CacheManager: NSObject, NSCacheDelegate {
public func cache(_: NSCache<AnyObject, AnyObject>, willEvictObject obj: Any) {
// This is just used for debugging
if let content = obj as? CachedPageContent {
print("evicting page from cache", content.slug)
}
}
}
final class PersistentContainer: NSPersistentContainer {}
public final class DataService: ObservableObject {
public static var registerIntercomUser: ((String) -> Void)?
@ -25,14 +19,23 @@ public final class DataService: ObservableObject {
let highlightsCache = NSCache<AnyObject, CachedPDFHighlights>()
let highlightsCacheQueue = DispatchQueue(label: "app.omnivore.highlights.cache.queue", attributes: .concurrent)
let cacheManager: CacheManager
let persistentContainer: PersistentContainer
var subscriptions = Set<AnyCancellable>()
public init(appEnvironment: AppEnvironment, networker: Networker) {
self.appEnvironment = appEnvironment
self.networker = networker
self.cacheManager = CacheManager()
pageCache.delegate = cacheManager
self.persistentContainer = {
let modelURL = Bundle.module.url(forResource: "CoreDataModel", withExtension: "momd")!
let model = NSManagedObjectModel(contentsOf: modelURL)!
return PersistentContainer(name: "DataModel", managedObjectModel: model)
}()
persistentContainer.loadPersistentStores { _, error in
if let error = error {
fatalError("Core Data store failed to load with error: \(error)")
}
}
}
public func clearHighlights() {
@ -51,7 +54,6 @@ public final class DataService: ObservableObject {
public extension DataService {
func prefetchPages(items: [FeedItem]) {
print("prefetching pages")
guard let viewer = currentViewer else { return }
for item in items {
@ -67,13 +69,7 @@ public extension DataService {
}
func pageFromCache(slug: String) -> ArticleContent? {
if let content = pageCache.object(forKey: NSString(string: slug)) {
print("cache hit", slug)
return content.value
} else {
print("cache miss", slug)
}
return nil
pageCache.object(forKey: NSString(string: slug))?.value
}
func invalidateCachedPage(slug: String?) {