Add function that can select from staged and unstaged files

Author: yasukotelin

README.md

@@ -7,26 +7,33 @@ git-diffs is the git subcommand that is diff files selector.
 You can use the `git-diffs` as a git subcommand like `git diffs`.<br>
 This shows diff file names and show diff when you select one.
 
+<img src="images/git-diffs-demo.gif" alt="git-diffs demo">
+
 ## Install
 
+If you have go environment, you can use `go get` and install.
+
 ```
 go get -u github.com/yasukotelin/git-diffs
 ```
 
+Or you can download the binary from [release](https://github.com/yasukotelin/git-diffs/releases) page. (only windows)
+
+
 ## Usage
 
 ```
 $ git diffs
-[1] .gitignore                      
-[2] LICENSE                         
-[3] README.md                       
-[4] git.go                          
-[5] go.mod                          
-[6] go.sum                          
-[7] main.go                         
-[8] test/sample.txt                 
-                                    
-Select number (empty is cancel) => 5
+=== Staged files ===
+[1] D   git.go
+[2] M   main.go
+
+=== Unstaged files ===
+[3] M   README.md
+[4] M   git/diff.go
+[5] A   images/git-diffs-demo.gif
+
+Select number (empty is cancel) =>
 ```
 
 ## Licence

git.go

@@ -31,6 +31,7 @@ func DiffNameStatus(isStaged bool) ([]DiffFile, error) {
 	if isStaged {
 		cmd = exec.Command("git", "diff", "--staged", "--name-status")
 	} else {
+		exec.Command("git", "add", "-A", "-N").Run()
 		cmd = exec.Command("git", "diff", "--name-status")
 	}
 	out, err := cmd.Output()

git/diff.go

@@ -31,6 +31,7 @@ func mainAction(c *cli.Context) error {
 		return err
 	}
 	fmt.Println("=== Staged files ===")
+	stagedFilesLen := len(stagedFiles)
 	for i, file := range stagedFiles {
 		fmt.Printf("[%d] %v\n", i+1, file.Text)
 	}
@@ -43,19 +44,11 @@ func mainAction(c *cli.Context) error {
 		return err
 	}
 	fmt.Println("=== Unstaged files ===")
+	unstagedFilesLen := len(unstagedFiles)
 	for i, file := range unstagedFiles {
-		fmt.Printf("[%d] %v\n", i+1, file.Text)
+		fmt.Printf("[%d] %v\n", i+1+stagedFilesLen, file.Text)
 	}
 
-	// files, err := execDiffNameOnly()
-	// if err != nil {
-	// 	return err
-	// }
-
-	// for i, f := range files {
-	// 	fmt.Printf("[%d] %s\n", i+1, f)
-	// }
-
 	fmt.Println()
 	fmt.Print("Select number (empty is cancel) => ")
 
@@ -69,11 +62,20 @@ func mainAction(c *cli.Context) error {
 	if err != nil {
 		return errors.New("your input is not number.")
 	}
-	fmt.Println(selNum)
-	// if selNum > len(files) || selNum < 1 {
-	// 	return errors.New("your input is out of range numbers")
-	// }
-	// execDiff(files[selNum-1])
+	if selNum > stagedFilesLen + unstagedFilesLen || selNum < 1 {
+		return errors.New("your input is out of range numbers")
+	}
+
+	if selNum <= stagedFilesLen {
+		// User selected staged file number
+		err = git.Diff(stagedFiles[selNum-1].Path, true)
+	} else {
+		// User selected unstaged file number
+		err = git.Diff(unstagedFiles[selNum-stagedFilesLen-1].Path, false)
+	}
+	if err != nil {
+		return err
+	}
 
 	return nil
 }