update (#34)

Author: orangekame3

README.md

@@ -41,6 +41,7 @@ Whether it's for verifying the file structure, sharing the structure with your t
 - **Depth level Specification**: With the new `--L` flag, you can now specify how many levels deep in the directory structure you'd like to visualize. This offers a more focused view, especially for large S3 buckets.
 - **Role Switching Support**: `stree` is now enhanced with the ability to switch AWS roles with MFA using the `--mfa` flag. This makes it easier to manage and view S3 buckets that require different IAM roles for access.
 - **Environment Variable Support**: `stree` now prioritizes environment variables for AWS Profile and Region settings. The tool will use the `AWS_PROFILE` environment variable if set, falling back to the `default` profile otherwise. Similarly, it will use the `AWS_REGION` or `AWS_DEFAULT_REGION` environment variables for the AWS region, if available. (see [AWS CLI Environment Variables](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html) for more information)
+- **Full Path Display**: With the `-f` flag, the full path of each file is now displayed in the output, making it easier to identify the location of each item within the S3 bucket.
 
 # Install
 
@@ -256,6 +257,7 @@ Flags:
   -n, --no-color              Disable colorized output
   -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.
 ```
 
 # License

cmd/root.go

@@ -46,6 +46,7 @@ var (
 	noColor     bool
 	mfa         bool
 	level       int
+	fullPath    bool
 )
 
 var rootCmd = &cobra.Command{
@@ -80,10 +81,10 @@ var rootCmd = &cobra.Command{
 
 		root := gtree.NewRoot(bucket)
 		if noColor {
-			root = pkg.BuildTreeWithoutColor(root, keys)
+			root = pkg.BuildTreeWithoutColor(root, bucket, keys, fullPath)
 		} else {
 			root = gtree.NewRoot(color.BlueString(bucket))
-			root = pkg.BuildTreeWithColor(root, keys)
+			root = pkg.BuildTreeWithColor(root, bucket, keys, fullPath)
 		}
 
 		if err := gtree.OutputProgrammably(os.Stdout, root); err != nil {
@@ -111,6 +112,7 @@ func init() {
 	rootCmd.Flags().BoolVarP(&noColor, "no-color", "n", false, "Disable colorized output")
 	rootCmd.Flags().BoolVarP(&mfa, "mfa", "m", false, "Use Multi-Factor Authentication")
 	rootCmd.Flags().IntVarP(&level, "level", "L", 0, "Descend only level directories")
+	rootCmd.Flags().BoolVarP(&fullPath, "", "f", false, "Print the full path prefix for each file.")
 }
 
 func extractBucketAndPrefix(input string) (string, string, error) {
@@ -128,11 +130,6 @@ func extractBucketAndPrefix(input string) (string, string, error) {
 	return bucket, parts[1], nil
 }
 
-// SetVersionInfo sets version and date to rootCmd
-func SetVersionInfo(version, date string) {
-	rootCmd.Version = fmt.Sprintf("%s (Built on %s)", version, date)
-}
-
 func defaultProfile() string {
 	if p, ok := os.LookupEnv("AWS_PROFILE"); ok {
 		return p

cmd/version.go

@@ -0,0 +1,33 @@
+// Package cmd is a root command.
+/*
+Copyright © 2024 Takafumi Miyanaga <[email protected]>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+package cmd
+
+import "fmt"
+
+// Version is a version of this application.
+const Version = "0.0.12"
+
+// SetVersionInfo sets version and date to rootCmd
+func SetVersionInfo(version, date string) {
+	rootCmd.Version = fmt.Sprintf("%s (Built on %s)", version, date)
+}

main.go

@@ -28,6 +28,6 @@ import (
 )
 
 func main() {
-	cmd.SetVersionInfo(version, time.Now().String())
+	cmd.SetVersionInfo(cmd.Version, time.Now().String())
 	cmd.Execute()
 }

pkg/tree.go

@@ -2,20 +2,37 @@
 package pkg
 
 import (
+	"fmt"
+
 	"github.com/ddddddO/gtree"
 	"github.com/fatih/color"
 )
 
+// createFullPath creates a full path for each keys
+func createFullPath(bucket string, keys [][]string)[][]string {
+	for i := range keys {
+		keys[i][len(keys[i])-1] = fmt.Sprintf("%s/%s", bucket, keys[i][len(keys[i])-1])
+	}
+	return keys
+}
+
 // BuildTreeWithColor builds a tree with colored nodes
-func BuildTreeWithColor(root *gtree.Node, keys [][]string) *gtree.Node {
+func BuildTreeWithColor(root *gtree.Node, bucket string, keys [][]string, f bool) *gtree.Node {
+	if f {
+		keys = createFullPath(bucket, keys)
+	}
+
 	for _, key := range keys {
 		addNodeWithColor(root, key, 0)
 	}
 	return root
 }
 
 // BuildTreeWithoutColor builds a tree without colored nodes
-func BuildTreeWithoutColor(root *gtree.Node, keys [][]string) *gtree.Node {
+func BuildTreeWithoutColor(root *gtree.Node, bucket string, keys [][]string, f bool) *gtree.Node {
+	if f {
+		keys = createFullPath(bucket, keys)
+	}
 	for _, key := range keys {
 		addNodeWithoutColor(root, key, 0)
 	}