fix: progressbar width

Author: schollz

src/cli/cli.go

@@ -36,7 +36,7 @@ func Run() (err error) {
 	app := cli.NewApp()
 	app.Name = "croc"
 	if Version == "" {
-		Version = "v10.4.1"
+		Version = "v10.4.2"
 	}
 	app.Version = Version
 	app.Compiled = time.Now()
@@ -309,33 +309,33 @@ func send(c *cli.Context) (err error) {
 	}
 
 	crocOptions := croc.Options{
-		SharedSecret:     c.String("code"),
-		IsSender:         true,
-		Debug:            c.Bool("debug"),
-		NoPrompt:         c.Bool("yes"),
-		RelayAddress:     c.String("relay"),
-		RelayAddress6:    c.String("relay6"),
-		Stdout:           c.Bool("stdout"),
-		DisableLocal:     c.Bool("no-local"),
-		OnlyLocal:        c.Bool("local"),
-		IgnoreStdin:      c.Bool("ignore-stdin"),
-		RelayPorts:       ports,
-		Ask:              c.Bool("ask"),
-		NoMultiplexing:   c.Bool("no-multi"),
-		RelayPassword:    determinePass(c),
-		SendingText:      c.String("text") != "",
-		NoCompress:       c.Bool("no-compress"),
-		Overwrite:        c.Bool("overwrite"),
-		Curve:            c.String("curve"),
-		HashAlgorithm:    c.String("hash"),
-		ThrottleUpload:   c.String("throttleUpload"),
-		ZipFolder:        c.Bool("zip"),
-		GitIgnore:        c.Bool("git"),
-		ShowQrCode:       c.Bool("qrcode"),
-		MulticastAddress: c.String("multicast"),
-		Exclude:          excludeStrings,
-		Quiet:            c.Bool("quiet"),
-		DisableClipboard: c.Bool("disable-clipboard"),
+		SharedSecret:      c.String("code"),
+		IsSender:          true,
+		Debug:             c.Bool("debug"),
+		NoPrompt:          c.Bool("yes"),
+		RelayAddress:      c.String("relay"),
+		RelayAddress6:     c.String("relay6"),
+		Stdout:            c.Bool("stdout"),
+		DisableLocal:      c.Bool("no-local"),
+		OnlyLocal:         c.Bool("local"),
+		IgnoreStdin:       c.Bool("ignore-stdin"),
+		RelayPorts:        ports,
+		Ask:               c.Bool("ask"),
+		NoMultiplexing:    c.Bool("no-multi"),
+		RelayPassword:     determinePass(c),
+		SendingText:       c.String("text") != "",
+		NoCompress:        c.Bool("no-compress"),
+		Overwrite:         c.Bool("overwrite"),
+		Curve:             c.String("curve"),
+		HashAlgorithm:     c.String("hash"),
+		ThrottleUpload:    c.String("throttleUpload"),
+		ZipFolder:         c.Bool("zip"),
+		GitIgnore:         c.Bool("git"),
+		ShowQrCode:        c.Bool("qrcode"),
+		MulticastAddress:  c.String("multicast"),
+		Exclude:           excludeStrings,
+		Quiet:             c.Bool("quiet"),
+		DisableClipboard:  c.Bool("disable-clipboard"),
 		ExtendedClipboard: c.Bool("extended-clipboard"),
 	}
 	if crocOptions.RelayAddress != models.DEFAULT_RELAY {
@@ -612,23 +612,23 @@ func receive(c *cli.Context) (err error) {
 	comm.Socks5Proxy = c.String("socks5")
 	comm.HttpProxy = c.String("connect")
 	crocOptions := croc.Options{
-		SharedSecret:     c.String("code"),
-		IsSender:         false,
-		Debug:            c.Bool("debug"),
-		NoPrompt:         c.Bool("yes"),
-		RelayAddress:     c.String("relay"),
-		RelayAddress6:    c.String("relay6"),
-		Stdout:           c.Bool("stdout"),
-		Ask:              c.Bool("ask"),
-		RelayPassword:    determinePass(c),
-		OnlyLocal:        c.Bool("local"),
-		IP:               c.String("ip"),
-		Overwrite:        c.Bool("overwrite"),
-		Curve:            c.String("curve"),
-		TestFlag:         c.Bool("testing"),
-		MulticastAddress: c.String("multicast"),
-		Quiet:            c.Bool("quiet"),
-		DisableClipboard: c.Bool("disable-clipboard"),
+		SharedSecret:      c.String("code"),
+		IsSender:          false,
+		Debug:             c.Bool("debug"),
+		NoPrompt:          c.Bool("yes"),
+		RelayAddress:      c.String("relay"),
+		RelayAddress6:     c.String("relay6"),
+		Stdout:            c.Bool("stdout"),
+		Ask:               c.Bool("ask"),
+		RelayPassword:     determinePass(c),
+		OnlyLocal:         c.Bool("local"),
+		IP:                c.String("ip"),
+		Overwrite:         c.Bool("overwrite"),
+		Curve:             c.String("curve"),
+		TestFlag:          c.Bool("testing"),
+		MulticastAddress:  c.String("multicast"),
+		Quiet:             c.Bool("quiet"),
+		DisableClipboard:  c.Bool("disable-clipboard"),
 		ExtendedClipboard: c.Bool("extended-clipboard"),
 	}
 	if crocOptions.RelayAddress != models.DEFAULT_RELAY {

src/croc/croc.go

@@ -1798,21 +1798,37 @@ func (c *Client) recipientGetFileReady(finished bool) (err error) {
 	return
 }
 
-func max(a int, b int) int {
-	if a > b {
-		return a
+func formatDescription(description string) string {
+	const (
+		// Reserve extra room for variable progress metadata such as [elapsed:remaining].
+		progressMetaWidth = 78
+		minDescription    = 12
+		defaultTermWidth  = 80
+	)
+
+	width, _, err := term.GetSize(int(os.Stderr.Fd()))
+	if err != nil || width <= 0 {
+		width, _, err = term.GetSize(int(os.Stdout.Fd()))
+	}
+	if err != nil || width <= 0 {
+		if envColumns, convErr := strconv.Atoi(os.Getenv("COLUMNS")); convErr == nil && envColumns > 0 {
+			width = envColumns
+		} else {
+			width = defaultTermWidth
+		}
 	}
-	return b
-}
 
-func formatDescription(description string) string {
-	width, _, err := term.GetSize(int(os.Stdout.Fd()))
-	width = max(20, width-60)
-	if err != nil {
-		return description
+	maxDescription := width - progressMetaWidth
+	if maxDescription < minDescription {
+		maxDescription = minDescription
 	}
-	if len(description) > width {
-		description = description[:(width-3)] + "..."
+
+	runes := []rune(description)
+	if len(runes) > maxDescription {
+		if maxDescription <= 3 {
+			return string(runes[:maxDescription])
+		}
+		return string(runes[:maxDescription-3]) + "..."
 	}
 	return description
 }

src/install/default.txt

@@ -554,7 +554,7 @@ main() {
   local autocomplete_install_rcode
 
   croc_bin_name="croc"
-  croc_version="10.4.1"
+  croc_version="10.4.2"
   croc_dl_ext="tar.gz"
   croc_base_url="https://github.com/schollz/croc/releases/download"
   prefix="${1}"