mirrors_public/schollz_croc
1
1
Fork 0
mirror of https://github.com/schollz/croc.git synced 2025-10-11 13:21:00 +02:00
Code Activity

update progressbar, show external ip on receiver

Browse source
This commit is contained in:
Zack Scholl 2020-03-31 13:33:27 -07:00
parent b0125b63e7
commit 72378947b5
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/croc/croc.go
View file

@ -29,7 +29,7 @@ import (
log "github.com/schollz/logger"
"github.com/schollz/pake/v2"
"github.com/schollz/peerdiscovery"
"github.com/schollz/progressbar/v2"
"github.com/schollz/progressbar/v3"
"github.com/schollz/spinner"
"github.com/tscholl2/siec"
)
@ -707,15 +707,16 @@ func (c *Client) processMessageSalt(m message.Message) (done bool, err error) {
if c.Options.IsSender {
log.Debug("sending external IP")
err = message.Send(c.conn[0], c.Key, message.Message{
Type: "externalip",
Bytes: m.Bytes,
Type: "externalip",
Message: c.ExternalIP,
Bytes: m.Bytes,
})
}
return
}
func (c *Client) processExternalIP(m message.Message) (done bool, err error) {
log.Debug("received external IP")
log.Debug("received external IP: %+v", m)
if !c.Options.IsSender {
err = message.Send(c.conn[0], c.Key, message.Message{
Type: "externalip",
@ -970,7 +971,7 @@ func (c *Client) createEmptyFileAndFinish(fileInfo FileInfo, i int) (err error)
progressbar.OptionSetWidth(20),
progressbar.OptionSetDescription(description),
progressbar.OptionSetRenderBlankState(true),
progressbar.OptionSetBytes64(1),
progressbar.OptionShowBytes(true),
progressbar.OptionSetWriter(os.Stderr),
)
c.bar.Finish()
@ -1054,7 +1055,7 @@ func (c *Client) updateState() (err error) {
progressbar.OptionSetWidth(20),
progressbar.OptionSetDescription(description),
progressbar.OptionSetRenderBlankState(true),
progressbar.OptionSetBytes64(1),
progressbar.OptionShowBytes(true),
progressbar.OptionSetWriter(os.Stderr),
)
c.bar.Finish()
@ -1097,7 +1098,7 @@ func (c *Client) setBar() {
progressbar.OptionSetWidth(20),
progressbar.OptionSetDescription(description),
progressbar.OptionSetRenderBlankState(true),
progressbar.OptionSetBytes64(c.FilesToTransfer[c.FilesToTransferCurrentNum].Size),
progressbar.OptionShowBytes(true),
progressbar.OptionSetWriter(os.Stderr),
progressbar.OptionThrottle(100*time.Millisecond),
)