From 899caaaeaa7fd1533e782df05b868c267a34d34e Mon Sep 17 00:00:00 2001
From: Shawn Smith <shawnpsmith@gmail.com>
Date: Sun, 26 Feb 2023 13:46:06 +0900
Subject: [PATCH] migrate ioutil

---
 check/license.go          |  4 ++--
 download/proxy.go         |  5 ++---
 handlers/templates.go     |  6 +++---
 tools/clean-repos/main.go | 15 ++++++++++-----
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/check/license.go b/check/license.go
index 4cf3793..3140c6b 100644
--- a/check/license.go
+++ b/check/license.go
@@ -1,7 +1,7 @@
 package check
 
 import (
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strings"
 )
@@ -34,7 +34,7 @@ var licenses = []string{
 
 // Percentage returns 0 if no LICENSE, 1 if LICENSE
 func (g License) Percentage() (float64, []FileSummary, error) {
-	files, err := ioutil.ReadDir(g.Dir)
+	files, err := os.ReadDir(g.Dir)
 	if err != nil {
 		return 0.0, []FileSummary{}, err
 	}
diff --git a/download/proxy.go b/download/proxy.go
index 22b52b4..7eda5c9 100644
--- a/download/proxy.go
+++ b/download/proxy.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"os/exec"
@@ -58,7 +57,7 @@ func (c *ProxyClient) ModuleName(path string) (string, error) {
 	}
 
 	defer resp.Body.Close()
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return "", err
 	}
@@ -92,7 +91,7 @@ func (c *ProxyClient) LatestVersion(path string) (string, error) {
 	defer resp.Body.Close()
 
 	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))
 	}
 
diff --git a/handlers/templates.go b/handlers/templates.go
index 7c6cfa0..a36d547 100644
--- a/handlers/templates.go
+++ b/handlers/templates.go
@@ -2,7 +2,7 @@ package handlers
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"text/template"
 )
 
@@ -22,7 +22,7 @@ func (gh *GRCHandler) loadTemplate(name string) (*template.Template, error) {
 
 	defer f.Close()
 
-	contents, err := ioutil.ReadAll(f)
+	contents, err := io.ReadAll(f)
 	if err != nil {
 		return nil, err
 	}
@@ -46,7 +46,7 @@ func (gh *GRCHandler) loadTemplate(name string) (*template.Template, error) {
 
 	defer base.Close()
 
-	baseContents, err := ioutil.ReadAll(base)
+	baseContents, err := io.ReadAll(base)
 	if err != nil {
 		return nil, err
 	}
diff --git a/tools/clean-repos/main.go b/tools/clean-repos/main.go
index b2a511d..64fe9cf 100644
--- a/tools/clean-repos/main.go
+++ b/tools/clean-repos/main.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"flag"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -13,7 +12,7 @@ var real = flag.Bool("real", false, "run the deletions")
 
 func main() {
 	flag.Parse()
-	files, err := ioutil.ReadDir("_repos/src")
+	files, err := os.ReadDir("_repos/src")
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -23,18 +22,24 @@ func main() {
 			continue
 		}
 		if f.IsDir() {
-			dirs, err := ioutil.ReadDir("_repos/src/" + f.Name())
+			dirs, err := os.ReadDir("_repos/src/" + f.Name())
 			if err != nil {
 				log.Fatal(err)
 			}
 			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 {
 					log.Fatal(err)
 				}
 				for _, repo := range repos {
 					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 {
 							log.Printf("Deleting %s (repo is old)...", path)
 							os.RemoveAll(path)