Merge pull request #48 from orangekame3/add-pattern

[feat]: Add `-P` option

Author: orangekame3

README.md

@@ -261,13 +261,13 @@ Flags:
   -m, --mfa                   Use Multi-Factor Authentication
   -n, --no-color              Disable colorized output
   -o, --output string         Send output to filename.
+  -P, --pattern string        List files that match the pattern.
   -p, --profile string        AWS profile to use (default "default")
   -r, --region string         AWS region to use (overrides the region specified in the profile)
   -s, --size                  Print the size of each file in bytes along with the name.
   -u, --username              Print the owner of each file.
   -v, --version               version for stree
 
-
 ```
 
 # License

cmd/root.go

@@ -53,6 +53,7 @@ var (
 	dateTime      bool
 	username      bool
 	directoryOnly bool
+	pattern 	 string
 )
 
 var rootCmd = &cobra.Command{
@@ -83,7 +84,7 @@ var rootCmd = &cobra.Command{
 		if level > 0 {
 			maxDepth = &level
 		}
-		keys, err := pkg.FetchS3ObjectKeys(s3Svc, bucket, prefix, maxDepth, size, humanReadable, dateTime, username)
+		keys, err := pkg.FetchS3ObjectKeys(s3Svc, bucket, prefix, maxDepth, size, humanReadable, dateTime, username,pattern)
 		if err != nil {
 			log.Fatalf("failed to fetch S3 object keys: %v", err)
 			return
@@ -145,6 +146,7 @@ func init() {
 	rootCmd.Flags().BoolVarP(&dateTime, "date-time", "D", false, "Print the last modified time of each file.")
 	rootCmd.Flags().BoolVarP(&username, "username", "u", false, "Print the owner of each file.")
 	rootCmd.Flags().BoolVarP(&directoryOnly, "directory-only", "d", false, "List directories only.")
+	rootCmd.Flags().StringVarP(&pattern, "pattern", "P", "", "List files that match the pattern.")
 }
 
 func extractBucketAndPrefix(input string) (string, string, error) {

pkg/s3.go

@@ -4,6 +4,7 @@ package pkg
 import (
 	"context"
 	"fmt"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -87,7 +88,7 @@ func formatBytes(b int64) string {
 }
 
 // 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, size, humanReadable bool, dateTime bool, username bool) ([][]string, error) {
+func FetchS3ObjectKeys(s3Client *s3.Client, bucket string, prefix string, maxDepth *int, size, humanReadable bool, dateTime bool, username bool,pattern string) ([][]string, error) {
 	var delimiter *string
 	var fetchOwner *bool
 	if maxDepth != nil {
@@ -153,7 +154,14 @@ func FetchS3ObjectKeys(s3Client *s3.Client, bucket string, prefix string, maxDep
 				if len(meta) > 0 {
 					key[len(key)-1] = fmt.Sprintf("[%7s] %s", strings.Join(meta, " "), key[len(key)-1])
 				}
-				keys = append(keys, key)
+				if pattern != "" {
+					if match, _ := filepath.Match(pattern, filepath.Base(*obj.Key)); match {
+						keys = append(keys, key)
+					}
+				}else{
+					keys = append(keys, key)
+				}
+				
 			}
 
 			if maxDepth != nil {