Added support to exclude multiple folders with --excl-dir flag

Author: mainak55512

utils/handle_files.go

@@ -86,13 +86,15 @@ func GetFiles(
 	guardDir <- struct{}{}
 	wgDir.Add(1)
 
-	err := walkDirConcur(folder_location, folder_count, &files, is_git_initialized, wgDir, muDir, guardDir, skipDir)
+	skipFilePathList := _getPathList(skipDir)
+
+	err := walkDirConcur(folder_location, folder_count, &files, is_git_initialized, wgDir, muDir, guardDir, skipFilePathList)
 	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{}, skipDir string) 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(
@@ -114,17 +116,19 @@ func walkDirConcur(folder_location string, folder_count *int32, files *[]File_in
 			}
 			muDir.Unlock()
 		}
-		if skipDir != "" && _path == skipDir {
+		if len(skipDir) != 0 && _isPresent(skipDir, _path) {
 			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) {
+		// if f.IsDir() && _path != folder_location && _path != path.Join(folder_location, skipDir) {
+
+		if f.IsDir() && _path != folder_location && !_isPresent(skipDir, _path) {
 			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, skipDir)
 			return filepath.SkipDir
 		}
 		if f.Type().IsRegular() {
@@ -150,3 +154,20 @@ func walkDirConcur(folder_location string, folder_count *int32, files *[]File_in
 	<-guardDir
 	return err
 }
+
+func _getPathList(filePath string) []string {
+	var filePathList []string
+	for _, elem := range strings.Split(filePath, ",") {
+		filePathList = append(filePathList, strings.TrimSpace(elem))
+	}
+	return filePathList
+}
+
+func _isPresent(filePathList []string, filePath string) bool {
+	for _, elem := range filePathList {
+		if elem == filePath {
+			return true
+		}
+	}
+	return false
+}

utils/utils.go

@@ -50,13 +50,13 @@ This emits help text when --help tag is called
 */
 func EmitHelpText() string {
 
-	versionDetails := `0.1.10`
+	versionDetails := `0.1.11`
 	authorDetails := `mainak55512 (mbhattacharjee432@gmail.com)`
 	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"
+	exclDirFlagDetails := "--excl-dir\tFilters out folder from output\n\n\tstto --excl-dir [comma separated folder names] or,\n\tstto -excl-dir [comma separated folder names]\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"