From 09f2361ba68bebe3a435033601a2d25c4a7bc35f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <cmn@dwim.me>
Date: Sat, 21 Sep 2013 08:32:23 +0200
Subject: [PATCH] transfer progress

---
 remote.go | 61 ++++++++++++++++++++++++++++++++++++++++++++++---------
 wrapper.c |  1 +
 2 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/remote.go b/remote.go
index 1fb2546..4dca63e 100644
--- a/remote.go
+++ b/remote.go
@@ -30,6 +30,7 @@ const (
 )
 
 type ProgressCb func([]byte) int
+type TransferProgressCb func(*TransferProgress) int
 type UpdateTipsCb func(string, *Oid, *Oid) int
 
 type Remote struct {
@@ -38,6 +39,7 @@ type Remote struct {
 
 	// callbacks
 	Progress   ProgressCb
+	TransferProgress TransferProgressCb
 	UpdateTips UpdateTipsCb
 
 	ptr  *C.git_remote
@@ -98,6 +100,24 @@ func (r *Remote) Ls() ([]*RemoteHead, error) {
 	return data.slice, nil
 }
 
+func (r *Remote) Download() error {
+	ret := C.git_remote_download(r.ptr)
+	if ret < 0 {
+		LastError()
+	}
+
+	return nil
+}
+
+func (r *Remote) Fetch() error {
+	ret := C.git_remote_fetch(r.ptr)
+	if ret < 0 {
+		LastError()
+	}
+
+	return nil
+}
+
 //export remoteProgress
 func remoteProgress(str *C.char, length C.int, data unsafe.Pointer) int {
 	remote := (*Remote)(data)
@@ -108,24 +128,27 @@ func remoteProgress(str *C.char, length C.int, data unsafe.Pointer) int {
 	return 0
 }
 
-//export remoteUpdateTips
-func remoteUpdateTips(str *C.char, a, b *C.git_oid, data unsafe.Pointer) int {
+//export remoteTransferProgress
+func remoteTransferProgress(ptr *C.git_transfer_progress, data unsafe.Pointer) int {
 	remote := (*Remote)(data)
-	if remote.UpdateTips != nil {
-		goa, gob := newOidFromC(a), newOidFromC(b)
-		return remote.UpdateTips(C.GoString(str), goa, gob)
+	if remote.TransferProgress != nil {
+		return remote.TransferProgress(newTransferProgressFromC(ptr))
 	}
 
 	return 0
 }
 
-func (r *Remote) Download() (error) {
-	ret := C.git_remote_download(r.ptr)
-	if ret < 0 {
-		LastError()
+//export remoteUpdateTips
+func remoteUpdateTips(str *C.char, a, b *C.git_oid, data unsafe.Pointer) int {
+	remote := (*Remote)(data)
+	if remote.UpdateTips != nil {
+		var goa, gob Oid
+		CopyOid(&goa, a)
+		CopyOid(&gob, b)
+		return remote.UpdateTips(C.GoString(str), &goa, &gob)
 	}
 
-	return nil
+	return 0
 }
 
 type headlistData struct {
@@ -162,6 +185,24 @@ func newRemoteFromC(ptr *C.git_remote) *Remote {
 	return remote
 }
 
+// transfer progress
+
+type TransferProgress struct {
+	TotalObjects    uint
+	IndexedObjects  uint
+	ReceivedObjects uint
+	ReceivedBytes   uint64
+}
+
+func newTransferProgressFromC(ptr *C.git_transfer_progress) *TransferProgress {
+	return &TransferProgress{
+		TotalObjects:    uint(ptr.total_objects),
+		IndexedObjects:  uint(ptr.indexed_objects),
+		ReceivedObjects: uint(ptr.received_objects),
+		ReceivedBytes:   uint64(ptr.received_bytes),
+	}
+}
+
 // remote heads
 
 // RemoteHead represents a reference available in the remote repository.
diff --git a/wrapper.c b/wrapper.c
index 150f18c..945f106 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -36,6 +36,7 @@ int _go_git_remote_set_callbacks(git_remote *remote, void *payload)
 	git_remote_callbacks cbs = GIT_REMOTE_CALLBACKS_INIT;
 
 	cbs.progress = remoteProgress;
+	cbs.transfer_progress = remoteTransferProgress;
 	cbs.update_tips = remoteUpdateTips;
 	cbs.payload = payload;