From 826154caa25c34bc7846b3979c3d8aafac8790ee Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Fri, 12 Apr 2019 09:22:51 -0700 Subject: [PATCH] use oncompletion --- go.mod | 2 +- go.sum | 2 ++ src/webrtc/pkg/session/sender/sender.go | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index b11403de..a684fabc 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/pkg/errors v0.8.1 github.com/schollz/mnemonicode v1.0.1 github.com/schollz/pake v1.1.0 - github.com/schollz/progressbar/v2 v2.11.0 + github.com/schollz/progressbar/v2 v2.12.0 github.com/schollz/spinner v0.0.0-20180925172146-6bbc5f7804f9 github.com/sirupsen/logrus v1.4.1 github.com/stretchr/testify v1.3.0 diff --git a/go.sum b/go.sum index 61127ecb..573aedb2 100644 --- a/go.sum +++ b/go.sum @@ -108,6 +108,8 @@ github.com/schollz/pake v1.1.0 h1:+tYqsPVkuirFpmeRePjYTUhIHHKLufdmd7QfuspaXCk= github.com/schollz/pake v1.1.0/go.mod h1:pL7Z08gnQ4OQ3G27s5e5T6TEzp6cFc5GzCwLm0f75Io= github.com/schollz/progressbar/v2 v2.11.0 h1:lQZYMKqH/kSSOc9rjL+9sa4bZavGS6EkBAZKKYdOjz4= github.com/schollz/progressbar/v2 v2.11.0/go.mod h1:fBI3onORwtNtwCWJHsrXtjE3QnJOtqIZrvr3rDaF7L0= +github.com/schollz/progressbar/v2 v2.12.0 h1:eTkmx9oWkRqi+rAzSDsreLbwGHvlrLJDR8xzmO0ccDI= +github.com/schollz/progressbar/v2 v2.12.0/go.mod h1:fBI3onORwtNtwCWJHsrXtjE3QnJOtqIZrvr3rDaF7L0= github.com/schollz/spinner v0.0.0-20180925172146-6bbc5f7804f9 h1:y08o5oQ/slxXE/F0uh5dd8mdVvb+w4NLcNSDSq4c2F0= github.com/schollz/spinner v0.0.0-20180925172146-6bbc5f7804f9/go.mod h1:kCMoQsqzx4MzGJWaALr6tKyCnlrY0kILGLkA1FOiLF4= github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k= diff --git a/src/webrtc/pkg/session/sender/sender.go b/src/webrtc/pkg/session/sender/sender.go index 16c70f8a..92288ad8 100644 --- a/src/webrtc/pkg/session/sender/sender.go +++ b/src/webrtc/pkg/session/sender/sender.go @@ -262,9 +262,11 @@ func (s *Session) onBufferedAmountLow() func() { if s.firstByte { s.firstByte = false s.spinner.Stop() - fmt.Fprint(os.Stderr, "\n") s.bar = progressbar.NewOptions64( s.fileSize, + progressbar.OptionOnCompletion(func() { + fmt.Println(" done") + }), progressbar.OptionSetWidth(8), progressbar.OptionSetDescription(s.fname), progressbar.OptionSetRenderBlankState(true),