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

Updates Harmony dependency

Browse Source
This commit is contained in:
Riley Testut 2019-02-25 12:29:45 -08:00
parent 4778d48b67
commit 14e2eefc42
6 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Delta/Launch/LaunchViewController.swift
View File

@ -66,7 +66,7 @@ extension LaunchViewController
switch result switch result
{ {
case .success: completionHandler(nil) case .success: completionHandler(nil)
case .failure(let error): completionHandler(error.error) case .failure(let error): completionHandler(error)
} }
} }
} }

4
Delta/Settings/Syncing/GameSyncStatusViewController.swift
View File

@ -53,7 +53,7 @@ class GameSyncStatusViewController: UITableViewController
guard let cell = sender as? UITableViewCell, let indexPath = self.tableView.indexPath(for: cell) else { return } guard let cell = sender as? UITableViewCell, let indexPath = self.tableView.indexPath(for: cell) else { return }
let recordedObject = self.dataSource.item(at: indexPath) as! SyncableManagedObject let recordedObject = self.dataSource.item(at: indexPath) as! Syncable
do do
{ {
@ -136,7 +136,7 @@ private extension GameSyncStatusViewController
do do
{ {
let recordedObjects = ([self.game, self.game.gameSave].compactMap { $0 } + Array(self.game.saveStates) + Array(self.game.cheats)) as! [SyncableManagedObject] let recordedObjects = ([self.game, self.game.gameSave].compactMap { $0 } + Array(self.game.saveStates) + Array(self.game.cheats)) as! [Syncable]
let records = try SyncManager.shared.recordController.fetchRecords(for: recordedObjects) let records = try SyncManager.shared.recordController.fetchRecords(for: recordedObjects)
for record in records for record in records

4
Delta/Settings/Syncing/RecordVersionsViewController.swift
View File

@ -199,7 +199,7 @@ private extension RecordVersionsViewController
SyncManager.shared.syncCoordinator.fetchVersions(for: self.record) { (result) in SyncManager.shared.syncCoordinator.fetchVersions(for: self.record) { (result) in
do do
{ {
let versions = try result.value().map(Version.init) let versions = try result.get().map(Version.init)
self.versions = versions self.versions = versions
DispatchQueue.main.async { DispatchQueue.main.async {
@ -267,7 +267,7 @@ private extension RecordVersionsViewController
do do
{ {
let record = try result.value() let record = try result.get()
self.record = record self.record = record
self.progressView.setProgress(1.0, animated: true) self.progressView.setProgress(1.0, animated: true)

4
Delta/Settings/Syncing/SyncingServicesViewController.swift
View File

@ -114,7 +114,7 @@ extension SyncingServicesViewController
DispatchQueue.main.async { DispatchQueue.main.async {
do do
{ {
try result.verify() try result.get()
self.tableView.reloadData() self.tableView.reloadData()
} }
catch catch
@ -131,7 +131,7 @@ extension SyncingServicesViewController
DispatchQueue.main.async { DispatchQueue.main.async {
do do
{ {
try result.verify() _ = try result.get()
self.tableView.reloadData() self.tableView.reloadData()
} }
catch catch

24
Delta/Syncing/SyncResultViewController.swift
View File

@ -170,32 +170,24 @@ private extension SyncResultViewController
{ {
var errors = [Error]() var errors = [Error]()
do switch self.result!
{
try self.result.verify()
}
catch SyncError.partial(let recordResults)
{ {
case .success: break
case .failure(.partial(let recordResults)):
for (_, result) in recordResults for (_, result) in recordResults
{ {
guard case .failure(let error) = result else { continue } guard case .failure(let error) = result else { continue }
errors.append(error) errors.append(error)
} }
}
catch SyncError.other(.cancelled) case .failure(.other(GeneralError.cancelled)):
{
// Do nothing // Do nothing
} break
catch let error as SyncError
{ case .failure(let error):
let error = error.underlyingError ?? error let error = error.underlyingError ?? error
errors.append(error) errors.append(error)
} }
catch
{
assertionFailure("Non-SyncError thrown by sync result.")
errors.append(error)
}
var errorsByGroup = [Group: [Error]]() var errorsByGroup = [Group: [Error]]()

2
External/Harmony vendored

@ -1 +1 @@
Subproject commit 31b5647ed3cd40ea91cedffdbcb566abb459f617 Subproject commit d3d5a3c8e6c9d584802e233856733afaac3bc58e