From 7f41fdcfb8e7880b04eec80f258bf1141b16c4f6 Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Thu, 11 Apr 2019 13:28:35 -0700 Subject: [PATCH] start to add spinner --- go.mod | 2 ++ go.sum | 4 ++++ src/webrtc/pkg/session/receiver/receiver.go | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/go.mod b/go.mod index 54ba87bc..b11403de 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.12 require ( github.com/denisbrodbeck/machineid v1.0.1 + github.com/fatih/color v1.7.0 // indirect github.com/go-redis/redis v6.15.2+incompatible github.com/mattn/go-colorable v0.1.1 github.com/pion/webrtc/v2 v2.0.2 @@ -12,6 +13,7 @@ require ( 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/spinner v0.0.0-20180925172146-6bbc5f7804f9 github.com/sirupsen/logrus v1.4.1 github.com/stretchr/testify v1.3.0 golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5 diff --git a/go.sum b/go.sum index 6c58be71..61127ecb 100644 --- a/go.sum +++ b/go.sum @@ -5,6 +5,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisbrodbeck/machineid v1.0.1 h1:geKr9qtkB876mXguW2X6TU4ZynleN6ezuMSRhl4D7AQ= github.com/denisbrodbeck/machineid v1.0.1/go.mod h1:dJUwb7PTidGDeYyUBmXZ2GphQBbjJCrnectwCyxcUSI= +github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/go-redis/redis v6.15.2+incompatible h1:9SpNVG76gr6InJGxoZ6IuuxaCOQwDAhzyXg+Bs+0Sb4= @@ -106,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/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= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/src/webrtc/pkg/session/receiver/receiver.go b/src/webrtc/pkg/session/receiver/receiver.go index c8521f5e..c8d19110 100644 --- a/src/webrtc/pkg/session/receiver/receiver.go +++ b/src/webrtc/pkg/session/receiver/receiver.go @@ -16,6 +16,7 @@ import ( internalSess "github.com/schollz/croc/v5/src/webrtc/internal/session" "github.com/schollz/croc/v5/src/webrtc/pkg/session/common" "github.com/schollz/progressbar/v2" + "github.com/schollz/spinner" logrus "github.com/sirupsen/logrus" ) @@ -218,6 +219,10 @@ func (s *Session) receiveData(pathToFile string, fileSize int64) error { } func (s *Session) CreateConnection() (err error) { + s.spinner = spinner.New(spinner.CharSets[9], 100*time.Millisecond) + s.spinner.Writer = os.Stderr + s.spinner.Suffix = " connecting..." + return s.sess.CreateConnection(s.onConnectionStateChange()) }