oliver/nwg-drawer
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace deprecated types

Browse Source
This commit is contained in:
piotr
2022-09-21 00:48:28 +02:00
parent 87d2a74db0
commit 11241cef0b
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools.go
View File

@@ -7,7 +7,6 @@ import (
"fmt" "fmt"
"io" "io"
"io/fs" "io/fs"
"io/ioutil"
"os" "os"
"os/exec" "os/exec"
"path" "path"
@@ -143,7 +142,7 @@ func tempDir() string {
} }
func readTextFile(path string) (string, error) { func readTextFile(path string) (string, error) {
bytes, err := ioutil.ReadFile(path) bytes, err := os.ReadFile(path)
if err != nil { if err != nil {
return "", err return "", err
} }
@@ -256,10 +255,13 @@ func loadPreferredApps(path string) (map[string]interface{}, error) {
} }
defer jsonFile.Close() defer jsonFile.Close()
byteValue, _ := ioutil.ReadAll(jsonFile) byteValue, _ := io.ReadAll(jsonFile)
var result map[string]interface{} var result map[string]interface{}
json.Unmarshal([]byte(byteValue), &result) err = json.Unmarshal([]byte(byteValue), &result)
if err != nil {
return nil, err
}
if len(result) == 0 { if len(result) == 0 {
return nil, errors.New("json invalid or empty") return nil, errors.New("json invalid or empty")
@@ -268,8 +270,8 @@ func loadPreferredApps(path string) (map[string]interface{}, error) {
return result, nil return result, nil
} }
func listFiles(dir string) ([]fs.FileInfo, error) { func listFiles(dir string) ([]fs.DirEntry, error) {
files, err := ioutil.ReadDir(dir) files, err := os.ReadDir(dir)
if err == nil { if err == nil {
return files, nil return files, nil
} }
@@ -458,7 +460,7 @@ func pathExists(name string) bool {
} }
func loadTextFile(path string) ([]string, error) { func loadTextFile(path string) ([]string, error) {
bytes, err := ioutil.ReadFile(path) bytes, err := os.ReadFile(path)
if err != nil { if err != nil {
return nil, err return nil, err
} }