Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 15 additions & 21 deletions XPCBackupService/Entities/BackupTreeNode.swift
Original file line number Diff line number Diff line change
Expand Up @@ -98,31 +98,25 @@ class BackupTreeNode {
}

private func nodeIsSynced(url: URL, deviceId: Int) throws -> SyncedNode? {
guard let syncedNode = backupRealm.findSyncedNode(url: url, deviceId: deviceId) else {
return nil
}

let threadSafeRef = ThreadSafeReference(to: syncedNode)
guard let syncedNode = backupRealm.findSyncedNode(url: url, deviceId: deviceId) else {
return nil
}

guard let resolvedNode = backupRealm.resolveSyncedNode(reference: threadSafeRef) else {
return nil
}
guard let fileModificationDate = try self.getFileModificationDate() else {
return nil
}

guard let fileModificationDate = try self.getFileModificationDate() else {
return nil
}
let syncedNodeDate = syncedNode.updatedAt

let syncedNodeDate = resolvedNode.updatedAt
if syncedNodeDate < fileModificationDate && self.type != .folder {
self.syncStatus = .NEEDS_UPDATE
self.remoteId = syncedNode.remoteId
self.remoteUuid = syncedNode.remoteUuid
return nil
}

if syncedNodeDate < fileModificationDate && self.type != .folder {
self.syncStatus = .NEEDS_UPDATE
self.remoteId = resolvedNode.remoteId
self.remoteUuid = resolvedNode.remoteUuid
return nil
}

return resolvedNode
}
return syncedNode
}

func syncBelowNodes(withOperationQueue: OperationQueue, dependingOfOperation: BackupTreeNodeSyncOperation? = nil, onError: @escaping (Error) -> Void) throws -> Void {
let operation = BackupTreeNodeSyncOperation(backupTreeNode: self)
Expand Down