Add human-readable file size formatting and update related components

Author: kplgr

.github/workflows/main.yml

@@ -15,7 +15,7 @@ jobs:
         with:
           go-version: "1.25"
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Lint code
         uses: golangci/golangci-lint-action@v9
       - name: Run tests

go.mod

@@ -31,10 +31,10 @@ require (
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/tinylib/msgp v1.6.1 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/crypto v0.46.0 // indirect
+	golang.org/x/net v0.48.0 // indirect
+	golang.org/x/sys v0.39.0 // indirect
+	golang.org/x/text v0.32.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -65,14 +65,14 @@ github.com/tinylib/msgp v1.6.1 h1:ESRv8eL3u+DNHUoSAAQRE50Hm162zqAnBoGv9PzScPY=
 github.com/tinylib/msgp v1.6.1/go.mod h1:RSp0LW9oSxFut3KzESt5Voq4GVWyS+PSulT77roAqEA=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
-golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
+golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
+golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
+golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
+golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

internal/app/s3manager/format_size.go

@@ -0,0 +1,27 @@
+package s3manager
+
+import "fmt"
+
+// FormatFileSize converts a size in bytes to a human-readable string using the largest appropriate unit.
+func FormatFileSize(size int64) string {
+	const (
+		KB = 1024.0
+		MB = 1024.0 * KB
+		GB = 1024.0 * MB
+		TB = 1024.0 * GB
+	)
+
+	sizeF := float64(size)
+	switch {
+	case sizeF >= TB:
+		return fmt.Sprintf("%.2f TB", sizeF/TB)
+	case sizeF >= GB:
+		return fmt.Sprintf("%.2f GB", sizeF/GB)
+	case sizeF >= MB:
+		return fmt.Sprintf("%.2f MB", sizeF/MB)
+	case sizeF >= KB:
+		return fmt.Sprintf("%.2f KB", sizeF/KB)
+	default:
+		return fmt.Sprintf("%d bytes", size)
+	}
+}

internal/app/s3manager/format_size_test.go

@@ -0,0 +1,30 @@
+package s3manager
+
+import "testing"
+
+func TestFormatFileSize(t *testing.T) {
+	tests := []struct {
+		bytes    int64
+		expected string
+	}{
+		{0, "0 bytes"},
+		{1, "1 bytes"},
+		{512, "512 bytes"},
+		{1023, "1023 bytes"},
+		{1024, "1.00 KB"},
+		{1536, "1.50 KB"},
+		{1048576, "1.00 MB"},
+		{1572864, "1.50 MB"},
+		{1073741824, "1.00 GB"},
+		{1610612736, "1.50 GB"},
+		{1099511627776, "1.00 TB"},
+		{1649267441664, "1.50 TB"},
+	}
+
+	for _, test := range tests {
+		result := FormatFileSize(test.bytes)
+		if result != test.expected {
+			t.Errorf("FormatFileSize(%d) = %q; want %q", test.bytes, result, test.expected)
+		}
+	}
+}

internal/app/s3manager/manager_handlers.go

@@ -142,6 +142,7 @@ func createBucketViewWithS3Data(s3 S3, templates fs.FS, allowDelete bool, listRe
 	type objectWithIcon struct {
 		Key          string
 		Size         int64
+		SizeDisplay  string
 		LastModified time.Time
 		Owner        string
 		Icon         string
@@ -191,9 +192,12 @@ func createBucketViewWithS3Data(s3 S3, templates fs.FS, allowDelete bool, listRe
 				break
 			}
 
+			sizeDisplay := FormatFileSize(object.Size)
+
 			obj := objectWithIcon{
 				Key:          object.Key,
 				Size:         object.Size,
+				SizeDisplay:  sizeDisplay,
 				LastModified: object.LastModified,
 				Owner:        object.Owner.DisplayName,
 				Icon:         icon(object.Key),

web/template/bucket.html.tmpl

@@ -92,7 +92,7 @@
                     {{ end }}>
                     <i class="material-icons">{{ $object.Icon }}</i> {{ $object.DisplayName }}
                 </td>
-                <td>{{ $object.Size }} bytes</td>
+                <td>{{ $object.SizeDisplay }}</td>
                 <td>{{ $object.Owner }}</td>
                 <td>{{ $object.LastModified }}</td>
                 <td>