From 3bf7635f339cb0cc2b4b7a8bb9d094a59006577d Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Tue, 30 Apr 2019 08:58:09 -0700 Subject: [PATCH] improve ui --- src/croc/croc.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/croc/croc.go b/src/croc/croc.go index 836a66f..bf5fe73 100644 --- a/src/croc/croc.go +++ b/src/croc/croc.go @@ -509,10 +509,10 @@ func (c *Client) updateState() (err error) { c.bar = progressbar.NewOptions64( c.FilesToTransfer[c.FilesToTransferCurrentNum].Size, progressbar.OptionOnCompletion(func() { - fmt.Println(" ✔️") + fmt.Fprintf(os.Stderr, " ✔️\n") }), progressbar.OptionSetWidth(8), - progressbar.OptionSetDescription(c.FilesToTransfer[c.FilesToTransferCurrentNum].Name), + progressbar.OptionSetDescription(fmt.Sprintf("%28s", c.FilesToTransfer[c.FilesToTransferCurrentNum].Name)), progressbar.OptionSetRenderBlankState(true), progressbar.OptionSetBytes64(c.FilesToTransfer[c.FilesToTransferCurrentNum].Size), progressbar.OptionSetWriter(os.Stderr), @@ -540,10 +540,10 @@ func (c *Client) updateState() (err error) { c.bar = progressbar.NewOptions64( c.FilesToTransfer[c.FilesToTransferCurrentNum].Size, progressbar.OptionOnCompletion(func() { - fmt.Println(" ✔️") + fmt.Fprintf(os.Stderr, " ✔️\n") }), progressbar.OptionSetWidth(8), - progressbar.OptionSetDescription(c.FilesToTransfer[c.FilesToTransferCurrentNum].Name), + progressbar.OptionSetDescription(fmt.Sprintf("%28s", c.FilesToTransfer[c.FilesToTransferCurrentNum].Name)), progressbar.OptionSetRenderBlankState(true), progressbar.OptionSetBytes64(c.FilesToTransfer[c.FilesToTransferCurrentNum].Size), progressbar.OptionSetWriter(os.Stderr), @@ -563,8 +563,7 @@ func (c *Client) receiveData(i int) { log.Debug("waiting for data") data, err := c.conn[i].Receive() if err != nil { - log.Errorf("%s: %s", i, err.Error()) - continue + break } data, err = c.Key.Decrypt(data) @@ -578,7 +577,7 @@ func (c *Client) receiveData(i int) { rbuf := bytes.NewReader(data[:8]) err = binary.Read(rbuf, binary.LittleEndian, &position) if err != nil { - fmt.Println("binary.Read failed:", err) + panic(err) } positionInt64 := int64(position)