From a42da82516811cb87f52d93627179c25d3f0dadd Mon Sep 17 00:00:00 2001 From: Niko Abeler Date: Thu, 13 Oct 2022 21:00:28 +0200 Subject: [PATCH] remove ioutil --- post.go | 4 ++-- repository.go | 3 +-- user.go | 3 +-- user_test.go | 5 ++--- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/post.go b/post.go index b3067e2..cef26c9 100644 --- a/post.go +++ b/post.go @@ -3,8 +3,8 @@ package owl import ( "bytes" "errors" - "io/ioutil" "net/url" + "os" "path" "sort" "sync" @@ -155,7 +155,7 @@ func (post *Post) Meta() PostMeta { func (post *Post) Content() []byte { // read file - data, _ := ioutil.ReadFile(post.ContentFile()) + data, _ := os.ReadFile(post.ContentFile()) return data } diff --git a/repository.go b/repository.go index 65849d7..1c61c89 100644 --- a/repository.go +++ b/repository.go @@ -3,7 +3,6 @@ package owl import ( _ "embed" "fmt" - "io/ioutil" "os" "path" ) @@ -102,7 +101,7 @@ func (repo Repository) FullUrl() string { func (repo Repository) Template() (string, error) { // load base.html path := path.Join(repo.Dir(), "base.html") - base_html, err := ioutil.ReadFile(path) + base_html, err := os.ReadFile(path) if err != nil { return "", err } diff --git a/user.go b/user.go index 181e75c..670ec57 100644 --- a/user.go +++ b/user.go @@ -2,7 +2,6 @@ package owl import ( "fmt" - "io/ioutil" "net/url" "os" "path" @@ -187,7 +186,7 @@ func (user User) CreateNewPost(title string, draft bool) (Post, error) { func (user User) Template() (string, error) { // load base.html path := path.Join(user.Dir(), "meta", "base.html") - base_html, err := ioutil.ReadFile(path) + base_html, err := os.ReadFile(path) if err != nil { return "", err } diff --git a/user_test.go b/user_test.go index e833e6e..d702d1f 100644 --- a/user_test.go +++ b/user_test.go @@ -3,7 +3,6 @@ package owl_test import ( "fmt" "h4kor/owl-blogs" - "io/ioutil" "os" "path" "testing" @@ -15,7 +14,7 @@ func TestCreateNewPostCreatesEntryInPublic(t *testing.T) { user, _ := repo.CreateUser(randomUserName()) // Create a new post user.CreateNewPost("testpost", false) - files, err := ioutil.ReadDir(path.Join(user.Dir(), "public")) + files, err := os.ReadDir(path.Join(user.Dir(), "public")) if err != nil { t.Error("Error reading directory") } @@ -55,7 +54,7 @@ func TestCreateNewPostMultipleCalls(t *testing.T) { user.CreateNewPost("testpost", false) user.CreateNewPost("testpost", false) user.CreateNewPost("testpost", false) - files, err := ioutil.ReadDir(path.Join(user.Dir(), "public")) + files, err := os.ReadDir(path.Join(user.Dir(), "public")) if err != nil { t.Error("Error reading directory") }