[feature/recursivity] recursiveness as option

cmd/hash.go

@@ -8,6 +8,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var recursiveFlag bool
+
 type HashResult struct {
 	res  []byte
 	path string
@@ -26,12 +28,13 @@ var hashCmd = &cobra.Command{
 	Long: `The hash command computes the hash of a given FILE.
 
 Without FILE or when FILE is '-', read the standard input.
-If the list of FILE contains a directory, it will be proceed recursively.`,
+If the list of FILE contains a directory, it can be proceed recursively.`,
 	SilenceErrors: true,
 }
 
 func init() {
 	rootCmd.AddCommand(hashCmd)
+	hashCmd.PersistentFlags().BoolVar(&recursiveFlag, "recursive", false, "When this flag is set, every directories in your input will be proceed recursively.")
 }
 
 func computeHash(path string, h hash.Hash) ([]byte, error) {

cmd/md5Hash.go

@@ -13,9 +13,9 @@ var md5HashCmd = &cobra.Command{
 	Long: `Display MD5 checksums (128 bits).
 
 Without FILE or when FILE is '-', read the standard input.
-If the list of FILE contains a directory, it will be proceed recursively.`,
+If the list of FILE contains a directory, it can be proceed recursively.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		filesToCheck, err := getFilesToCompute(args)
+		filesToCheck, err := getFilesToCompute(args, recursiveFlag)
 		if err != nil {
 			return err
 		}

cmd/root.go

@@ -36,7 +36,7 @@ func remove(s []string, i int) []string {
 	return s[:len(s)-1]
 }
 
-func getFilesToCompute(args []string) ([]string, error) {
+func getFilesToCompute(args []string, recursive bool) ([]string, error) {
 	if len(args) == 0 || (len(args) == 1 && args[0] == "-") {
 		return []string{"-"}, nil
 	}
@@ -54,7 +54,7 @@ func getFilesToCompute(args []string) ([]string, error) {
 		}
 		if fInfo.IsDir() {
 			args = remove(args, idx)
-			args, err = computeDirRecursively(args, elem)
+			args, err = computeDir(args, elem, recursive)
 			if err != nil {
 				return nil, err
 			}
@@ -65,13 +65,19 @@ func getFilesToCompute(args []string) ([]string, error) {
 	return args, nil
 }
 
-func computeDirRecursively(l []string, rootFolder string) ([]string, error) {
+func computeDir(l []string, rootFolder string, recursive bool) ([]string, error) {
 	err := filepath.WalkDir(rootFolder, func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			return err
 		}
 		if !d.IsDir() {
 			l = append(l, path)
+		} else {
+			// d is a directory
+			// skipping dirs if not in recursive mode - except for the rootFolder (obviously).
+			if filepath.Base(rootFolder) != d.Name() && !recursive {
+				return filepath.SkipDir
+			}
 		}
 		return nil
 	})

cmd/sha1Hash.go

@@ -13,9 +13,9 @@ var sha1HashCmd = &cobra.Command{
 	Long: `Display SHA-1 checksums (160 bits).
 
 Without FILE or when FILE is '-', read the standard input.
-If the list of FILE contains a directory, it will be proceed recursively.`,
+If the list of FILE contains a directory, it can be proceed recursively.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		filesToCheck, err := getFilesToCompute(args)
+		filesToCheck, err := getFilesToCompute(args, recursiveFlag)
 		if err != nil {
 			return err
 		}

cmd/sha224Hash.go

@@ -13,9 +13,9 @@ var sha224HashCmd = &cobra.Command{
 	Long: `Display SHA-224 checksums (224 bits).
 
 Without FILE or when FILE is '-', read the standard input.
-If the list of FILE contains a directory, it will be proceed recursively.`,
+If the list of FILE contains a directory, it can be proceed recursively.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		filesToCheck, err := getFilesToCompute(args)
+		filesToCheck, err := getFilesToCompute(args, recursiveFlag)
 		if err != nil {
 			return err
 		}

cmd/sha256Hash.go

@@ -13,9 +13,9 @@ var sha256HashCmd = &cobra.Command{
 	Long: `Display SHA256 checksums (256 bits).
 
 Without FILE or when FILE is '-', read the standard input.
-If the list of FILE contains a directory, it will be proceed recursively.`,
+If the list of FILE contains a directory, it can be proceed recursively.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		filesToCheck, err := getFilesToCompute(args)
+		filesToCheck, err := getFilesToCompute(args, recursiveFlag)
 		if err != nil {
 			return err
 		}

cmd/sha384Hash.go

@@ -13,9 +13,9 @@ var sha384HashCmd = &cobra.Command{
 	Long: `Display SHA-384 checksums (384 bits).
 
 Without FILE or when FILE is '-', read the standard input.
-If the list of FILE contains a directory, it will be proceed recursively.`,
+If the list of FILE contains a directory, it can be proceed recursively.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		filesToCheck, err := getFilesToCompute(args)
+		filesToCheck, err := getFilesToCompute(args, recursiveFlag)
 		if err != nil {
 			return err
 		}

cmd/sha512Hash.go

@@ -13,9 +13,9 @@ var sha512HashCmd = &cobra.Command{
 	Long: `Display SHA-512 checksums (512 bits).
 
 Without FILE or when FILE is '-', read the standard input.
-If the list of FILE contains a directory, it will be proceed recursively.`,
+If the list of FILE contains a directory, it can be proceed recursively.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		filesToCheck, err := getFilesToCompute(args)
+		filesToCheck, err := getFilesToCompute(args, recursiveFlag)
 		if err != nil {
 			return err
 		}