Add human-readable file size formatting and update related components

Author: kplgr

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,17 @@ func createBucketViewWithS3Data(s3 S3, templates fs.FS, allowDelete bool, listRe
 				break
 			}
 
+			var sizeDisplay string
+			if current != nil && current.HumanReadableSize {
+				sizeDisplay = FormatFileSize(object.Size)
+			} else {
+				sizeDisplay = fmt.Sprintf("%d bytes", object.Size)
+			}
+
 			obj := objectWithIcon{
 				Key:          object.Key,
 				Size:         object.Size,
+				SizeDisplay:  sizeDisplay,
 				LastModified: object.LastModified,
 				Owner:        object.Owner.DisplayName,
 				Icon:         icon(object.Key),

internal/app/s3manager/multi_s3_manager.go

@@ -38,6 +38,7 @@ type S3InstanceConfig struct {
 	UseSSL              bool
 	SkipSSLVerification bool
 	SignatureType       string
+	HumanReadableSize   bool
 }
 
 // NewMultiS3Manager creates a new MultiS3Manager with the given configurations
@@ -91,9 +92,10 @@ func NewMultiS3Manager(configs []S3InstanceConfig) (*MultiS3Manager, error) {
 		}
 
 		instance := &S3Instance{
-			ID:     instanceID,
-			Name:   config.Name,
-			Client: s3Client,
+			ID:                instanceID,
+			Name:              config.Name,
+			Client:            s3Client,
+			HumanReadableSize: config.HumanReadableSize,
 		}
 
 		manager.instances[instanceID] = instance

main.go

@@ -33,6 +33,7 @@ type s3InstanceConfig struct {
 	UseSSL              bool
 	SkipSSLVerification bool
 	SignatureType       string
+	HumanReadableSize   bool
 }
 
 type configuration struct {
@@ -76,6 +77,9 @@ func parseConfiguration() configuration {
 		viper.SetDefault(prefix+"SIGNATURE_TYPE", "V4")
 		signatureType := viper.GetString(prefix + "SIGNATURE_TYPE")
 
+		viper.SetDefault(prefix+"HUMAN_READABLE_SIZE", false)
+		humanReadableSize := viper.GetBool(prefix + "HUMAN_READABLE_SIZE")
+
 		if !useIam {
 			if accessKeyID == "" {
 				log.Fatalf("please provide %sACCESS_KEY_ID for instance %s", prefix, name)
@@ -96,6 +100,7 @@ func parseConfiguration() configuration {
 			UseSSL:              useSSL,
 			SkipSSLVerification: skipSSLVerification,
 			SignatureType:       signatureType,
+			HumanReadableSize:   humanReadableSize,
 		})
 	}
 
@@ -166,6 +171,7 @@ func main() {
 			UseSSL:              instance.UseSSL,
 			SkipSSLVerification: instance.SkipSSLVerification,
 			SignatureType:       instance.SignatureType,
+			HumanReadableSize:   instance.HumanReadableSize,
 		})
 	}
 

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>