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

Sync move operation, attempt to sync before home is loaded

Browse source
This commit is contained in:
Jackson Harper 2023-12-28 15:46:57 +08:00
parent c09a6fc1de
commit 3667595f48
7 changed files with 27 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apple/OmnivoreKit/Sources/App/Views/Home/Components/LibraryItemFetcher.swift
View file

@ -26,7 +26,6 @@ import Views
var receivedIdx = 0
func setItems(_ context: NSManagedObjectContext, _ items: [Models.LibraryItem]) {
print("setting items, old count", self.items.count, "new count", items.count)
self.items = items
if let filter = FeaturedItemFilter(rawValue: featureFilter) {

3
apple/OmnivoreKit/Sources/App/Views/RootView/RootView.swift
View file

@ -51,6 +51,9 @@ struct InnerRootView: View {
@ViewBuilder private var innerBody: some View {
if authenticator.isLoggedIn {
PrimaryContentView()
.task {
try? await dataService.syncOfflineItemsWithServerIfNeeded()
}
} else {
if authenticator.isLoggingOut {
LogoutView()

1
apple/OmnivoreKit/Sources/Models/DataModels/ServerSyncStatus.swift
View file

@ -6,5 +6,4 @@ public enum ServerSyncStatus: Int {
case needsDeletion
case needsCreation
case needsUpdate
case needsMove
}

33
apple/OmnivoreKit/Sources/Services/DataService/Mutations/MoveItem.swift
View file

@ -20,10 +20,10 @@ public extension DataService {
}
}
try await syncMoveToFolder(itemID: itemID, folder: folder)
syncMoveToFolder(itemID: itemID, folder: folder)
}
func syncMoveToFolder(itemID: String, folder: String) async throws {
func syncMoveToFolder(itemID: String, folder: String) {
enum MutationResult {
case result(success: Bool)
case error(errorMessage: String)
@ -48,23 +48,22 @@ public extension DataService {
let path = appEnvironment.graphqlPath
let headers = networker.defaultHeaders
let context = backgroundContext
return try await withCheckedThrowingContinuation { continuation in
send(mutation, to: path, headers: headers) { queryResult in
guard let payload = try? queryResult.get() else {
continuation.resume(throwing: BasicError.message(messageText: "network error"))
return
}
send(mutation, to: path, headers: headers) { queryResult in
let data = try? queryResult.get()
let syncStatus: ServerSyncStatus = data == nil ? .needsUpdate : .isNSync
switch payload.data {
case let .result(success: success):
if success {
continuation.resume()
} else {
continuation.resume(throwing: BasicError.message(messageText: "operation failed"))
}
case let .error(errorMessage: errorMessage):
continuation.resume(throwing: BasicError.message(messageText: errorMessage))
context.perform {
guard let linkedItem = LibraryItem.lookup(byID: itemID, inContext: context) else { return }
linkedItem.serverSyncStatus = Int64(syncStatus.rawValue)
do {
try context.save()
logger.debug("LinkedItem updated succesfully")
} catch {
context.rollback()
logger.debug("Failed to sync library item move: \(error.localizedDescription)")
}
}
}

16
apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
View file

@ -151,21 +151,18 @@ public extension DataService {
case .needsUpdate:
item.serverSyncStatus = Int64(ServerSyncStatus.isSyncing.rawValue)
syncLinkArchiveStatus(itemID: item.unwrappedID, archived: item.isArchived)
syncLinkReadingProgress(
itemID: item.unwrappedID,
readingProgress: item.readingProgress,
anchorIndex: Int(item.readingProgressAnchor),
force: item.isPDF
)
case .needsMove:
item.serverSyncStatus = Int64(ServerSyncStatus.isSyncing.rawValue)
syncLinkArchiveStatus(itemID: item.unwrappedID, archived: item.isArchived)
syncLinkReadingProgress(
itemID: item.unwrappedID,
readingProgress: item.readingProgress,
anchorIndex: Int(item.readingProgressAnchor),
force: item.isPDF
)
// If the items folder might have changed, sync that.
if let itemID = item.id, let folder = item.folder, folder != "following" {
syncMoveToFolder(itemID: itemID, folder: folder)
}
}
}
}
@ -193,9 +190,6 @@ public extension DataService {
} else {
highlight.serverSyncStatus = Int64(ServerSyncStatus.isNSync.rawValue)
}
case .needsMove:
// Highlights can't be moved
break
}
}
}

2
apple/OmnivoreKit/Sources/Services/DataService/Queries/LinkedItemNetworkQuery.swift
View file

@ -292,7 +292,7 @@ private let libraryArticleSelection = Selection.Article {
downloadURL: try $0.url(),
recommendations: try $0.recommendations(selection: recommendationSelection.list.nullable) ?? [],
labels: try $0.labels(selection: feedItemLabelSelection.list.nullable) ?? [],
highlights: try $0.highlights(selection: highlightSelection.list) ?? []
highlights: try $0.highlights(selection: highlightSelection.list)
)
}

4
apple/OmnivoreKit/Sources/Views/SyncingIcon.swift
View file

@ -21,7 +21,7 @@ public struct SyncStatusIcon: View {
switch status {
case .isNSync:
return "exclamationmark.icloud"
case .isSyncing, .needsCreation, .needsDeletion, .needsUpdate, .needsMove:
case .isSyncing, .needsCreation, .needsDeletion, .needsUpdate:
return "icloud"
}
}
@ -30,7 +30,7 @@ public struct SyncStatusIcon: View {
switch status {
case .isNSync:
return .red
case .isSyncing, .needsCreation, .needsDeletion, .needsUpdate, .needsMove:
case .isSyncing, .needsCreation, .needsDeletion, .needsUpdate:
return .appGrayText
}
}