feat!: Update GetWordList to return []string instead of []byte

eljamo · Dec 5, 2023 · ad54316 · ad54316
1 parent ea9286f
commit ad54316
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 21 deletions.
diff --git a/asset/asset.go b/asset/asset.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/eljamo/libpass/v2/config"
+	"github.com/eljamo/libpass/v3/config"
 )
 
 //go:embed preset/* word_list/*
@@ -68,7 +68,7 @@ func LoadJSONFile(filePath string) (string, error) {
 	return loadFileData(filePath, os.ReadFile)
 }
 
-func GetWordList(key string) ([]byte, error) {
+func GetWordList(key string) ([]string, error) {
 	fileName, ok := keyToFile(key, config.WordListKey)
 	if !ok {
 		return nil, fmt.Errorf("invalid word list key '%s'", key)
@@ -80,7 +80,7 @@ func GetWordList(key string) ([]byte, error) {
 		return nil, fmt.Errorf("failed to read embedded text file '%s': %w", filePath, err)
 	}
 
-	return data, nil
+	return strings.Split(string(data), "\n"), nil
 }
 
 func GetJSONPreset(key string) (string, error) {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/eljamo/libpass/v2
+module github.com/eljamo/libpass/v3
 
 go 1.21.4
 

diff --git a/service/padding.go b/service/padding.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/eljamo/libpass/v2/config"
-	"github.com/eljamo/libpass/v2/internal/stringcheck"
+	"github.com/eljamo/libpass/v3/config"
+	"github.com/eljamo/libpass/v3/internal/stringcheck"
 )
 
 type PaddingService interface {

diff --git a/service/padding_test.go b/service/padding_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/eljamo/libpass/v2/config"
+	"github.com/eljamo/libpass/v3/config"
 )
 
 func TestNewPaddingService(t *testing.T) {

diff --git a/service/password_generator.go b/service/password_generator.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/eljamo/libpass/v2/config"
+	"github.com/eljamo/libpass/v3/config"
 )
 
 type PasswordGeneratorService interface {

diff --git a/service/password_generator_test.go b/service/password_generator_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/eljamo/libpass/v2/config"
+	"github.com/eljamo/libpass/v3/config"
 )
 
 type mockTransformerService struct{}

diff --git a/service/separator.go b/service/separator.go
@@ -3,8 +3,8 @@ package service
 import (
 	"errors"
 
-	"github.com/eljamo/libpass/v2/config"
-	"github.com/eljamo/libpass/v2/internal/stringcheck"
+	"github.com/eljamo/libpass/v3/config"
+	"github.com/eljamo/libpass/v3/internal/stringcheck"
 )
 
 type SeparatorService interface {

diff --git a/service/separator_test.go b/service/separator_test.go
@@ -4,7 +4,7 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/eljamo/libpass/v2/config"
+	"github.com/eljamo/libpass/v3/config"
 )
 
 func TestNewSeparatorService(t *testing.T) {

diff --git a/service/transformer.go b/service/transformer.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/eljamo/libpass/v2/config"
+	"github.com/eljamo/libpass/v3/config"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 )

diff --git a/service/transformer_test.go b/service/transformer_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/eljamo/libpass/v2/config"
+	"github.com/eljamo/libpass/v3/config"
 )
 
 func TestNewTransformerService(t *testing.T) {

diff --git a/service/word_list.go b/service/word_list.go
@@ -3,10 +3,9 @@ package service
 import (
 	"errors"
 	"fmt"
-	"strings"
 
-	"github.com/eljamo/libpass/v2/asset"
-	"github.com/eljamo/libpass/v2/config"
+	"github.com/eljamo/libpass/v3/asset"
+	"github.com/eljamo/libpass/v3/config"
 )
 
 type WordListService interface {
@@ -46,10 +45,8 @@ func getWordList(wordList string, wordMinLength int, wordMaxLength int) ([]strin
 		return nil, err
 	}
 
-	aw := strings.Split(string(wl), "\n")
 	var fw []string
-
-	for _, word := range aw {
+	for _, word := range wl {
 		if len(word) >= wordMinLength && len(word) <= wordMaxLength {
 			fw = append(fw, string(word))
 		}

diff --git a/service/word_list_test.go b/service/word_list_test.go
@@ -3,7 +3,7 @@ package service
 import (
 	"testing"
 
-	"github.com/eljamo/libpass/v2/config"
+	"github.com/eljamo/libpass/v3/config"
 )
 
 func TestNewWordListService(t *testing.T) {