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

show transfer progress

Browse source
This commit is contained in:
Bob Sun 2017-01-23 17:36:10 +08:00
parent 1b0f8fcb05
commit a4b26b3bd3
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
3 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pass/PasswordStore.swift
View file

@ -54,7 +54,9 @@ class PasswordStore {
}
func cloneRepository(remoteRepoURL: URL) -> Bool {
func cloneRepository(remoteRepoURL: URL,
transferProgressBlock: @escaping (UnsafePointer<git_transfer_progress>, UnsafeMutablePointer<ObjCBool>) -> Void,
checkoutProgressBlock: @escaping (String?, UInt, UInt) -> Void) -> Bool {
print("start cloning remote repo")
let fm = FileManager.default
if (storeRepository != nil) {
@ -66,19 +68,21 @@ class PasswordStore {
}
}
do {
storeRepository = try GTRepository.clone(from: remoteRepoURL, toWorkingDirectory: storeURL, options: nil, transferProgressBlock: nil, checkoutProgressBlock: nil)
print("start cloning...")
storeRepository = try GTRepository.clone(from: remoteRepoURL, toWorkingDirectory: storeURL, options: nil, transferProgressBlock:transferProgressBlock, checkoutProgressBlock: checkoutProgressBlock)
updatePasswordEntityCoreData()
return true
} catch {
storeRepository = nil
print(error)
return false
}
}
func pullRepository() -> Bool {
func pullRepository(transferProgressBlock: @escaping (UnsafePointer<git_transfer_progress>, UnsafeMutablePointer<ObjCBool>) -> Void) -> Bool {
print("pullRepoisitory")
do {
let remote = try GTRemote(name: "origin", in: storeRepository!)
try storeRepository?.pull((storeRepository?.currentBranch())!, from: remote, withOptions: nil, progress: nil)
try storeRepository?.pull((storeRepository?.currentBranch())!, from: remote, withOptions: nil, progress: transferProgressBlock)
updatePasswordEntityCoreData()
return true
} catch {