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

50
pass/PasswordStore.swift
View file

@ -90,7 +90,7 @@ class PasswordStore {
func cloneRepository(remoteRepoURL: URL,
credential: GitCredential,
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)")
let fm = FileManager.default
if (storeRepository != nil) {
@ -101,39 +101,27 @@ class PasswordStore {
print(error.debugDescription)
}
}
do {
print("start cloning...")
let credentialProvider = try credential.credentialProvider()
let options: [String: Any] = [
GTRepositoryCloneOptionsCredentialProvider: credentialProvider,
]
storeRepository = try GTRepository.clone(from: remoteRepoURL, toWorkingDirectory: storeURL, options: options, transferProgressBlock:transferProgressBlock, checkoutProgressBlock: checkoutProgressBlock)
print("clone finish")
updatePasswordEntityCoreData()
gitCredential = credential
return true
} catch {
print(error)
return false
}
print("start cloning...")
let credentialProvider = try credential.credentialProvider()
let options: [String: Any] = [
GTRepositoryCloneOptionsCredentialProvider: credentialProvider,
]
storeRepository = try GTRepository.clone(from: remoteRepoURL, toWorkingDirectory: storeURL, options: options, transferProgressBlock:transferProgressBlock, checkoutProgressBlock: checkoutProgressBlock)
print("clone finish")
updatePasswordEntityCoreData()
gitCredential = credential
}
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")
do {
print("start pulling...")
let credentialProvider = try gitCredential!.credentialProvider()
let options: [String: Any] = [
GTRepositoryRemoteOptionsCredentialProvider: credentialProvider
]
let remote = try GTRemote(name: "origin", in: storeRepository!)
try storeRepository?.pull((storeRepository?.currentBranch())!, from: remote, withOptions: options, progress: transferProgressBlock)
updatePasswordEntityCoreData()
return true
} catch {
print(error)
return false
}
print("start pulling...")
let credentialProvider = try gitCredential!.credentialProvider()
let options: [String: Any] = [
GTRepositoryRemoteOptionsCredentialProvider: credentialProvider
]
let remote = try GTRemote(name: "origin", in: storeRepository!)
try storeRepository?.pull((storeRepository?.currentBranch())!, from: remote, withOptions: options, progress: transferProgressBlock)
updatePasswordEntityCoreData()
}
func updatePasswordEntityCoreData() {