Skip to content

Added --simple option to only display the final result #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
drq883 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added --simple option to only display the final result #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b24cb38
added --simple option
drq883 Sep 19, 2017
2c4a264
up version a notch
drq883 Sep 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,23 @@ import "io"
import "net/http"
import "strconv"
import "time"
import "strings"

import "github.com/spf13/cobra"
import "github.com/gesquive/cli"
import "github.com/gesquive/fast-cli/fast"
import "github.com/gesquive/fast-cli/format"
import "github.com/gesquive/fast-cli/meters"

var version = "v0.2.8"
var version = "v0.2.9"
var dirty = ""
var displayVersion string

var cfgFile string
var logDebug bool
var notHTTPS bool
var showVersion bool
var simple bool

//RootCmd is the only command
var RootCmd = &cobra.Command{
Expand Down Expand Up @@ -60,6 +62,8 @@ func init() {

RootCmd.PersistentFlags().MarkHidden("debug")
//TODO: Allow to estimate using time or size

RootCmd.PersistentFlags().BoolVar(&simple, "simple", false, "Only display final result")
}

func initLog() {
Expand Down Expand Up @@ -137,29 +141,36 @@ func calculateBandwidth(urls []string) (err error) {
// Start reading
go asyncCopy(i, ch, &bandwidthMeter, response.Body)
}

}

cli.Infof("Estimating current download speed\n")
if (! simple ) {
cli.Infof("Estimating current download speed\n")
}
for {
select {
case results := <-ch:
if results.err != nil {
fmt.Fprintf(os.Stdout, "\n%v\n", results.err)
os.Exit(1)
}

fmt.Printf("\r%s - %s",
format.BitsPerSec(bandwidthMeter.Bandwidth()),
format.Percent(primaryBandwidthReader.BytesRead(), bytesToRead))
completed++
fmt.Printf(" \n")
fmt.Printf("Completed in %.1f seconds\n", bandwidthMeter.Duration().Seconds())
if (simple) {
fmt.Printf("%s\n",
strings.TrimSpace(format.BitsPerSec(bandwidthMeter.Bandwidth())))
} else {
fmt.Printf("\r%s - %s",
format.BitsPerSec(bandwidthMeter.Bandwidth()),
format.Percent(primaryBandwidthReader.BytesRead(), bytesToRead))
fmt.Printf(" \n")
fmt.Printf("Completed in %.1f seconds\n", bandwidthMeter.Duration().Seconds())
}
return nil
case <-time.After(100 * time.Millisecond):
fmt.Printf("\r%s - %s",
format.BitsPerSec(bandwidthMeter.Bandwidth()),
format.Percent(primaryBandwidthReader.BytesRead(), bytesToRead))
if (! simple) {
fmt.Printf("\r%s - %s",
format.BitsPerSec(bandwidthMeter.Bandwidth()),
format.Percent(primaryBandwidthReader.BytesRead(), bytesToRead))
}
}
}
}
Expand Down