lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

add error handling

Browse source
This commit is contained in:
Bob Sun 2017-02-04 14:24:59 +08:00
parent 88dcd8370a
commit 529e170704
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
3 changed files with 61 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pass/PasswordStore.swift
View file

@ -90,7 +90,7 @@ class PasswordStore {
func cloneRepository(remoteRepoURL: URL, func cloneRepository(remoteRepoURL: URL,
credential: GitCredential, credential: GitCredential,
transferProgressBlock: @escaping (UnsafePointer<git_transfer_progress>, UnsafeMutablePointer<ObjCBool>) -> Void, transferProgressBlock: @escaping (UnsafePointer<git_transfer_progress>, UnsafeMutablePointer<ObjCBool>) -> Void,
checkoutProgressBlock: @escaping (String?, UInt, UInt) -> Void) -> Bool { checkoutProgressBlock: @escaping (String?, UInt, UInt) -> Void) throws {
print("start cloning remote repo: \(remoteRepoURL)") print("start cloning remote repo: \(remoteRepoURL)")
let fm = FileManager.default let fm = FileManager.default
if (storeRepository != nil) { if (storeRepository != nil) {
@ -101,7 +101,6 @@ class PasswordStore {
print(error.debugDescription) print(error.debugDescription)
} }
} }
do {
print("start cloning...") print("start cloning...")
let credentialProvider = try credential.credentialProvider() let credentialProvider = try credential.credentialProvider()
let options: [String: Any] = [ let options: [String: Any] = [
@ -111,16 +110,10 @@ class PasswordStore {
print("clone finish") print("clone finish")
updatePasswordEntityCoreData() updatePasswordEntityCoreData()
gitCredential = credential gitCredential = credential
return true
} catch {
print(error)
return false
}
} }
func pullRepository(transferProgressBlock: @escaping (UnsafePointer<git_transfer_progress>, UnsafeMutablePointer<ObjCBool>) -> Void) -> Bool { func pullRepository(transferProgressBlock: @escaping (UnsafePointer<git_transfer_progress>, UnsafeMutablePointer<ObjCBool>) -> Void) throws {
print("pullRepoisitory") print("pullRepoisitory")
do {
print("start pulling...") print("start pulling...")
let credentialProvider = try gitCredential!.credentialProvider() let credentialProvider = try gitCredential!.credentialProvider()
let options: [String: Any] = [ let options: [String: Any] = [
@ -129,11 +122,6 @@ class PasswordStore {
let remote = try GTRemote(name: "origin", in: storeRepository!) let remote = try GTRemote(name: "origin", in: storeRepository!)
try storeRepository?.pull((storeRepository?.currentBranch())!, from: remote, withOptions: options, progress: transferProgressBlock) try storeRepository?.pull((storeRepository?.currentBranch())!, from: remote, withOptions: options, progress: transferProgressBlock)
updatePasswordEntityCoreData() updatePasswordEntityCoreData()
return true
} catch {
print(error)
return false
}
} }
func updatePasswordEntityCoreData() { func updatePasswordEntityCoreData() {

10
pass/PasswordsViewController.swift
View file

@ -34,11 +34,12 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
SVProgressHUD.setDefaultMaskType(.black) SVProgressHUD.setDefaultMaskType(.black)
SVProgressHUD.show(withStatus: "Sync Passwords") SVProgressHUD.show(withStatus: "Sync Passwords")
DispatchQueue.global(qos: .userInitiated).async { [unowned self] in DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
if PasswordStore.shared.pullRepository(transferProgressBlock: {(git_transfer_progress, stop) in do {
try PasswordStore.shared.pullRepository(transferProgressBlock: {(git_transfer_progress, stop) in
DispatchQueue.main.async { DispatchQueue.main.async {
SVProgressHUD.showProgress(Float(git_transfer_progress.pointee.received_objects)/Float(git_transfer_progress.pointee.total_objects), status: "Pull Remote Repository") SVProgressHUD.showProgress(Float(git_transfer_progress.pointee.received_objects)/Float(git_transfer_progress.pointee.total_objects), status: "Pull Remote Repository")
} }
}) { })
DispatchQueue.main.async { DispatchQueue.main.async {
SVProgressHUD.showSuccess(withStatus: "Done") SVProgressHUD.showSuccess(withStatus: "Done")
SVProgressHUD.dismiss(withDelay: 1) SVProgressHUD.dismiss(withDelay: 1)
@ -46,6 +47,11 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
print("pull success") print("pull success")
self.passwordEntities = PasswordStore.shared.fetchPasswordEntityCoreData() self.passwordEntities = PasswordStore.shared.fetchPasswordEntityCoreData()
self.reloadTableView(data: self.passwordEntities!) self.reloadTableView(data: self.passwordEntities!)
} catch {
DispatchQueue.main.async {
SVProgressHUD.showError(withStatus: error.localizedDescription)
SVProgressHUD.dismiss(withDelay: 3)
}
} }
} }
} }

15
pass/SettingsTableViewController.swift
View file

@ -38,7 +38,8 @@ class SettingsTableViewController: UITableViewController {
} }
DispatchQueue.global(qos: .userInitiated).async { DispatchQueue.global(qos: .userInitiated).async {
let ret = PasswordStore.shared.cloneRepository(remoteRepoURL: URL(string: gitRepostiroyURL)!, do {
try PasswordStore.shared.cloneRepository(remoteRepoURL: URL(string: gitRepostiroyURL)!,
credential: gitCredential, credential: gitCredential,
transferProgressBlock:{ (git_transfer_progress, stop) in transferProgressBlock:{ (git_transfer_progress, stop) in
DispatchQueue.main.async { DispatchQueue.main.async {
@ -52,7 +53,6 @@ class SettingsTableViewController: UITableViewController {
}) })
DispatchQueue.main.async { DispatchQueue.main.async {
if ret {
SVProgressHUD.showSuccess(withStatus: "Done") SVProgressHUD.showSuccess(withStatus: "Done")
SVProgressHUD.dismiss(withDelay: 1) SVProgressHUD.dismiss(withDelay: 1)
@ -62,11 +62,16 @@ class SettingsTableViewController: UITableViewController {
Defaults[.gitRepositoryAuthenticationMethod] = auth Defaults[.gitRepositoryAuthenticationMethod] = auth
NotificationCenter.default.post(Notification(name: Notification.Name("passwordUpdated"))) NotificationCenter.default.post(Notification(name: Notification.Name("passwordUpdated")))
} else {
SVProgressHUD.showError(withStatus: "Error") }
SVProgressHUD.dismiss(withDelay: 1) } catch {
DispatchQueue.main.async {
print(error)
SVProgressHUD.showError(withStatus: error.localizedDescription)
SVProgressHUD.dismiss(withDelay: 3)
} }
} }
} }
} }
} else if let controller = segue.source as? PGPKeySettingTableViewController { } else if let controller = segue.source as? PGPKeySettingTableViewController {