Option to exclude directories from text buffer

Author: Laurent Cozic

README.md

@@ -79,8 +79,6 @@ The executable can be downloaded from https://github.com/laurent22/massren/relea
 - Move files to trash in bulk instead of one by one.
 - Detect default text editor on Windows.
 - Disambiguate filenames when processing two or more folders that contain the same filenames.
-- Ability to delete files - see https://github.com/laurent22/massren/issues/11
-- Option to always exclude directories.
 - Option to remove header.
 - Other [various issues](https://github.com/laurent22/massren/issues).
 

main.go

@@ -35,7 +35,7 @@ const (
 type CommandLineOptions struct {
 	DryRun  bool `short:"n" long:"dry-run" description:"Don't rename anything but show the operation that would have been performed."`
 	Verbose bool `short:"v" long:"verbose" description:"Enable verbose output."`
-	Config  bool `short:"c" long:"config" description:"Set or list a configuration values. For more info: massren --config --help"`
+	Config  bool `short:"c" long:"config" description:"Set or list configuration values. For more info: massren --config --help"`
 	Undo    bool `short:"u" long:"undo" description:"Undo a rename operation. Currently delete operations cannot be undone (though files can be recovered from the trash in OSX and Windows). eg. massren --undo [path]"`
 	Version bool `short:"V" long:"version" description:"Displays version information."`
 }
@@ -193,7 +193,7 @@ func editFile(filePath string) error {
 	return nil
 }
 
-func filePathsFromArgs(args []string) ([]string, error) {
+func filePathsFromArgs(args []string, includeDirectories bool) ([]string, error) {
 	var output []string
 	var err error
 
@@ -218,6 +218,18 @@ func filePathsFromArgs(args []string) ([]string, error) {
 		}
 	}
 
+	if !includeDirectories {
+		var temp []string
+		for _, path := range output {
+			f, err := os.Stat(path)
+			if err == nil && f.IsDir() {
+				continue
+			}
+			temp = append(temp, path)
+		}
+		output = temp
+	}
+
 	sort.Strings(output)
 
 	return output, nil
@@ -262,12 +274,12 @@ func filePathsFromListFile(filePath string) ([]string, error) {
 	return filePathsFromString(string(contentB)), nil
 }
 
-func printHelp(subMenu string) {	
+func printHelp(subMenu string) {
 	var info string
-	
+
 	if subMenu == "" {
 		flagParser_.WriteHelp(os.Stdout)
-		
+
 		info = `
 Examples:
 
@@ -301,8 +313,10 @@ Config commands:
   
 Possible key/values:
 
-  editor: The editor to use when editing the list of files. Default: auto-detected.
-  use_trash: Whether files should be moved to the trash/recycle bin after deletion. Possible values: 0 or 1. Default: 1.
+  editor:              The editor to use when editing the list of files. Default: auto-detected.
+  use_trash:           Whether files should be moved to the trash/recycle bin after deletion. Possible values: 0 or 1. Default: 1.
+  include_directories: Whether to include the directories the file buffer. Possible values: 0 or 1. Default: 1.
+  include_header:      Whether to show the header in the file buffer. Possible values: 0 or 1. Default: 1.
   
 Examples:
 
@@ -313,7 +327,7 @@ Examples:
   % APPNAME --config use_trash 0
 `
 	}
-	
+
 	fmt.Println(strings.Replace(info, "APPNAME", APPNAME, -1))
 }
 
@@ -444,7 +458,7 @@ func processFileActions(fileActions []*FileAction, dryRun bool) error {
 			logError("Could not save history items: %s", err)
 		}
 	}()
-	
+
 	var deleteWaitGroup sync.WaitGroup
 	var deleteChannel = make(chan int, 100)
 	useTrash := config_.Bool("use_trash")
@@ -495,7 +509,7 @@ func processFileActions(fileActions []*FileAction, dryRun bool) error {
 					if err != nil {
 						logError("%s", err)
 					}
-					<- deleteChannel
+					<-deleteChannel
 				}(filePath, deleteChannel, useTrash)
 			}
 			break
@@ -509,7 +523,7 @@ func processFileActions(fileActions []*FileAction, dryRun bool) error {
 
 		doneActions = append(doneActions, action)
 	}
-	
+
 	deleteWaitGroup.Wait()
 
 	// Conflict resolution:
@@ -630,7 +644,7 @@ func main() {
 		return
 	}
 
-	filePaths, err := filePathsFromArgs(args)
+	filePaths, err := filePathsFromArgs(args, config_.Bool("include_directories"))
 
 	if err != nil {
 		criticalError(err)

main_test.go

@@ -545,7 +545,7 @@ func Test_filePathsFromArgs(t *testing.T) {
 		filepath.Join(tempFolder(), "*"),
 	}
 
-	filePaths, err := filePathsFromArgs(args)
+	filePaths, err := filePathsFromArgs(args, true)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -569,7 +569,7 @@ func Test_filePathsFromArgs(t *testing.T) {
 	}
 
 	args = []string{}
-	filePaths, err = filePathsFromArgs(args)
+	filePaths, err = filePathsFromArgs(args, true)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -582,6 +582,37 @@ func Test_filePathsFromArgs(t *testing.T) {
 	os.Chdir(currentDir)
 }
 
+func Test_filePathsFromArgs_noDirectories(t *testing.T) {
+	setup(t)
+	defer teardown(t)
+
+	f0 := filepath.Join(tempFolder(), "0")
+	f1 := filepath.Join(tempFolder(), "1")
+	d0 := filepath.Join(tempFolder(), "dir0")
+	d1 := filepath.Join(tempFolder(), "dir1")
+
+	touch(f0)
+	touch(f1)
+	os.Mkdir(d0, 0700)
+	os.Mkdir(d1, 0700)
+
+	args := []string{
+		filepath.Join(tempFolder(), "*"),
+	}
+
+	filePaths, _ := filePathsFromArgs(args, true)
+	err := fileListsAreEqual(filePaths, []string{f0, f1, d0, d1})
+	if err != nil {
+		t.Error(err)
+	}
+
+	filePaths, _ = filePathsFromArgs(args, false)
+	err = fileListsAreEqual(filePaths, []string{f0, f1})
+	if err != nil {
+		t.Error(err)
+	}
+}
+
 func stringListsEqual(s1 []string, s2 []string) bool {
 	for i, s := range s1 {
 		if s != s2[i] {

undo.go

@@ -6,7 +6,7 @@ import (
 )
 
 func handleUndoCommand(opts *CommandLineOptions, args []string) error {
-	filePaths, err := filePathsFromArgs(args)
+	filePaths, err := filePathsFromArgs(args, true)
 	if err != nil {
 		return err
 	}