fix thumbnail write

0chain · Aug 19, 2023 · e46a2c3 · e46a2c3
1 parent 23c8fc0
commit e46a2c3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/code/go/0chain.net/blobbercore/filestore/storage.go b/code/go/0chain.net/blobbercore/filestore/storage.go
@@ -88,15 +88,16 @@ func (fs *FileStore) WriteFile(allocID, conID string, fileData *FileInputData, i
 	if err != nil {
 		return nil, common.NewError("file_write_error", err.Error())
 	}
+	if !fileData.IsThumbnail {
+		_, err = f.Seek(fileData.UploadOffset, io.SeekStart)
+		if err != nil {
+			return nil, common.NewError("file_seek_error", err.Error())
+		}
 
-	_, err = f.Seek(fileData.UploadOffset, io.SeekStart)
-	if err != nil {
-		return nil, common.NewError("file_seek_error", err.Error())
-	}
-
-	_, err = io.CopyBuffer(fileData.Hasher, f, buf)
-	if err != nil {
-		return nil, common.NewError("file_read_error", err.Error())
+		_, err = io.CopyBuffer(fileData.Hasher, f, buf)
+		if err != nil {
+			return nil, common.NewError("file_read_error", err.Error())
+		}
 	}
 
 	finfo, err = f.Stat()

diff --git a/code/go/0chain.net/blobbercore/handler/file_command_update.go b/code/go/0chain.net/blobbercore/handler/file_command_update.go
@@ -171,7 +171,7 @@ func (cmd *UpdateFileCommand) ProcessThumbnail(ctx context.Context, req *http.Re
 	if thumbHeader != nil {
 		defer thumbfile.Close()
 
-		thumbInputData := &filestore.FileInputData{Name: thumbHeader.Filename, Path: cmd.fileChanger.Path}
+		thumbInputData := &filestore.FileInputData{Name: thumbHeader.Filename, Path: cmd.fileChanger.Path, IsThumbnail: true, FilePathHash: encryption.Hash(cmd.fileChanger.Path)}
 		thumbOutputData, err := filestore.GetFileStore().WriteFile(allocationObj.ID, connectionObj.ID, thumbInputData, thumbfile)
 		if err != nil {
 			return common.NewError("upload_error", "Failed to upload the thumbnail. "+err.Error())

diff --git a/code/go/0chain.net/blobbercore/handler/file_command_upload.go b/code/go/0chain.net/blobbercore/handler/file_command_upload.go
@@ -184,7 +184,7 @@ func (cmd *UploadFileCommand) ProcessThumbnail(ctx context.Context, req *http.Re
 	if thumbHeader != nil {
 		defer thumbfile.Close()
 
-		thumbInputData := &filestore.FileInputData{Name: thumbHeader.Filename, Path: cmd.fileChanger.Path}
+		thumbInputData := &filestore.FileInputData{Name: thumbHeader.Filename, Path: cmd.fileChanger.Path, IsThumbnail: true, FilePathHash: encryption.Hash(cmd.fileChanger.Path)}
 		thumbOutputData, err := filestore.GetFileStore().WriteFile(allocationObj.ID, connectionObj.ID, thumbInputData, thumbfile)
 		if err != nil {
 			return common.NewError("upload_error", "Failed to upload the thumbnail. "+err.Error())