Fixing dictionary detection for absolute paths

stefanoj3 · Jul 8, 2019 · e3261c8 · e3261c8
1 parent cca80a0
commit e3261c8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/pkg/dictionary/dictionary.go b/pkg/dictionary/dictionary.go
@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"io"
 	"net/http"
-	"net/url"
 	"os"
 
 	"github.com/pkg/errors"
@@ -13,8 +12,7 @@ import (
 const commentPrefix = "#"
 
 func NewDictionaryFrom(path string, doer Doer) ([]string, error) {
-	_, err := url.ParseRequestURI(path)
-	if err != nil {
+	if _, err := os.Stat(path); !os.IsNotExist(err) {
 		return newDictionaryFromLocalFile(path)
 	}
 

diff --git a/pkg/dictionary/dictionary_integration_test.go b/pkg/dictionary/dictionary_integration_test.go
@@ -3,6 +3,7 @@ package dictionary_test
 import (
 	"net/http"
 	"net/http/httptest"
+	"path/filepath"
 	"testing"
 	"time"
 
@@ -22,6 +23,21 @@ func TestDictionaryFromFile(t *testing.T) {
 	assert.Equal(t, expectedValue, entries)
 }
 
+func TestDictionaryFromAbsolutePath(t *testing.T) {
+	path, err := filepath.Abs("testdata/dict.txt")
+	assert.NoError(t, err)
+
+	entries, err := dictionary.NewDictionaryFrom(path, &http.Client{})
+	assert.NoError(t, err)
+
+	expectedValue := []string{
+		"home",
+		"home/index.php",
+		"blabla",
+	}
+	assert.Equal(t, expectedValue, entries)
+}
+
 func TestDictionaryFromFileWithInvalidPath(t *testing.T) {
 	t.Parallel()
 
@@ -37,6 +53,7 @@ func TestNewDictionaryFromRemoteFile(t *testing.T) {
 /about
 /contacts
 something
+potato
 `
 			w.WriteHeader(http.StatusOK)
 			_, _ = w.Write([]byte(dict))
@@ -52,6 +69,7 @@ something
 		"/about",
 		"/contacts",
 		"something",
+		"potato",
 	}
 	assert.Equal(t, expectedValue, entries)
 }