Skip to content

Commit

Permalink
fly: add back upload/download progress
Browse files Browse the repository at this point in the history
#3307

Signed-off-by: Joshua Winters <jwinters@pivotal.io>
  • Loading branch information
Joshua Winters committed Mar 14, 2019
1 parent 9cd411f commit d05a522
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
9 changes: 8 additions & 1 deletion fly/commands/internal/executehelpers/downloads.go
@@ -1,17 +1,24 @@
package executehelpers

import (
"os"

"github.com/concourse/concourse/go-concourse/concourse"
"github.com/concourse/go-archive/tgzfs"
)

func Download(team concourse.Team, artifactID int, path string) error {
pb := progress(path+":", os.Stdout)

pb.Start()
defer pb.Finish()

out, err := team.GetArtifact(artifactID)
if err != nil {
return err
}

defer out.Close()

return tgzfs.Extract(out, path)
return tgzfs.Extract(pb.NewProxyReader(out), path)
}
@@ -1,4 +1,4 @@
package exec
package executehelpers

import (
"io"
Expand Down
8 changes: 7 additions & 1 deletion fly/commands/internal/executehelpers/uploads.go
Expand Up @@ -5,6 +5,7 @@ import (
"bytes"
"errors"
"io"
"os"
"os/exec"

"github.com/concourse/concourse/atc"
Expand All @@ -25,7 +26,12 @@ func Upload(team concourse.Team, path string, includeIgnored bool) (atc.WorkerAr
archiveWriter.CloseWithError(tgzfs.Compress(archiveWriter, path, files...))
}()

return team.CreateArtifact(archiveStream)
pb := progress(path+":", os.Stdout)

pb.Start()
defer pb.Finish()

return team.CreateArtifact(pb.NewProxyReader(archiveStream))
}

func getFiles(dir string, includeIgnored bool) []string {
Expand Down

0 comments on commit d05a522

Please sign in to comment.