c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust the progress bars depending on the test type

Browse Source
This commit is contained in:
Arturo Filastò 2018-09-24 15:57:28 +02:00
parent 4fc745172d
commit a60f376846
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/cli/run/run.go
View File

@ -80,9 +80,10 @@ func init() {
return err return err
} }
for _, nt := range group.Nettests { for i, nt := range group.Nettests {
log.Debugf("Running test %T", nt) log.Debugf("Running test %T", nt)
ctl := nettests.NewController(nt, ctx, result) ctl := nettests.NewController(nt, ctx, result)
ctl.SetNettestIndex(i, len(group.Nettests))
if err = nt.Run(ctl); err != nil { if err = nt.Run(ctl); err != nil {
log.WithError(err).Errorf("Failed to run %s", group.Label) log.WithError(err).Errorf("Failed to run %s", group.Label)
return err return err

18
nettests/nettests.go
View File

@ -45,6 +45,8 @@ type Controller struct {
Ctx *ooni.Context Ctx *ooni.Context
res *database.Result res *database.Result
nt Nettest nt Nettest
ntCount int
ntIndex int
msmts map[int64]*database.Measurement msmts map[int64]*database.Measurement
msmtPath string // XXX maybe we can drop this and just use a temporary file msmtPath string // XXX maybe we can drop this and just use a temporary file
inputIdxMap map[int64]int64 // Used to map mk idx to database id inputIdxMap map[int64]int64 // Used to map mk idx to database id
@ -58,11 +60,21 @@ func getCaBundlePath() string {
return "/etc/ssl/cert.pem" return "/etc/ssl/cert.pem"
} }
// SetInputIdxMap is used to set the mapping of index into input. This mapping
// is used to reference, for example, a particular URL based on the index inside
// of the input list and the index of it in the database.
func (c *Controller) SetInputIdxMap(inputIdxMap map[int64]int64) error { func (c *Controller) SetInputIdxMap(inputIdxMap map[int64]int64) error {
c.inputIdxMap = inputIdxMap c.inputIdxMap = inputIdxMap
return nil return nil
} }
// SetNettestIndex is used to set the current nettest index and total nettest
// count to compute a different progress percentage.
func (c *Controller) SetNettestIndex(i, n int) {
c.ntCount = n
c.ntIndex = i
}
// Init should be called once to initialise the nettest // Init should be called once to initialise the nettest
func (c *Controller) Init(nt *mk.Nettest) error { func (c *Controller) Init(nt *mk.Nettest) error {
log.Debugf("Init: %v", nt) log.Debugf("Init: %v", nt)
@ -157,7 +169,11 @@ func (c *Controller) Init(nt *mk.Nettest) error {
nt.On("status.progress", func(e mk.Event) { nt.On("status.progress", func(e mk.Event) {
log.Debugf(color.RedString(e.Key)) log.Debugf(color.RedString(e.Key))
c.OnProgress(e.Value.Percentage, e.Value.Message) perc := e.Value.Percentage
if c.ntCount > 0 {
perc = float64(c.ntIndex)/float64(c.ntCount) + perc/float64(c.ntCount)
}
c.OnProgress(perc, e.Value.Message)
}) })
nt.On("status.update.*", func(e mk.Event) { nt.On("status.update.*", func(e mk.Event) {