Merge pull request #78 from Azure/dev

giventocode · web-flow · commit 35cb5d7c3d1d · 2018-01-30T02:54:54.000-05:00
v0.5.2.5
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ Sources and targets are decoupled, this design enables the composition of variou
 Download, extract and set permissions:
 
 ```bash
-wget -O bp_linux.tar.gz https://github.com/Azure/blobporter/releases/download/v0.5.23/bp_linux.tar.gz
+wget -O bp_linux.tar.gz https://github.com/Azure/blobporter/releases/download/v0.5.24/bp_linux.tar.gz
 tar -xvf bp_linux.tar.gz linux_amd64/blobporter
 chmod +x ~/linux_amd64/blobporter
 cd ~/linux_amd64
@@ -46,7 +46,7 @@ export ACCOUNT_KEY=<STORAGE_ACCOUNT_KEY>
 
 ### Windows
 
-Download [BlobPorter.exe](https://github.com/Azure/blobporter/releases/download/v0.5.23/bp_windows.zip)
+Download [BlobPorter.exe](https://github.com/Azure/blobporter/releases/download/v0.5.24/bp_windows.zip)
 
 Set environment variables (if using the command prompt):
 
diff --git a/blobporter.go b/blobporter.go
@@ -54,7 +54,7 @@ const (
 	s3AccessKeyEnvVar = "S3_ACCESS_KEY"
 	s3SecretKeyEnvVar = "S3_SECRET_KEY"
 
-	programVersion = "0.5.23" // version number to show in help
+	programVersion = "0.5.25" // version number to show in help
 )
 
 const numOfWorkersFactor = 8
diff --git a/sources/http.go b/sources/http.go
@@ -49,10 +49,11 @@ func newHTTPSource(sourceListManager objectListManager, pipelineFactory sourceHT
 
 	for b := 0; b < numOfBatches; b++ {
 
+		start = b * numOfFilesInBatch
+
 		if filesSent < numOfFilesInBatch {
 			numOfFilesInBatch = filesSent
 		}
-		start = b * numOfFilesInBatch
 
 		httpSource := HTTPPipeline{Sources: sourceInfos[start : start+numOfFilesInBatch], HTTPClient: util.NewHTTPClient(), includeMD5: includeMD5}
 
diff --git a/sources/s3info.go b/sources/s3info.go
@@ -118,7 +118,6 @@ func (s *s3InfoProvider) getObjectLists() (map[string][]minio.ObjectInfo, error)
 			if object.Err != nil {
 				return nil, object.Err
 			}
-
 			list = append(list, object)
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ const (`
`54`	`54`	`s3AccessKeyEnvVar = "S3_ACCESS_KEY"`
`55`	`55`	`s3SecretKeyEnvVar = "S3_SECRET_KEY"`
`56`	`56`
`57`		`- programVersion = "0.5.23" // version number to show in help`
	`57`	`+ programVersion = "0.5.25" // version number to show in help`
`58`	`58`	`)`
`59`	`59`
`60`	`60`	`const numOfWorkersFactor = 8`
Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,11 @@ func newHTTPSource(sourceListManager objectListManager, pipelineFactory sourceHT`
`49`	`49`
`50`	`50`	`for b := 0; b < numOfBatches; b++ {`
`51`	`51`
	`52`	`+ start = b * numOfFilesInBatch`
	`53`	`+`
`52`	`54`	`if filesSent < numOfFilesInBatch {`
`53`	`55`	`numOfFilesInBatch = filesSent`
`54`	`56`	`}`
`55`		`- start = b * numOfFilesInBatch`
`56`	`57`
`57`	`58`	`httpSource := HTTPPipeline{Sources: sourceInfos[start : start+numOfFilesInBatch], HTTPClient: util.NewHTTPClient(), includeMD5: includeMD5}`
`58`	`59`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,6 @@ func (s *s3InfoProvider) getObjectLists() (map[string][]minio.ObjectInfo, error)`
`118`	`118`	`if object.Err != nil {`
`119`	`119`	`return nil, object.Err`
`120`	`120`	`}`
`121`		`-`
`122`	`121`	`list = append(list, object)`
`123`	`122`	`}`
`124`	`123`