Bump github.com/cavaliergopher/grab from 1.0.0 to 3.0.1 (#462)

Co-authored-by: CrazyMax <crazy-max@users.noreply.github.com>

Author: crazy-max

app/utils/netu/netu.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cavaliercoder/grab"
+	"github.com/cavaliergopher/grab/v3"
 )
 
 // GetCIDRFromIPRange converts IP range to CIDR
@@ -77,27 +77,30 @@ func GetIpsFromIPRange(ipRange string) ([]string, error) {
 
 // DownloadFile downloads a file and display status
 func DownloadFile(filename string, url string) error {
-	req, err := grab.NewRequest(url)
+	client := grab.NewClient()
+	req, err := grab.NewRequest(filename, url)
 	if err != nil {
 		return err
 	}
-	req.Filename = filename
 
-	respch := grab.DefaultClient.DoAsync(req)
-	resp := <-respch
-
-	ticker := time.NewTicker(200 * time.Millisecond)
-	for range ticker.C {
-		if resp.IsComplete() {
-			if resp.Error != nil {
-				return resp.Error
-			}
-			break
+	resp := client.Do(req)
+	t := time.NewTicker(200 * time.Millisecond)
+	defer t.Stop()
+
+Loop:
+	for {
+		select {
+		case <-t.C:
+			fmt.Print(".")
+		case <-resp.Done:
+			break Loop
 		}
-		fmt.Print(".")
 	}
 
-	ticker.Stop()
+	if err := resp.Err(); err != nil {
+		return err
+	}
+
 	return nil
 }
 

go.mod

@@ -6,9 +6,8 @@ require (
 	github.com/0xrawsec/golang-evtx v1.2.9
 	github.com/PuerkitoBio/goquery v1.8.0
 	github.com/akyoto/color v1.8.12
-	github.com/cavaliercoder/grab v1.0.0
+	github.com/cavaliergopher/grab/v3 v3.0.1
 	github.com/cevaris/ordered_map v0.0.0-20190319150403-3adeae072e73
-	github.com/djherbis/times v1.5.0 // indirect
 	github.com/go-ole/go-ole v1.2.6
 	github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b
 	github.com/josephspurrier/goversioninfo v1.4.0

go.sum

@@ -17,14 +17,12 @@ github.com/akyoto/tty v0.1.4 h1:TELbnAmrPTIrUJyuBLhrOSCcBnklC2fh0YeCTjksiDE=
 github.com/akyoto/tty v0.1.4/go.mod h1:fkWwtA4F5Cq9kiQSlWdkPy5kAyySGYqalWyaRKn3zHo=
 github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c=
 github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
-github.com/cavaliercoder/grab v1.0.0 h1:H6VQ1NiLO7AvXM6ZyaInnoZrRLeo2FoUTQEcXln4bvQ=
-github.com/cavaliercoder/grab v1.0.0/go.mod h1:tTBkfNqSBfuMmMBFaO2phgyhdYhiZQ/+iXCZDzcDsMI=
+github.com/cavaliergopher/grab/v3 v3.0.1 h1:4z7TkBfmPjmLAAmkkAZNX/6QJ1nNFdv3SdIHXju0Fr4=
+github.com/cavaliergopher/grab/v3 v3.0.1/go.mod h1:1U/KNnD+Ft6JJiYoYBAimKH2XrYptb8Kl3DFGmsjpq4=
 github.com/cevaris/ordered_map v0.0.0-20190319150403-3adeae072e73 h1:q1g9lSyo/nOIC3W5E3FK3Unrz8b9LdLXCyuC+ZcpPC0=
 github.com/cevaris/ordered_map v0.0.0-20190319150403-3adeae072e73/go.mod h1:507vXsotcZop7NZfBWdhPmVeOse4ko2R7AagJYrpoEg=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/djherbis/times v1.5.0 h1:79myA211VwPhFTqUk8xehWrsEO+zcIZj0zT8mXPVARU=
-github.com/djherbis/times v1.5.0/go.mod h1:5q7FDLvbNg1L/KaBmPcWlVR9NmoKo3+ucqUA3ijQhA0=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=