Merge pull request #41 from orangekame3/add-size

[feat]: Add size option

Author: orangekame3

CHANGELOG.md

@@ -1,7 +1,8 @@
 # Changelog
 
 ## [v0.0.16](https://github.com/orangekame3/stree/compare/v0.0.15...v0.0.16) - 2024-07-16
-- Add output option by @orangekame3 in https://github.com/orangekame3/stree/pull/39
+
+- Add output option by @orangekame3 in <https://github.com/orangekame3/stree/pull/39>
 
 ## [v0.0.15](https://github.com/orangekame3/stree/compare/v0.0.14...v0.0.15) - 2024-07-08
 

README.md

@@ -251,14 +251,19 @@ Usage:
 
 Flags:
   -e, --endpoint-url string   AWS endpoint URL to use (useful for local testing with LocalStack)
+  -f, --full-path             Print the full path prefix for each file.
   -h, --help                  help for stree
+  -H, --human-readable        Print the size of each file but in a more human readable way, e.g. appending a size letter for kilobytes (K), megabytes (M), gigabytes (G), terabytes (T), petabytes (P) and exabytes(E).
   -L, --level int             Descend only level directories
   -l, --local                 Use LocalStack configuration
   -m, --mfa                   Use Multi-Factor Authentication
   -n, --no-color              Disable colorized output
+  -o, --output string         Send output to filename.
   -p, --profile string        AWS profile to use (default "default")
   -r, --region string         AWS region to use (overrides the region specified in the profile)
-  -f                          Print the full path prefix for each file.
+  -s, --size                  Print the size of each file in bytes along with the name.
+  -v, --version               version for stree
+
 ```
 
 # License

cmd/root.go

@@ -48,6 +48,8 @@ var (
 	level       int
 	fullPath    bool
 	fileName    string
+	size 	  bool
+	humanReadable bool
 )
 
 var rootCmd = &cobra.Command{
@@ -78,7 +80,7 @@ var rootCmd = &cobra.Command{
 		if level > 0 {
 			maxDepth = &level
 		}
-		keys, err := pkg.FetchS3ObjectKeys(s3Svc, bucket, prefix, maxDepth)
+		keys, err := pkg.FetchS3ObjectKeys(s3Svc, bucket, prefix, maxDepth,size, humanReadable)
 		if err != nil {
 			log.Fatalf("failed to fetch S3 object keys: %v", err)
 			return
@@ -135,6 +137,8 @@ func init() {
 	rootCmd.Flags().IntVarP(&level, "level", "L", 0, "Descend only level directories")
 	rootCmd.Flags().BoolVarP(&fullPath, "full-path", "f", false, "Print the full path prefix for each file.")
 	rootCmd.Flags().StringVarP(&fileName, "output", "o", "", "Send output to filename.")
+	rootCmd.Flags().BoolVarP(&size, "size", "s", false, "Print the size of each file in bytes along with the name.")
+	rootCmd.Flags().BoolVarP(&humanReadable, "human-readable", "H", false, "Print the size of each file but in a more human readable way, e.g. appending a size letter for kilobytes (K), megabytes (M), gigabytes (G), terabytes (T), petabytes (P) and exabytes(E).")
 }
 
 func extractBucketAndPrefix(input string) (string, string, error) {

pkg/s3.go

@@ -3,6 +3,7 @@ package pkg
 
 import (
 	"context"
+	"fmt"
 	"strings"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -70,8 +71,22 @@ func InitializeAWSSession(conf S3Config) (*s3.Client, error) {
 	return s3.NewFromConfig(awsConfig), nil
 }
 
+// ref: https://yourbasic.org/golang/formatting-byte-size-to-human-readable-format/
+func formatBytes(b int64) string {
+	const unit = 1000
+	if b < unit {
+		return fmt.Sprintf("%d", b)
+	}
+	div, exp := int64(unit), 0
+	for n := b / unit; n >= unit; n /= unit {
+		div *= unit
+		exp++
+	}
+	return fmt.Sprintf("%.1f%c", float64(b)/float64(div), "KMGTPE"[exp])
+}
+
 // FetchS3ObjectKeys returns a slice of keys for all objects in the specified bucket and prefix
-func FetchS3ObjectKeys(s3Client *s3.Client, bucket string, prefix string, maxDepth *int) ([][]string, error) {
+func FetchS3ObjectKeys(s3Client *s3.Client, bucket string, prefix string, maxDepth *int,size, humanReadable bool) ([][]string, error) {
 	var delimiter *string
 	if maxDepth != nil {
 		delimiter = aws.String("/")
@@ -109,6 +124,11 @@ func FetchS3ObjectKeys(s3Client *s3.Client, bucket string, prefix string, maxDep
 
 			for _, obj := range page.Contents {
 				key := strings.Split(*obj.Key, "/")
+				if humanReadable {
+					key[len(key)-1] = fmt.Sprintf("[%7s] %s", formatBytes(*obj.Size), key[len(key)-1])
+				} else if size {
+					key[len(key)-1] = fmt.Sprintf("[%7d] %s", *obj.Size, key[len(key)-1])
+				}
 				keys = append(keys, key)
 			}