summaryrefslogtreecommitdiff
path: root/rhimport/session.go
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2016-06-27 18:52:38 (GMT)
committerChristian Pointner <equinox@helsinki.at>2016-06-27 18:52:38 (GMT)
commit92b427a54c5782fea71af3709ac564ba4dc67e57 (patch)
treed57896e8be36a52ee52c8b29e0ce51f84e19f02d /rhimport/session.go
parent70a371f16e7a92821161e771a40b63c84fd194ea (diff)
changed signature of progress callback
Diffstat (limited to 'rhimport/session.go')
-rw-r--r--rhimport/session.go9
1 files changed, 5 insertions, 4 deletions
diff --git a/rhimport/session.go b/rhimport/session.go
index 84d283e..ece5303 100644
--- a/rhimport/session.go
+++ b/rhimport/session.go
@@ -70,7 +70,8 @@ type SessionDoneCB struct {
type ProgressData struct {
Step int
StepName string
- Progress float64
+ Current float64
+ Total float64
}
type sessionAddProgressHandlerResponse struct {
@@ -93,9 +94,9 @@ type sessionAddDoneHandlerRequest struct {
response chan<- sessionAddDoneHandlerResponse
}
-func sessionProgressCallback(step int, stepName string, progress float64, userdata interface{}) bool {
+func sessionProgressCallback(step int, stepName string, current, total float64, userdata interface{}) bool {
out := userdata.(chan<- ProgressData)
- out <- ProgressData{step, stepName, progress}
+ out <- ProgressData{step, stepName, current, total}
return true
}
@@ -163,7 +164,7 @@ func (self *Session) addDoneHandler(userdata interface{}, cb DoneCB) (resp sessi
func (self *Session) callProgressHandler(p *ProgressData) {
for _, cb := range self.progressCBs {
if cb.cb != nil {
- if keep := cb.cb(p.Step, p.StepName, p.Progress, cb.userdata); !keep {
+ if keep := cb.cb(p.Step, p.StepName, p.Current, p.Total, cb.userdata); !keep {
cb.cb = nil
}
}