migrate ioutil

This commit is contained in:
Shawn Smith
2023-02-26 13:46:06 +09:00
parent caa5123e9e
commit 899caaaeaa
4 changed files with 17 additions and 13 deletions

View File

@@ -1,7 +1,7 @@
package check package check
import ( import (
"io/ioutil" "os"
"path/filepath" "path/filepath"
"strings" "strings"
) )
@@ -34,7 +34,7 @@ var licenses = []string{
// Percentage returns 0 if no LICENSE, 1 if LICENSE // Percentage returns 0 if no LICENSE, 1 if LICENSE
func (g License) Percentage() (float64, []FileSummary, error) { func (g License) Percentage() (float64, []FileSummary, error) {
files, err := ioutil.ReadDir(g.Dir) files, err := os.ReadDir(g.Dir)
if err != nil { if err != nil {
return 0.0, []FileSummary{}, err return 0.0, []FileSummary{}, err
} }

View File

@@ -4,7 +4,6 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"net/http" "net/http"
"os" "os"
"os/exec" "os/exec"
@@ -58,7 +57,7 @@ func (c *ProxyClient) ModuleName(path string) (string, error) {
} }
defer resp.Body.Close() defer resp.Body.Close()
b, err := ioutil.ReadAll(resp.Body) b, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return "", err return "", err
} }
@@ -92,7 +91,7 @@ func (c *ProxyClient) LatestVersion(path string) (string, error) {
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
b, _ := ioutil.ReadAll(resp.Body) b, _ := io.ReadAll(resp.Body)
return "", fmt.Errorf("could not get latest module version from %s: %s", u, string(b)) return "", fmt.Errorf("could not get latest module version from %s: %s", u, string(b))
} }

View File

@@ -2,7 +2,7 @@ package handlers
import ( import (
"fmt" "fmt"
"io/ioutil" "io"
"text/template" "text/template"
) )
@@ -22,7 +22,7 @@ func (gh *GRCHandler) loadTemplate(name string) (*template.Template, error) {
defer f.Close() defer f.Close()
contents, err := ioutil.ReadAll(f) contents, err := io.ReadAll(f)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -46,7 +46,7 @@ func (gh *GRCHandler) loadTemplate(name string) (*template.Template, error) {
defer base.Close() defer base.Close()
baseContents, err := ioutil.ReadAll(base) baseContents, err := io.ReadAll(base)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@@ -2,7 +2,6 @@ package main
import ( import (
"flag" "flag"
"io/ioutil"
"log" "log"
"os" "os"
"path/filepath" "path/filepath"
@@ -13,7 +12,7 @@ var real = flag.Bool("real", false, "run the deletions")
func main() { func main() {
flag.Parse() flag.Parse()
files, err := ioutil.ReadDir("_repos/src") files, err := os.ReadDir("_repos/src")
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
@@ -23,18 +22,24 @@ func main() {
continue continue
} }
if f.IsDir() { if f.IsDir() {
dirs, err := ioutil.ReadDir("_repos/src/" + f.Name()) dirs, err := os.ReadDir("_repos/src/" + f.Name())
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
for _, d := range dirs { for _, d := range dirs {
repos, err := ioutil.ReadDir("_repos/src/" + f.Name() + "/" + d.Name()) repos, err := os.ReadDir("_repos/src/" + f.Name() + "/" + d.Name())
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
for _, repo := range repos { for _, repo := range repos {
path := "_repos/src/" + f.Name() + "/" + d.Name() + "/" + repo.Name() path := "_repos/src/" + f.Name() + "/" + d.Name() + "/" + repo.Name()
if time.Since(d.ModTime()) > 30*24*time.Hour {
info, err := d.Info()
if err != nil {
log.Fatal(err)
}
if time.Since(info.ModTime()) > 30*24*time.Hour {
if *real { if *real {
log.Printf("Deleting %s (repo is old)...", path) log.Printf("Deleting %s (repo is old)...", path)
os.RemoveAll(path) os.RemoveAll(path)