Merge pull request #49 from orangekame3/add-inverse-pattern

[feat]: add -I option

Author: orangekame3

README.md

@@ -250,23 +250,25 @@ Usage:
   stree [bucket/prefix] [flags]
 
 Flags:
-  -D, --date-time             Print the last modified time of each file.
-  -d, --directory-only        List directories only.
-  -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, --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
+  -D, --date-time                Print the last modified time of each file.
+  -d, --directory-only           List directories only.
+  -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).
+  -I, --inverse-pattern string   List files that do not match the pattern.
+  -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, --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
+
 
 ```
 

cmd/root.go

@@ -54,6 +54,7 @@ var (
 	username      bool
 	directoryOnly bool
 	pattern 	 string
+	inversePattern string
 )
 
 var rootCmd = &cobra.Command{
@@ -84,7 +85,7 @@ var rootCmd = &cobra.Command{
 		if level > 0 {
 			maxDepth = &level
 		}
-		keys, err := pkg.FetchS3ObjectKeys(s3Svc, bucket, prefix, maxDepth, size, humanReadable, dateTime, username,pattern)
+		keys, err := pkg.FetchS3ObjectKeys(s3Svc, bucket, prefix, maxDepth, size, humanReadable, dateTime, username,pattern,inversePattern)
 		if err != nil {
 			log.Fatalf("failed to fetch S3 object keys: %v", err)
 			return
@@ -147,6 +148,8 @@ func init() {
 	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.")
+	rootCmd.Flags().StringVarP(&inversePattern, "inverse-pattern", "I", "", "List files that do not match the pattern.")
+
 }
 
 func extractBucketAndPrefix(input string) (string, string, error) {

pkg/s3.go

@@ -88,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,pattern string) ([][]string, error) {
+func FetchS3ObjectKeys(s3Client *s3.Client, bucket string, prefix string, maxDepth *int, size, humanReadable bool, dateTime bool, username bool,pattern string,inversePattern string) ([][]string, error) {
 	var delimiter *string
 	var fetchOwner *bool
 	if maxDepth != nil {
@@ -154,11 +154,17 @@ 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])
 				}
+				include := true
 				if pattern != "" {
-					if match, _ := filepath.Match(pattern, filepath.Base(*obj.Key)); match {
-						keys = append(keys, key)
+					include, _ = filepath.Match(pattern, filepath.Base(*obj.Key))
+				}
+				if inversePattern != "" {
+					exclude, _ := filepath.Match(inversePattern, filepath.Base(*obj.Key))
+					if exclude {
+						include = false
 					}
-				}else{
+				}
+				if include {
 					keys = append(keys, key)
 				}