3-group-ios/GBA002
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improves sync error messages when a game is missing or can’t be synced

Browse Source
This commit is contained in:
Riley Testut 2020-06-12 13:00:18 -07:00
parent 3cb3b9a10b
commit b85230b0ff
1 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Delta/Syncing/SyncResultViewController.swift
View File

@ -163,6 +163,16 @@ private extension SyncResultViewController
errorMessage = messages.joined(separator: "\n")
}
case .other(_, ValidationError.nilRelationshipObjects(let relationships)) where relationships.contains("game"):
if let gameName = error.record.localMetadata?[.gameName] ?? error.record.remoteMetadata?[.gameName]
{
errorMessage = String(format: NSLocalizedString("“%@“ is missing. Please re-import this game to resume syncing its data.", comment: ""), gameName)
}
else
{
errorMessage = NSLocalizedString("The game for this item is missing. Please re-import the game to resume syncing its data.", comment: "")
}
case .other(_, let error as NSError): errorMessage = error.localizedFailureReason ?? error.localizedDescription
default: errorMessage = error.failureReason
}
@ -265,12 +275,38 @@ private extension SyncResultViewController
for (group, errors) in errorsByGroup
{
let sortedErrors = errors.sorted { (a, b) -> Bool in
let filteredErrors = errors.filter { error in
switch group
{
case .saveState(let gameID), .cheat(let gameID):
switch error
{
case RecordError.other(_, ValidationError.nilRelationshipObjects(let relationships)) where relationships.contains("game"):
if errorsByGroup.keys.contains(Group.game(gameID))
{
// There is already an error for this game, so don't need to duplicate it due to it missing.
return false
}
else
{
return true
}
default: break
}
default: break
}
return true
}
let sortedErrors = filteredErrors.sorted { (a, b) -> Bool in
guard let a = a as? RecordError, let b = b as? RecordError else { return false }
return a.record.localizedTitle < b.record.localizedTitle
}
errorsByGroup[group] = sortedErrors
errorsByGroup[group] = sortedErrors.isEmpty ? nil : sortedErrors
}
let sortedErrors = errorsByGroup.sorted { (a, b) in