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

use external ip in ui

Browse source
This commit is contained in:
Zack Scholl 2019-05-01 17:49:49 -06:00
parent 359dc4549b
commit 67f69c892d
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/croc/croc.go
View file

@ -507,7 +507,7 @@ func (c *Client) processMessage(payload []byte) (done bool, err error) {
} }
// c.spinner.Stop() // c.spinner.Stop()
if !c.Options.NoPrompt { if !c.Options.NoPrompt {
fmt.Fprintf(os.Stderr, "\rAccept %s (%s) from machine '%s'? (y/n) ", fname, utils.ByteCountDecimal(totalSize), senderInfo.MachineID) fmt.Fprintf(os.Stderr, "\rAccept %s (%s)? (y/n) ", fname, utils.ByteCountDecimal(totalSize))
if strings.ToLower(strings.TrimSpace(utils.GetInput(""))) != "y" { if strings.ToLower(strings.TrimSpace(utils.GetInput(""))) != "y" {
err = message.Send(c.conn[0], c.Key, message.Message{ err = message.Send(c.conn[0], c.Key, message.Message{
Type: "error", Type: "error",
@ -516,8 +516,10 @@ func (c *Client) processMessage(payload []byte) (done bool, err error) {
return true, fmt.Errorf("refused files") return true, fmt.Errorf("refused files")
} }
} else { } else {
fmt.Fprintf(os.Stderr, "\rReceiving %s (%s) from machine '%s'\n", fname, utils.ByteCountDecimal(totalSize), senderInfo.MachineID) fmt.Fprintf(os.Stderr, "\rReceiving %s (%s) \n", fname, utils.ByteCountDecimal(totalSize))
} }
fmt.Fprintf(os.Stderr, "\nReceiving (<-%s)\n", c.ExternalIPConnected)
log.Debug(c.FilesToTransfer) log.Debug(c.FilesToTransfer)
c.Step2FileInfoTransfered = true c.Step2FileInfoTransfered = true
case "recipientready": case "recipientready":
@ -669,6 +671,7 @@ func (c *Client) updateState() (err error) {
} }
if c.Options.IsSender && c.Step3RecipientRequestFile && !c.Step4FileTransfer { if c.Options.IsSender && c.Step3RecipientRequestFile && !c.Step4FileTransfer {
log.Debug("start sending data!") log.Debug("start sending data!")
fmt.Fprintf(os.Stderr, "\nSending (->%s)\n", c.ExternalIPConnected)
c.Step4FileTransfer = true c.Step4FileTransfer = true
// setup the progressbar // setup the progressbar
c.setBar() c.setBar()