feat: show progress in bytes

satisfactorymodding · Dec 29, 2023 · b1da443 · b1da443
1 parent 5d48312
commit b1da443
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/go.mod b/go.mod
@@ -15,6 +15,7 @@ require (
 	github.com/charmbracelet/glamour v0.6.0
 	github.com/charmbracelet/lipgloss v0.9.1
 	github.com/charmbracelet/x/exp/teatest v0.0.0-20231215171016-7ba2b450712d
+	github.com/dustin/go-humanize v1.0.1
 	github.com/jackc/puddle/v2 v2.2.1
 	github.com/jlaffaye/ftp v0.2.0
 	github.com/lmittmann/tint v1.0.3

diff --git a/go.sum b/go.sum
@@ -78,6 +78,8 @@ github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55k
 github.com/dlclark/regexp2 v1.10.0 h1:+/GIL799phkJqYW+3YbOd8LCcbHzT0Pbo8zl70MHsq0=
 github.com/dlclark/regexp2 v1.10.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=

diff --git a/tea/scenes/apply.go b/tea/scenes/apply.go
@@ -7,6 +7,7 @@ import (
 	"github.com/charmbracelet/bubbles/progress"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
+	"github.com/dustin/go-humanize"
 	"github.com/muesli/reflow/wrap"
 
 	"github.com/satisfactorymodding/ficsit-cli/cli"
@@ -272,13 +273,21 @@ func (m apply) View() string {
 							lipgloss.Left,
 							m.sub.ViewAs(p.downloadProgress.Percentage()),
 							" - ",
+							humanize.Bytes(uint64(p.downloadProgress.Completed)),
+							"/",
+							humanize.Bytes(uint64(p.downloadProgress.Total)),
+							" - ",
 							lipgloss.NewStyle().Render(modReference+" (Downloading)"),
 						)))
 					} else {
 						strs = append(strs, lipgloss.NewStyle().MarginLeft(1).Render(lipgloss.JoinHorizontal(
 							lipgloss.Left,
 							m.sub.ViewAs(p.extractProgress.Percentage()),
 							" - ",
+							humanize.Bytes(uint64(p.extractProgress.Completed)),
+							"/",
+							humanize.Bytes(uint64(p.extractProgress.Total)),
+							" - ",
 							lipgloss.NewStyle().Render(modReference+" (Extracting)"),
 						)))
 					}