refactoring

2 files changed, 18 insertions, 23 deletions

diff --git a/weed/filer/filechunk_manifest.go b/weed/filer/filechunk_manifest.go
index fabb7f879..200fde438 100644
--- a/weed/filer/filechunk_manifest.go
+++ b/weed/filer/filechunk_manifest.go
@@ -89,10 +89,15 @@ func fetchChunk(lookupFileIdFn LookupFileIdFunctionType, fileId string, cipherKe
 		glog.Errorf("operation LookupFileId %s failed, err: %v", fileId, err)
 		return nil, err
 	}
-	var buffer bytes.Buffer
+	return fetchChunkData(urlStrings, cipherKey, isGzipped, true, 0, 0)
+}
 
+func fetchChunkData(urlStrings []string, cipherKey []byte, isGzipped bool, isFullChunk bool, offset int64, size int) ([]byte, error) {
+
+	var err error
+	var buffer bytes.Buffer
 	for _, urlString := range urlStrings {
-		err = util.ReadUrlAsStream(urlString, cipherKey, isGzipped, true, 0, 0, func(data []byte) {
+		err = util.ReadUrlAsStream(urlString, cipherKey, isGzipped, isFullChunk, offset, size, func(data []byte) {
 			buffer.Write(data)
 		})
 		if err != nil {
diff --git a/weed/filer/stream.go b/weed/filer/stream.go
index d98229379..e1be18f69 100644
--- a/weed/filer/stream.go
+++ b/weed/filer/stream.go
@@ -32,18 +32,13 @@ func StreamContent(masterClient *wdclient.MasterClient, w io.Writer, chunks []*f
 	for _, chunkView := range chunkViews {
 
 		urlStrings := fileId2Url[chunkView.FileId]
-		for _, urlString := range urlStrings {
-			err := util.ReadUrlAsStream(urlString, chunkView.CipherKey, chunkView.IsGzipped, chunkView.IsFullChunk(), chunkView.Offset, int(chunkView.Size), func(data []byte) {
-				w.Write(data)
-			})
-			if err != nil {
-				// data already written to w would be wrong
-				// but usually there are nothing written if fails to read
-				glog.V(1).Infof("read %s failed, err: %v", chunkView.FileId, err)
-			} else {
-				break
-			}
+
+		data, err := fetchChunkData(urlStrings, chunkView.CipherKey, chunkView.IsGzipped, chunkView.IsFullChunk(), chunkView.Offset, int(chunkView.Size))
+		if err == nil {
+			return err
 		}
+		w.Write(data)
+
 	}
 
 	return nil
@@ -68,17 +63,12 @@ func ReadAll(masterClient *wdclient.MasterClient, chunks []*filer_pb.FileChunk)
 			glog.V(1).Infof("operation LookupFileId %s failed, err: %v", chunkView.FileId, err)
 			return nil, err
 		}
-		for _, urlString := range urlStrings {
-			err = util.ReadUrlAsStream(urlString, chunkView.CipherKey, chunkView.IsGzipped, chunkView.IsFullChunk(), chunkView.Offset, int(chunkView.Size), func(data []byte) {
-				buffer.Write(data)
-			})
-			if err != nil {
-				glog.V(1).Infof("read %s failed, err: %v", chunkView.FileId, err)
-				buffer.Reset()
-			} else {
-				break
-			}
+
+		data, err := fetchChunkData(urlStrings, chunkView.CipherKey, chunkView.IsGzipped, chunkView.IsFullChunk(), chunkView.Offset, int(chunkView.Size))
+		if err != nil {
+			return nil, err
 		}
+		buffer.Write(data)
 	}
 	return buffer.Bytes(), nil
 }