Added exclude folder option, currently works only on one folder

Author: mainak55512

process/process_flags.go

@@ -7,8 +7,8 @@ import (
 	"github.com/mainak55512/stto/utils"
 )
 
-func ProcessCount(count_details *[]utils.OutputStructure, file_details *[]utils.File_details, folder_name *string, is_git_initialized *bool, folder_count *int32, mu *sync.RWMutex, wg *sync.WaitGroup) (utils.TotalCount, error) {
-	err := ProcessConcurrentWorkers(file_details, folder_count, folder_name, is_git_initialized, mu, wg)
+func ProcessCount(count_details *[]utils.OutputStructure, file_details *[]utils.File_details, folder_name *string, is_git_initialized *bool, folder_count *int32, mu *sync.RWMutex, wg *sync.WaitGroup, skipDir string) (utils.TotalCount, error) {
+	err := ProcessConcurrentWorkers(file_details, folder_count, folder_name, is_git_initialized, mu, wg, skipDir)
 	if err != nil {
 		return utils.TotalCount{}, fmt.Errorf("%w", err)
 	}
@@ -43,12 +43,15 @@ func ProcessCount(count_details *[]utils.OutputStructure, file_details *[]utils.
 func ProcessByFlags(count_details *[]utils.OutputStructure, file_details *[]utils.File_details, folder_name *string, is_git_initialized *bool, folder_count *int32, mu *sync.RWMutex, wg *sync.WaitGroup) {
 
 	inpFlags := utils.HandleFlags(folder_name)
-
+	var skipDir string
+	if *inpFlags.NDir != "none" {
+		skipDir = *inpFlags.NDir
+	}
 	if *inpFlags.Help == true {
 		fmt.Println(utils.EmitHelpText())
 	} else {
 		if *inpFlags.JSON == true {
-			_, err := ProcessCount(count_details, file_details, folder_name, is_git_initialized, folder_count, mu, wg)
+			_, err := ProcessCount(count_details, file_details, folder_name, is_git_initialized, folder_count, mu, wg, skipDir)
 			if err != nil {
 				fmt.Println(fmt.Errorf("%w", err))
 			}
@@ -61,7 +64,7 @@ func ProcessByFlags(count_details *[]utils.OutputStructure, file_details *[]util
 			}
 			fmt.Println(jsonOutput)
 		} else if *inpFlags.YAML == true {
-			_, err := ProcessCount(count_details, file_details, folder_name, is_git_initialized, folder_count, mu, wg)
+			_, err := ProcessCount(count_details, file_details, folder_name, is_git_initialized, folder_count, mu, wg, skipDir)
 			if err != nil {
 				fmt.Println(fmt.Errorf("%w", err))
 			}
@@ -74,7 +77,7 @@ func ProcessByFlags(count_details *[]utils.OutputStructure, file_details *[]util
 			}
 			fmt.Println(yamlOutput)
 		} else {
-			total_counts, err := ProcessCount(count_details, file_details, folder_name, is_git_initialized, folder_count, mu, wg)
+			total_counts, err := ProcessCount(count_details, file_details, folder_name, is_git_initialized, folder_count, mu, wg, skipDir)
 			if err != nil {
 				fmt.Println(fmt.Errorf("%w", err))
 			}

process/process_workers.go

@@ -12,6 +12,7 @@ func ProcessConcurrentWorkers(
 	is_git_initialized *bool,
 	mu *sync.RWMutex,
 	wg *sync.WaitGroup,
+	skipDir string,
 ) error {
 
 	// Limited goroutines to 50
@@ -20,7 +21,7 @@ func ProcessConcurrentWorkers(
 	// Buffered jobs channel
 	jobs := make(chan utils.File_info, 100)
 
-	files, err := utils.GetFiles(is_git_initialized, folder_count, *folder_name)
+	files, err := utils.GetFiles(is_git_initialized, folder_count, *folder_name, skipDir)
 
 	if err != nil {
 		return err

utils/handle_cmd.go

@@ -11,6 +11,7 @@ type FlagOptions struct {
 	JSON  *bool
 	YAML  *bool
 	Sort  *bool
+	NDir  *string
 }
 
 func HandleFlags(folder_name *string) FlagOptions {
@@ -21,6 +22,7 @@ func HandleFlags(folder_name *string) FlagOptions {
 	var json = flag.Bool("json", false, "Get output in json format")
 	var yaml = flag.Bool("yaml", false, "Get output in yaml format")
 	var sort = flag.Bool("sort", false, "Sort result in descending order")
+	var nDir = flag.String("excl-dir", "none", "Exclude Directory")
 
 	flag.Parse()
 	if len(flag.Args()) > 0 {
@@ -33,5 +35,6 @@ func HandleFlags(folder_name *string) FlagOptions {
 		JSON:  json,
 		YAML:  yaml,
 		Sort:  sort,
+		NDir:  nDir,
 	}
 }

utils/handle_files.go

@@ -66,6 +66,7 @@ func GetFiles(
 	is_git_initialized *bool,
 	folder_count *int32,
 	file_directory_name string,
+	skipDir string,
 ) ([]File_info, error) {
 	var files []File_info
 	folder_location := "."
@@ -85,13 +86,13 @@ func GetFiles(
 	guardDir <- struct{}{}
 	wgDir.Add(1)
 
-	err := walkDirConcur(folder_location, folder_count, &files, is_git_initialized, wgDir, muDir, guardDir)
+	err := walkDirConcur(folder_location, folder_count, &files, is_git_initialized, wgDir, muDir, guardDir, skipDir)
 	wgDir.Wait()
 
 	return files, err
 }
 
-func walkDirConcur(folder_location string, folder_count *int32, files *[]File_info, is_git_initialized *bool, wgDir *sync.WaitGroup, muDir *sync.RWMutex, guardDir chan struct{}) error {
+func walkDirConcur(folder_location string, folder_count *int32, files *[]File_info, is_git_initialized *bool, wgDir *sync.WaitGroup, muDir *sync.RWMutex, guardDir chan struct{}, skipDir string) error {
 	defer wgDir.Done()
 
 	visitFolder := func(
@@ -104,24 +105,26 @@ func walkDirConcur(folder_location string, folder_count *int32, files *[]File_in
 		if err != nil {
 			return err
 		}
-		// if it is a folder, then increase the folder count
-		if f.IsDir() && _path != folder_location {
-
-			// if folder name is '.git', then
-			// set is_git_initialized to true
-			if _path == path.Join(folder_location, ".git") {
-				muDir.Lock()
-				if *is_git_initialized == false {
-					*is_git_initialized = true
-				}
-				muDir.Unlock()
+		// if folder name is '.git', then
+		// set is_git_initialized to true
+		if f.IsDir() && _path == path.Join(folder_location, ".git") {
+			muDir.Lock()
+			if *is_git_initialized == false {
+				*is_git_initialized = true
 			}
+			muDir.Unlock()
+		}
+		if skipDir != "" && _path == skipDir {
+			return filepath.SkipDir
+		}
+		// if it is a folder, then increase the folder count
+		if f.IsDir() && _path != folder_location && _path != path.Join(folder_location, skipDir) {
 			muDir.Lock()
 			*folder_count++
 			muDir.Unlock()
 			guardDir <- struct{}{}
 			wgDir.Add(1)
-			go walkDirConcur(_path, folder_count, files, is_git_initialized, wgDir, muDir, guardDir)
+			go walkDirConcur(_path, folder_count, files, is_git_initialized, wgDir, muDir, guardDir, "")
 			return filepath.SkipDir
 		}
 		if f.Type().IsRegular() {

utils/utils.go

@@ -50,17 +50,18 @@ This emits help text when --help tag is called
 */
 func EmitHelpText() string {
 
-	versionDetails := `0.1.9`
+	versionDetails := `0.1.10`
 	authorDetails := `mainak55512 (mbhattacharjee432@gmail.com)`
-	flagDetails := "--help\n--ext [list extension name]\n--excl-ext [list of extension name]\n--json\n--yaml\n--sort"
+	flagDetails := "--help\n--ext [list extension name]\n--excl-ext [list of extension name]\n--excl-dir folder-name\n--json\n--yaml\n--sort"
 	helpFlagDetails := "--help\tShows the usage details\n\n\tstto --help or,\n\tstto -help\n\n"
 	extFlagDetails := "--ext\tFilters output based on the given extension\n\n\tstto --ext [extension name] [(optional) folder name] or,\n\tstto -ext [extension name] [(optional) folder name]\n\n"
 	exclextFlagDetails := "--excl-ext\tFilters out files from output based on the given extension\n\n\tstto --excl-ext [extension name] [(optional) folder name] or,\n\tstto -excl-ext [extension name] [(optional) folder name]\n\n"
+	exclDirFlagDetails := "--excl-dir\tFilters out folder from output\n\n\tstto --excl-dir [folder name] or,\n\tstto -excl-dir [folder name]\n\n"
 	jsonFlagDetails := "--json\tEmits output in JSON format\n\n\tstto --json\n\n"
 	yamlFlagDetails := "--yaml\tEmits output in YAML format\n\n\tstto --yaml\n\n"
 	sortFlagDetails := "--sort\tSorts output based on descending line count\n\n\tstto --sort\n\n"
 	generalUsageDetails := "\n\n[General usage]:\n\tstto or,\n\tstto [folder name]"
-	returnText := "\nSTTO: a simple and quick line of code counter.\nAuthor: " + authorDetails + "\nVersion: " + versionDetails + generalUsageDetails + "\n\n[Flags]:\n" + flagDetails + "\n[Usage]:\n" + helpFlagDetails + extFlagDetails + exclextFlagDetails + jsonFlagDetails + yamlFlagDetails + sortFlagDetails
+	returnText := "\nSTTO: a simple and quick line of code counter.\nAuthor: " + authorDetails + "\nVersion: " + versionDetails + generalUsageDetails + "\n\n[Flags]:\n" + flagDetails + "\n[Usage]:\n" + helpFlagDetails + extFlagDetails + exclextFlagDetails + exclDirFlagDetails + jsonFlagDetails + yamlFlagDetails + sortFlagDetails
 
 	return returnText
 }