diff --git a/complete_test.go b/complete_test.go index ee5a133..c9d544b 100644 --- a/complete_test.go +++ b/complete_test.go @@ -23,7 +23,7 @@ func TestCompleter_Complete(t *testing.T) { "-flag2": PredictNothing, "-flag3": PredictSet("opt1", "opt2", "opt12"), }, - Args: PredictOr(PredictDirs("*"), PredictFiles("*.md")), + Args: PredictFiles("*.md"), }, }, Flags: map[string]Predictor{ @@ -129,7 +129,7 @@ func TestCompleter_Complete(t *testing.T) { }, { args: "-o ", - want: testTXTFiles, + want: append(testTXTFiles, "./", "./dir/"), }, { args: "-o ./no-su", @@ -137,11 +137,7 @@ func TestCompleter_Complete(t *testing.T) { }, { args: "-o ./", - want: testTXTFiles, - }, - { - args: "-o ", - want: testTXTFiles, + want: append(testTXTFiles, "./", "./dir/"), }, { args: "-o ./read", diff --git a/predict.go b/predict.go index 1db33f5..64e793b 100644 --- a/predict.go +++ b/predict.go @@ -1,6 +1,7 @@ package complete import ( + "io/ioutil" "os" "path/filepath" "strings" @@ -68,7 +69,7 @@ func (p predictSet) Predict(a Args) (prediction []string) { // path, if no path was started to be typed, it will complete to directories // in the current working directory. func PredictDirs(pattern string) Predictor { - return files(pattern, true, false) + return files(pattern, false) } // PredictFiles will search for files matching the given pattern in the started to @@ -76,34 +77,40 @@ func PredictDirs(pattern string) Predictor { // match the pattern in the current working directory. // To match any file, use "*" as pattern. To match go files use "*.go", and so on. func PredictFiles(pattern string) Predictor { - return files(pattern, false, true) + return files(pattern, true) } -// PredictFilesOrDirs any file or directory that matches the pattern -func PredictFilesOrDirs(pattern string) Predictor { - return files(pattern, true, true) -} - -func files(pattern string, allowDirs, allowFiles bool) PredictFunc { +func files(pattern string, allowFiles bool) PredictFunc { return func(a Args) (prediction []string) { if strings.HasSuffix(a.Last, "/..") { return } dir := dirFromLast(a.Last) + rel := !filepath.IsAbs(pattern) Log("looking for files in %s (last=%s)", dir, a.Last) - files, err := filepath.Glob(filepath.Join(dir, pattern)) + files := listFiles(dir, pattern) + + // get wording directory for relative name + workDir, err := os.Getwd() if err != nil { - Log("failed glob operation with pattern '%s': %s", pattern, err) - } - if allowDirs { - files = append(files, dir) - } - files = selectByType(files, allowDirs, allowFiles) - if !filepath.IsAbs(pattern) { - filesToRel(files) + workDir = "" } + + // add dir if match + files = append(files, dir) + // add all matching files to prediction for _, f := range files { + if stat, err := os.Stat(f); err != nil || (!stat.IsDir() && !allowFiles) { + continue + } + + // change file name to relative if necessary + if rel && workDir != "" { + f = toRel(workDir, f) + } + + // test matching of file to the argument if match.File(f, a.Last) { prediction = append(prediction, f) } @@ -111,47 +118,44 @@ func files(pattern string, allowDirs, allowFiles bool) PredictFunc { return } } - -func selectByType(names []string, allowDirs bool, allowFiles bool) []string { - filtered := make([]string, 0, len(names)) - for _, name := range names { - stat, err := os.Stat(name) - if err != nil { - continue +func listFiles(dir, pattern string) []string { + m := map[string]bool{} + if files, err := filepath.Glob(filepath.Join(dir, pattern)); err == nil { + for _, f := range files { + m[f] = true } - if (stat.IsDir() && !allowDirs) || (!stat.IsDir() && !allowFiles) { - continue - } - filtered = append(filtered, name) } - return filtered + if dirs, err := ioutil.ReadDir(dir); err == nil { + for _, d := range dirs { + if d.IsDir() { + m[d.Name()] = true + } + } + } + list := make([]string, 0, len(m)) + for k := range m { + list = append(list, k) + } + return list } -// filesToRel, change list of files to their names in the relative -// to current directory form. -func filesToRel(files []string) { - wd, err := os.Getwd() +// toRel changes a file name to a relative name +func toRel(wd, file string) string { + abs, err := filepath.Abs(file) if err != nil { - return + return file } - for i := range files { - abs, err := filepath.Abs(files[i]) - if err != nil { - continue - } - rel, err := filepath.Rel(wd, abs) - if err != nil { - continue - } - if rel != "." { - rel = "./" + rel - } - if info, err := os.Stat(rel); err == nil && info.IsDir() { - rel += "/" - } - files[i] = rel + rel, err := filepath.Rel(wd, abs) + if err != nil { + return file } - return + if rel != "." { + rel = "./" + rel + } + if info, err := os.Stat(rel); err == nil && info.IsDir() { + rel += "/" + } + return rel } // dirFromLast gives the directory of the current written diff --git a/predict_test.go b/predict_test.go index 6b77fbe..ebe8aa1 100644 --- a/predict_test.go +++ b/predict_test.go @@ -60,30 +60,30 @@ func TestPredicate(t *testing.T) { { name: "files/txt", p: PredictFiles("*.txt"), - want: []string{"./a.txt", "./b.txt", "./c.txt", "./.dot.txt"}, + want: []string{"./", "./dir/", "./a.txt", "./b.txt", "./c.txt", "./.dot.txt"}, }, { name: "files/txt", p: PredictFiles("*.txt"), arg: "./dir/", - want: []string{}, + want: []string{"./dir/"}, }, { name: "files/x", p: PredictFiles("x"), arg: "./dir/", - want: []string{"./dir/x"}, + want: []string{"./dir/", "./dir/x"}, }, { name: "files/*", p: PredictFiles("x*"), arg: "./dir/", - want: []string{"./dir/x"}, + want: []string{"./dir/", "./dir/x"}, }, { name: "files/md", p: PredictFiles("*.md"), - want: []string{"./readme.md"}, + want: []string{"./", "./dir/", "./readme.md"}, }, { name: "dirs", @@ -93,7 +93,7 @@ func TestPredicate(t *testing.T) { }, { name: "dirs and files", - p: PredictFilesOrDirs("*"), + p: PredictFiles("*"), arg: "./dir", want: []string{"./dir/", "./dir/x"}, }, @@ -106,7 +106,7 @@ func TestPredicate(t *testing.T) { name: "subdir", p: PredictFiles("*"), arg: "./dir/", - want: []string{"./dir/x"}, + want: []string{"./dir/", "./dir/x"}, }, }