Merge pull request #4 from joeybloggs/v2

V2
deankarn · May 27, 2017 · 7a84e61 · 7a84e61
2 parents c6c9e76 + b27d0e3
commit 7a84e61
Show file tree

Hide file tree

Showing 7 changed files with 157 additions and 111 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 Package go-download
 ===================
-![Project status](https://img.shields.io/badge/version-1.0.0-green.svg)
+![Project status](https://img.shields.io/badge/version-2.0.0-green.svg)
 [![Build Status](https://travis-ci.org/joeybloggs/go-download.svg?branch=master)](https://travis-ci.org/joeybloggs/go-download)
 [![Coverage Status](https://coveralls.io/repos/github/joeybloggs/go-download/badge.svg?branch=master)](https://coveralls.io/github/joeybloggs/go-download?branch=master)
 [![Go Report Card](https://goreportcard.com/badge/github.com/joeybloggs/go-download)](https://goreportcard.com/report/github.com/joeybloggs/go-download)
@@ -20,7 +20,7 @@ go get -u github.com/joeybloggs/go-download
 
 ## Examples
 
-More examples [here](https://github.com/joeybloggs/go-download/tree/master/examples)
+More examples [here](https://github.com/joeybloggs/go-download/tree/master/_examples)
 
 ```go
 package main

diff --git a/examples/basic/main.go → _examples/basic/main.go b/examples/basic/main.go → _examples/basic/main.go
diff --git a/examples/custom-concurrency/main.go → _examples/custom-concurrency/main.go b/examples/custom-concurrency/main.go → _examples/custom-concurrency/main.go
diff --git a/examples/measure-progress/main.go → _examples/measure-progress/main.go b/examples/measure-progress/main.go → _examples/measure-progress/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"io"
 	"log"
 
@@ -14,9 +15,9 @@ func main() {
 	defer progress.Stop()
 
 	options := &download.Options{
-		Proxy: func(name string, size int64, r io.Reader) io.Reader {
+		Proxy: func(name string, download int, size int64, r io.Reader) io.Reader {
 			bar := progress.AddBar(size).
-				PrependName(name, 0, 0).
+				PrependName(fmt.Sprintf("%s-%d", name, download), 0, 0).
 				PrependCounters("%3s / %3s", mpb.UnitBytes, 18, mpb.DwidthSync|mpb.DextraSpace).
 				AppendPercentage(5, 0)
 

diff --git a/cmd/goget/main.go b/cmd/goget/main.go
@@ -0,0 +1,35 @@
+package main
+
+import (
+	"fmt"
+	"io"
+	"log"
+
+	download "github.com/joeybloggs/go-download"
+	"github.com/vbauerster/mpb"
+)
+
+func main() {
+
+	progress := mpb.New().SetWidth(80)
+	defer progress.Stop()
+
+	options := &download.Options{
+		Proxy: func(name string, download int, size int64, r io.Reader) io.Reader {
+			bar := progress.AddBar(size).
+				PrependName(fmt.Sprintf("%s-%d", name, download), 0, 0).
+				PrependCounters("%3s / %3s", mpb.UnitBytes, 18, mpb.DwidthSync|mpb.DextraSpace).
+				AppendPercentage(5, 0)
+
+			return bar.ProxyReader(r)
+		},
+	}
+
+	f, err := download.Open("https://storage.googleapis.com/golang/go1.8.1.src.tar.gz", options)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer f.Close()
+
+	// f implements io.Reader, write file somewhere or do some other sort of work with it
+}