download: respect user-defined timeout

Itxaka · Sep 30, 2021 · 9546a28 · 9546a28
1 parent f331ed4
commit 9546a28
Showing 1 changed file with 27 additions and 2 deletions.
diff --git a/pkg/plugins/download.go b/pkg/plugins/download.go
@@ -45,9 +45,34 @@ func Download(s schema.Stage, fs vfs.FS, console Console) error {
 
 func downloadFile(dl schema.Download) error {
  log.Debug("Downloading file ", dl.Path, dl.URL)
- resp, err := grab.Get(dl.Path, dl.URL)
+ client := grabClient(dl.Timeout)
+
+ req, err := grab.NewRequest(dl.Path, dl.URL)
  if err != nil {
- log.Fatal(err)
+ return err
+ }
+ resp := client.Do(req)
+
+ t := time.NewTicker(500 * time.Millisecond)
+ defer t.Stop()
+
+Loop:
+ for {
+ select {
+ case <-t.C:
+ log.Debugf(" transferred %v / %v bytes (%.2f%%)\n",
+ resp.BytesComplete(),
+ resp.Size,
+ 100*resp.Progress())
+
+ case <-resp.Done:
+ // download is complete
+ break Loop
+ }
+ }
+
+ if err := resp.Err(); err != nil {
+ return err
  }
 
  file := resp.Filename