From 8bd10f4cf2473d42da5b10401c3f0b499a340001 Mon Sep 17 00:00:00 2001
From: Abhinav-grd <abhinavk.grd@gmail.com>
Date: Tue, 10 Aug 2021 11:06:03 +0530
Subject: [PATCH] better names

---
 src/services/upload/s3Service.ts | 25 ++++++++++++-------------
 src/utils/network/index.ts       |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/services/upload/s3Service.ts b/src/services/upload/s3Service.ts
index 9dc0a4450..abd1f65d9 100644
--- a/src/services/upload/s3Service.ts
+++ b/src/services/upload/s3Service.ts
@@ -7,21 +7,20 @@ interface PartEtag{
     PartNumber:number;
     Etag:string;
 }
-export function calculatePartCount(encryptedChunkCount: number) {
+export function calculatePartCount(chunkCount: number) {
     const partCount = Math.ceil(
-        encryptedChunkCount / CHUNKS_COMBINED_FOR_A_UPLOAD_PART,
+        chunkCount / CHUNKS_COMBINED_FOR_A_UPLOAD_PART,
     );
     return partCount;
 }
-export async function uploadStreamUsingMultipart(filename:string, encryptedData:DataStream, progressTracker) {
-    const { chunkCount, stream } = encryptedData;
-    const uploadPartCount = calculatePartCount(chunkCount);
-    const filePartUploadURLs = await NetworkClient.fetchMultipartUploadURLs(
+export async function uploadStreamUsingMultipart(filename:string, dataStream:DataStream, progressTracker) {
+    const uploadPartCount = calculatePartCount(dataStream.chunkCount);
+    const multipartUploadURLs = await NetworkClient.fetchMultipartUploadURLs(
         uploadPartCount,
     );
     const fileObjectKey = await uploadStreamInParts(
-        filePartUploadURLs,
-        stream,
+        multipartUploadURLs,
+        dataStream.stream,
         filename,
         uploadPartCount,
         progressTracker,
@@ -31,12 +30,12 @@ export async function uploadStreamUsingMultipart(filename:string, encryptedData:
 
 export async function uploadStreamInParts(
     multipartUploadURLs: MultipartUploadURLs,
-    file: ReadableStream<Uint8Array>,
+    dataStream: ReadableStream<Uint8Array>,
     filename: string,
     uploadPartCount: number,
     progressTracker,
 ) {
-    const encryptedFileStreamReader = file.getReader();
+    const streamReader = dataStream.getReader();
     const percentPerPart = getRandomProgressPerPartUpload(uploadPartCount);
 
     const partEtags:PartEtag[] = [];
@@ -44,7 +43,7 @@ export async function uploadStreamInParts(
         index,
         fileUploadURL,
     ] of multipartUploadURLs.partURLs.entries()) {
-        const uploadChunk = await combineChunksToFormUploadPart(encryptedFileStreamReader);
+        const uploadChunk = await combineChunksToFormUploadPart(streamReader);
         const eTag= await NetworkClient.putFilePart(fileUploadURL, uploadChunk, progressTracker.bind(null, filename, percentPerPart, index));
         partEtags.push({ PartNumber: index+1, Etag: eTag });
     }
@@ -61,11 +60,11 @@ export function getRandomProgressPerPartUpload(uploadPartCount:number) {
 }
 
 
-export async function combineChunksToFormUploadPart(dataStreamReader:ReadableStreamDefaultReader<Uint8Array>) {
+export async function combineChunksToFormUploadPart(streamReader:ReadableStreamDefaultReader<Uint8Array>) {
     const combinedChunks = [];
     for (let i = 0; i < CHUNKS_COMBINED_FOR_A_UPLOAD_PART; i++) {
         const { done, value: chunk } =
-        await dataStreamReader.read();
+        await streamReader.read();
         if (done) {
             break;
         }
diff --git a/src/utils/network/index.ts b/src/utils/network/index.ts
index 0dd0e137b..5d68825fe 100644
--- a/src/utils/network/index.ts
+++ b/src/utils/network/index.ts
@@ -1,4 +1,4 @@
-import { sleep } from 'utils/upload';
+import { sleep } from 'utils/common';
 
 const retrySleepTime = [2000, 5000, 10000];