get rid of ioutil

KappaDistributive · May 12, 2024 · 47ea8f7 · 47ea8f7
1 parent f7a9cbf
commit 47ea8f7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/v1/lesson.go b/v1/lesson.go
@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -22,7 +21,7 @@ func createSampleLessons() {
 		errorHandling(err)
 	}
 
-	files, err := ioutil.ReadDir(home + "/.config/gotypist/lessons")
+	files, err := os.ReadDir(home + "/.config/gotypist/lessons")
 	if err != nil {
 		errorHandling(err)
 	}
@@ -49,7 +48,7 @@ func createSampleLessons() {
 }
 
 func createLessonFromBagOfWords(home string) error {
-	files, err := ioutil.ReadDir("data/bags_of_words")
+	files, err := os.ReadDir("data/bags_of_words")
 	if err != nil {
 		return err
 	}
@@ -65,7 +64,7 @@ func createLessonFromBagOfWords(home string) error {
 }
 
 func createLessonsFromSampleLessons(home string) error{
-	files, err := ioutil.ReadDir("data/sample_lessons")
+	files, err := os.ReadDir("data/sample_lessons")
 	if err != nil {
 		return err
 	}

diff --git a/v1/lesson_test.go b/v1/lesson_test.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
 	"os"
 	"testing"
 )
@@ -18,7 +17,7 @@ func Test_copyLesson_ShouldNotReturnErrorWhenAbleToCreateLesson(t *testing.T) {
 	err := copyLesson(sourceFilePath, targetFilePath)
 
 	assert.NoError(t, err)
-	files, err := ioutil.ReadDir(targetDirectory)
+	files, err := os.ReadDir(targetDirectory)
 	assert.NoError(t, err)
 	assert.Len(t, files, 1)
 	assert.Contains(t, files[0].Name(), targetFile)
@@ -45,4 +44,4 @@ func setupSource(t *testing.T) func(){
 		err := os.RemoveAll("./tmp")
 		assert.NoError(t, err)
 	}
-}
+}
diff --git a/v1/selection.go b/v1/selection.go
@@ -2,11 +2,9 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"math/rand"
 	"os"
 	"strings"
-	"time"
 
 	ui "github.com/gizak/termui/v3"
 	"github.com/gizak/termui/v3/widgets"
@@ -64,7 +62,7 @@ func createSelection(cursorPos int) Selection {
 	lessons := []Lesson{}
 
 	// Create top 300 words lesson
-	data, err := ioutil.ReadFile(home + BagsOfWordsDir + "/en_us.yaml")
+	data, err := os.ReadFile(home + BagsOfWordsDir + "/en_us.yaml")
 	if err != nil {
 		errorHandling(err)
 	}
@@ -76,7 +74,6 @@ func createSelection(cursorPos int) Selection {
 	lesson_length := 0
 	var index int
 	var new_word string
-	rand.Seed(time.Now().UnixNano())
 	for lesson_length < BagsOfWordsLessonLengthInCharacters {
 		index = rand.Intn(299)
 		new_word = bagOfWords.Words[index]
@@ -100,12 +97,12 @@ func createSelection(cursorPos int) Selection {
 	content.Rows = append(content.Rows, lesson.Title)
 
 	// Load lessons from directory
-	files, err := ioutil.ReadDir(home + LessonsDir)
+	files, err := os.ReadDir(home + LessonsDir)
 	if err != nil {
 		errorHandling(err)
 	}
 	for _, fileinfo := range files {
-		data, err := ioutil.ReadFile(home + LessonsDir + "/" + fileinfo.Name())
+		data, err := os.ReadFile(home + LessonsDir + "/" + fileinfo.Name())
 		if err != nil {
 			errorHandling(err)
 		}