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

Show data usage in summary of measurements

Browse Source
This commit is contained in:
Arturo Filastò 2018-09-12 15:41:54 +02:00
parent 2b1fb662fb
commit b1ae8bc13e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/cli/list/list.go
View File

@ -34,11 +34,11 @@ func init() {
TotalRuntime: 0, TotalRuntime: 0,
} }
for _, msmt := range measurements { for _, msmt := range measurements {
// We assume that since these are summary level information the first
// item will contain the information necessary.
if msmtSummary.TotalRuntime == 0 { if msmtSummary.TotalRuntime == 0 {
msmtSummary.TotalRuntime = msmt.ResultRuntime msmtSummary.TotalRuntime = msmt.ResultRuntime
} }
// FIXME this logic should be adjusted for test groups that have many
// measurements in them
if msmtSummary.DataUsageUp == 0 { if msmtSummary.DataUsageUp == 0 {
msmtSummary.DataUsageUp = msmt.DataUsageUp msmtSummary.DataUsageUp = msmt.DataUsageUp
msmtSummary.DataUsageDown = msmt.DataUsageDown msmtSummary.DataUsageDown = msmt.DataUsageDown

1
internal/database/actions.go
View File

@ -34,6 +34,7 @@ func ListMeasurements(sess sqlbuilder.Database, resultID int64) ([]MeasurementUR
db.Raw("networks.*"), db.Raw("networks.*"),
db.Raw("urls.*"), db.Raw("urls.*"),
db.Raw("measurements.*"), db.Raw("measurements.*"),
db.Raw("results.*"),
).From("results"). ).From("results").
Join("measurements").On("results.id = measurements.result_id"). Join("measurements").On("results.id = measurements.result_id").
Join("networks").On("results.network_id = networks.id"). Join("networks").On("results.network_id = networks.id").