joeac/comitium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove usages of io.ReadFile and os.WriteFile to be compatible with 1.15

Browse Source
This commit is contained in:
nytpu
2021-03-21 07:36:04 -06:00
parent a6914cb410
commit 69a7ab13ff
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/core.go
+3 -3
View File
@@ -15,7 +15,7 @@ package core
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"sync" "sync"
@@ -37,7 +37,7 @@ func Init(dataPath string) error {
fi, err := f.Stat() fi, err := f.Stat()
if err == nil && fi.Size() > 0 { if err == nil && fi.Size() > 0 {
// File is not empty // File is not empty
jsonBytes, err := io.ReadAll(f) jsonBytes, err := ioutil.ReadAll(f)
f.Close() f.Close()
if err != nil { if err != nil {
return fmt.Errorf("read comitium.json error: %w", err) return fmt.Errorf("read comitium.json error: %w", err)
@@ -72,7 +72,7 @@ func (d *FullData) WriteJSON(dataPath string) error {
if err != nil { if err != nil {
return err return err
} }
err = os.WriteFile(path, jsonBytes, 0666) err = ioutil.WriteFile(path, jsonBytes, 0666)
if err != nil { if err != nil {
return err return err
} }
core/entries.go
+3 -2
View File
@@ -12,6 +12,7 @@ package core
import ( import (
"fmt" "fmt"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"sort" "sort"
@@ -116,7 +117,7 @@ Watching these pages for any changes that occur.
=> https://git.nytpu.com/comitium/about/ aggregated using comitium => https://git.nytpu.com/comitium/about/ aggregated using comitium
` `
err := os.WriteFile(path, []byte(rawPage), 0666) err := ioutil.WriteFile(path, []byte(rawPage), 0666)
if err != nil { if err != nil {
return err return err
} }
@@ -161,7 +162,7 @@ func (d *FullData) WriteFeed(dataPath string) error {
=> https://git.nytpu.com/comitium/about/ aggregated using comitium => https://git.nytpu.com/comitium/about/ aggregated using comitium
` `
err := os.WriteFile(path, []byte(rawPage), 0666) err := ioutil.WriteFile(path, []byte(rawPage), 0666)
if err != nil { if err != nil {
return err return err
} }