diff options
author | Christian Pointner <equinox@helsinki.at> | 2016-07-15 15:56:01 (GMT) |
---|---|---|
committer | Christian Pointner <equinox@helsinki.at> | 2016-07-15 15:56:01 (GMT) |
commit | 49a33ef6dcfccda67c9afc54d4dc061a74dfbb6d (patch) | |
tree | 96157f947c171d17cae04550c7a038b31d62a03a /rhimport/session.go | |
parent | f4801e4f33eb9683dacefdac0687eaa217b01213 (diff) |
progress messages now contain file title
Diffstat (limited to 'rhimport/session.go')
-rw-r--r-- | rhimport/session.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/rhimport/session.go b/rhimport/session.go index a5f4a04..e0d6efb 100644 --- a/rhimport/session.go +++ b/rhimport/session.go @@ -72,6 +72,7 @@ type ProgressData struct { StepName string Current float64 Total float64 + Title string Cart uint Cut uint } @@ -96,9 +97,9 @@ type sessionAddDoneHandlerRequest struct { response chan<- sessionAddDoneHandlerResponse } -func sessionProgressCallback(step int, stepName string, current, total float64, cart, cut uint, userdata interface{}) bool { +func sessionProgressCallback(step int, stepName string, current, total float64, title string, cart, cut uint, userdata interface{}) bool { out := userdata.(chan<- ProgressData) - out <- ProgressData{step, stepName, current, total, cart, cut} + out <- ProgressData{step, stepName, current, total, title, cart, cut} return true } @@ -178,7 +179,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.Current, p.Total, p.Cart, p.Cut, cb.userdata); !keep { + if keep := cb.cb(p.Step, p.StepName, p.Current, p.Total, p.Title, p.Cart, p.Cut, cb.userdata); !keep { cb.cb = nil } } |