Merge pull request imroc#44 from maddie/progress-interval

Allow customization of progress reporting interval

req.go

@@ -121,15 +121,17 @@ func BodyXML(v interface{}) *bodyXml {
 
 // Req is a convenient client for initiating requests
 type Req struct {
-	client      *http.Client
-	jsonEncOpts *jsonEncOpts
-	xmlEncOpts  *xmlEncOpts
-	flag        int
+	client           *http.Client
+	jsonEncOpts      *jsonEncOpts
+	xmlEncOpts       *xmlEncOpts
+	flag             int
+	progressInterval time.Duration
 }
 
 // New create a new *Req
 func New() *Req {
-	return &Req{flag: LstdFlags}
+	// default progress reporting interval is 200 milliseconds
+	return &Req{flag: LstdFlags, progressInterval: 200 * time.Millisecond}
 }
 
 type param struct {
@@ -277,9 +279,10 @@ func (r *Req) Do(method, rawurl string, vs ...interface{}) (resp *Resp, err erro
 			up = UploadProgress(progress)
 		}
 		multipartHelper := &multipartHelper{
-			form:           formParam.Values,
-			uploads:        uploads,
-			uploadProgress: up,
+			form:             formParam.Values,
+			uploads:          uploads,
+			uploadProgress:   up,
+			progressInterval: resp.r.progressInterval,
 		}
 		multipartHelper.Upload(req)
 		resp.multipartHelper = multipartHelper
@@ -484,10 +487,11 @@ func (b *bodyWrapper) Read(p []byte) (n int, err error) {
 }
 
 type multipartHelper struct {
-	form           url.Values
-	uploads        []FileUpload
-	dump           []byte
-	uploadProgress UploadProgress
+	form             url.Values
+	uploads          []FileUpload
+	dump             []byte
+	uploadProgress   UploadProgress
+	progressInterval time.Duration
 }
 
 func (m *multipartHelper) Upload(req *http.Request) {
@@ -528,7 +532,7 @@ func (m *multipartHelper) Upload(req *http.Request) {
 							return _err
 						}
 						current += int64(n)
-						if now := time.Now(); now.Sub(lastTime) > 200*time.Millisecond {
+						if now := time.Now(); now.Sub(lastTime) > m.progressInterval {
 							lastTime = now
 							m.uploadProgress(current, total)
 						}

resp.go

@@ -137,7 +137,7 @@ func (r *Resp) download(file *os.File) error {
 				return _err
 			}
 			current += int64(l)
-			if now := time.Now(); now.Sub(lastTime) > 200*time.Millisecond {
+			if now := time.Now(); now.Sub(lastTime) > r.r.progressInterval {
 				lastTime = now
 				r.downloadProgress(current, total)
 			}

setting.go

@@ -234,3 +234,15 @@ func (r *Req) SetXMLIndent(prefix, indent string) {
 func SetXMLIndent(prefix, indent string) {
 	std.SetXMLIndent(prefix, indent)
 }
+
+// SetProgressInterval sets the progress reporting interval of both
+// UploadProgress and DownloadProgress handler
+func (r *Req) SetProgressInterval(interval time.Duration) {
+	r.progressInterval = interval
+}
+
+// SetProgressInterval sets the progress reporting interval of both
+// UploadProgress and DownloadProgress handler for the default client
+func SetProgressInterval(interval time.Duration) {
+	std.SetProgressInterval(interval)
+}