这是indexloc提供的服务，不要输入任何密码
Skip to content

Make RefreshInterval configurable and render bars one last time at Stop() #24

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make RefreshInterval configurable and render bars one last time at Stop() #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57e995b
Make RefreshInterval configurable
rck Jan 4, 2017
4bba581
Render bars at Stop() one last time
rck Jan 4, 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
33 changes: 25 additions & 8 deletions progress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var Out = os.Stdout
var RefreshInterval = time.Millisecond * 10

// defaultProgress is the default progress
var defaultProgress = New()
var defaultProgress *Progress

// Progress represents the container that renders progress bars
type Progress struct {
Expand Down Expand Up @@ -54,21 +54,32 @@ func New() *Progress {

// AddBar creates a new progress bar and adds it to the default progress container
func AddBar(total int) *Bar {
if defaultProgress == nil {
defaultProgress = New()
}
return defaultProgress.AddBar(total)
}

// Start starts the rendering the progress of progress bars using the DefaultProgress. It listens for updates using `bar.Set(n)` and new bars when added using `AddBar`
func Start() {
if defaultProgress == nil {
defaultProgress = New()
}
defaultProgress.Start()
}

// Stop stops listening
func Stop() {
defaultProgress.Stop()
if defaultProgress != nil {
defaultProgress.Stop()
}
}

// Listen listens for updates and renders the progress bars
func Listen() {
if defaultProgress == nil {
defaultProgress = New()
}
defaultProgress.Listen()
}

Expand All @@ -83,6 +94,16 @@ func (p *Progress) AddBar(total int) *Bar {
return bar
}

func (p *Progress) renderBars() {
p.mtx.RLock()
for _, bar := range p.Bars {
fmt.Fprintln(p.lw, bar.String())
}
p.lw.Flush()
p.mtx.RUnlock()

}

// Listen listens for updates and renders the progress bars
func (p *Progress) Listen() {
p.lw.Out = p.Out
Expand All @@ -92,12 +113,7 @@ func (p *Progress) Listen() {
return
default:
time.Sleep(p.RefreshInterval)
p.mtx.RLock()
for _, bar := range p.Bars {
fmt.Fprintln(p.lw, bar.String())
}
p.lw.Flush()
p.mtx.RUnlock()
p.renderBars()
}
}
}
Expand All @@ -114,6 +130,7 @@ func (p *Progress) Start() {
func (p *Progress) Stop() {
close(p.stopChan)
p.stopChan = nil
p.renderBars()
}

// Bypass returns a writer which allows non-buffered data to be written to the underlying output
Expand Down