0

refactor: move from io/ioutil to io and os packages (#1546)

The io/ioutil package has been deprecated as of Go 1.16, see
https://golang.org/doc/go1.16#ioutil. This commit replaces the existing
io/ioutil functions with their new definitions in io and os packages.

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
This commit is contained in:
Eng Zer Jun 2021-11-20 14:42:50 +08:00 committed by GitHub
parent 00019bf86b
commit 7996df85e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 21 additions and 23 deletions

View File

@ -4,9 +4,9 @@ import (
"encoding/base64" "encoding/base64"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil"
"net" "net"
"net/http" "net/http"
"os"
"path/filepath" "path/filepath"
"reflect" "reflect"
"strings" "strings"
@ -223,7 +223,7 @@ func SetLogo(w http.ResponseWriter, r *http.Request) {
} }
imgPath := filepath.Join("data", "logo"+extension) imgPath := filepath.Join("data", "logo"+extension)
if err := ioutil.WriteFile(imgPath, bytes, 0600); err != nil { if err := os.WriteFile(imgPath, bytes, 0600); err != nil {
controllers.WriteSimpleResponse(w, false, err.Error()) controllers.WriteSimpleResponse(w, false, err.Error())
return return
} }

View File

@ -2,7 +2,6 @@ package controllers
import ( import (
"encoding/json" "encoding/json"
"io/ioutil"
"net/http" "net/http"
"os" "os"
"path" "path"
@ -31,7 +30,7 @@ func getCustomEmojiList() []models.CustomEmoji {
} }
if len(emojiCache) == 0 { if len(emojiCache) == 0 {
files, err := ioutil.ReadDir(fullPath) files, err := os.ReadDir(fullPath)
if err != nil { if err != nil {
log.Errorln(err) log.Errorln(err)
return emojiCache return emojiCache

View File

@ -1,8 +1,8 @@
package controllers package controllers
import ( import (
"io/ioutil"
"net/http" "net/http"
"os"
"path/filepath" "path/filepath"
"strconv" "strconv"
@ -94,5 +94,5 @@ func writeBytesAsImage(data []byte, contentType string, w http.ResponseWriter, c
} }
func getImage(path string) ([]byte, error) { func getImage(path string) ([]byte, error) {
return ioutil.ReadFile(path) // nolint return os.ReadFile(path) // nolint
} }

View File

@ -2,13 +2,12 @@ package data
import ( import (
"fmt" "fmt"
"io/ioutil"
"os" "os"
"testing" "testing"
) )
func TestMain(m *testing.M) { func TestMain(m *testing.M) {
dbFile, err := ioutil.TempFile(os.TempDir(), "owncast-test-db.db") dbFile, err := os.CreateTemp(os.TempDir(), "owncast-test-db.db")
if err != nil { if err != nil {
panic(err) panic(err)
} }

View File

@ -4,7 +4,6 @@ import (
"bufio" "bufio"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"time" "time"
@ -88,7 +87,7 @@ func SetStreamAsDisconnected() {
offlineFileData := static.GetOfflineSegment() offlineFileData := static.GetOfflineSegment()
offlineFilename := "offline.ts" offlineFilename := "offline.ts"
offlineTmpFile, err := ioutil.TempFile(os.TempDir(), offlineFilename) offlineTmpFile, err := os.CreateTemp(os.TempDir(), offlineFilename)
if err != nil { if err != nil {
log.Errorln("unable to create temp file for offline video segment") log.Errorln("unable to create temp file for offline video segment")
} }

View File

@ -1,7 +1,6 @@
package transcoder package transcoder
import ( import (
"io/ioutil"
"os" "os"
"os/exec" "os/exec"
"path" "path"
@ -54,15 +53,20 @@ func fireThumbnailGenerator(segmentPath string, variantIndex int) error {
previewGifFile := path.Join(config.WebRoot, "preview.gif") previewGifFile := path.Join(config.WebRoot, "preview.gif")
framePath := path.Join(segmentPath, strconv.Itoa(variantIndex)) framePath := path.Join(segmentPath, strconv.Itoa(variantIndex))
files, err := ioutil.ReadDir(framePath) files, err := os.ReadDir(framePath)
if err != nil { if err != nil {
return err return err
} }
var modTime time.Time var modTime time.Time
var names []string var names []string
for _, fi := range files { for _, f := range files {
if path.Ext(fi.Name()) != ".ts" { if path.Ext(f.Name()) != ".ts" {
continue
}
fi, err := f.Info()
if err != nil {
continue continue
} }

View File

@ -8,7 +8,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@ -20,7 +19,7 @@ import (
func Restore(backupFile string, databaseFile string) error { func Restore(backupFile string, databaseFile string) error {
log.Printf("Restoring database backup %s to %s", backupFile, databaseFile) log.Printf("Restoring database backup %s to %s", backupFile, databaseFile)
data, err := ioutil.ReadFile(backupFile) // nolint data, err := os.ReadFile(backupFile) // nolint
if err != nil { if err != nil {
return fmt.Errorf("unable to read backup file %s", err) return fmt.Errorf("unable to read backup file %s", err)
} }

View File

@ -4,7 +4,6 @@ import (
"bytes" "bytes"
"errors" "errors"
"fmt" "fmt"
"io/ioutil"
"math/rand" "math/rand"
"net/url" "net/url"
"os" "os"
@ -52,12 +51,12 @@ func GetIndexFromFilePath(path string) string {
// Copy copies the file to destination. // Copy copies the file to destination.
func Copy(source, destination string) error { func Copy(source, destination string) error {
input, err := ioutil.ReadFile(source) // nolint input, err := os.ReadFile(source) // nolint
if err != nil { if err != nil {
return err return err
} }
return ioutil.WriteFile(destination, input, 0600) return os.WriteFile(destination, input, 0600)
} }
// Move moves the file to destination. // Move moves the file to destination.

View File

@ -2,13 +2,12 @@ package yp
import ( import (
"bytes" "bytes"
"io/ioutil" "encoding/json"
"io"
"net/http" "net/http"
"net/url" "net/url"
"time" "time"
"encoding/json"
"github.com/owncast/owncast/config" "github.com/owncast/owncast/config"
"github.com/owncast/owncast/core/data" "github.com/owncast/owncast/core/data"
"github.com/owncast/owncast/models" "github.com/owncast/owncast/models"
@ -107,7 +106,7 @@ func (yp *YP) ping() {
} }
defer resp.Body.Close() defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body) body, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
log.Errorln(err) log.Errorln(err)
} }