Merge branch 'sprint-1.11' into fix/auth-ticket

0chain · Dec 4, 2023 · 6e83bac · 6e83bac
2 parents 408bfbe + f2d30c5
commit 6e83bac
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/zboxcore/sdk/allocation.go b/zboxcore/sdk/allocation.go
@@ -60,6 +60,10 @@ const (
 	CanRenameMask = uint16(32) // 0010 0000
 )
 
+const (
+	emptyFileDataHash = "d41d8cd98f00b204e9800998ecf8427e"
+)
+
 // Expected success rate is calculated (NumDataShards)*100/(NumDataShards+NumParityShards)
 
 var GetFileInfo = func(localpath string) (os.FileInfo, error) {
@@ -466,7 +470,6 @@ func (a *Allocation) EncryptAndUploadFileWithThumbnail(
 }
 
 func (a *Allocation) StartMultiUpload(workdir string, localPaths []string, fileNames []string, thumbnailPaths []string, encrypts []bool, chunkNumbers []int, remotePaths []string, isUpdate []bool, isWebstreaming []bool, status StatusCallback) error {
-	l.Logger.Debug("Initialize batch: ", BatchSize, MultiOpBatchSize)
 	if len(localPaths) != len(thumbnailPaths) {
 		return errors.New("invalid_value", "length of localpaths and thumbnailpaths must be equal")
 	}
@@ -556,6 +559,13 @@ func (a *Allocation) StartMultiUpload(workdir string, localPaths []string, fileN
 			Workdir:       workdir,
 			RemotePath:    fileMeta.RemotePath,
 		}
+		if fileMeta.ActualSize == 0 {
+			byteReader := bytes.NewReader([]byte(
+				emptyFileDataHash))
+			operationRequests[idx].FileReader = byteReader
+			operationRequests[idx].Opts = append(operationRequests[idx].Opts, WithActualHash(emptyFileDataHash))
+			operationRequests[idx].FileMeta.ActualSize = int64(len(emptyFileDataHash))
+		}
 		if isUpdate[idx] {
 			operationRequests[idx].OperationType = constants.FileOperationUpdate
 		}

diff --git a/zboxcore/sdk/chunked_upload.go b/zboxcore/sdk/chunked_upload.go
@@ -409,7 +409,9 @@ func (su *ChunkedUpload) process() error {
 		su.progress.UploadLength += chunks.totalReadSize
 
 		if chunks.isFinal {
-			su.fileMeta.ActualHash, err = su.chunkReader.GetFileHash()
+			if su.fileMeta.ActualHash == "" {
+				su.fileMeta.ActualHash, err = su.chunkReader.GetFileHash()
+			}
 			if err != nil {
 				if su.statusCallback != nil {
 					su.statusCallback.Error(su.allocationObj.ID, su.fileMeta.RemotePath, su.opCode, err)

diff --git a/zboxcore/sdk/chunked_upload_option.go b/zboxcore/sdk/chunked_upload_option.go
@@ -97,3 +97,9 @@ func WithEncryptedPoint(point string) ChunkedUploadOption {
 		su.encryptedKeyPoint = point
 	}
 }
+
+func WithActualHash(hash string) ChunkedUploadOption {
+	return func(su *ChunkedUpload) {
+		su.fileMeta.ActualHash = hash
+	}
+}
diff --git a/zboxcore/sdk/downloadworker.go b/zboxcore/sdk/downloadworker.go
@@ -368,6 +368,13 @@ func (req *DownloadRequest) processDownload(ctx context.Context) {
 		op = opThumbnailDownload
 	}
 	fRef := req.fRef
+	if fRef != nil && fRef.ActualFileHash == emptyFileDataHash {
+		if req.statusCallback != nil {
+			req.statusCallback.Completed(
+				req.allocationID, remotePathCB, fRef.Name, "", len(emptyFileDataHash), op)
+		}
+		return
+	}
 	size, chunksPerShard, blocksPerShard := req.size, req.chunksPerShard, req.blocksPerShard
 
 	logger.Logger.Info(