diff --git a/src/constants/upload/index.ts b/src/constants/upload/index.ts index a34dbf6b3..19432605f 100644 --- a/src/constants/upload/index.ts +++ b/src/constants/upload/index.ts @@ -25,6 +25,7 @@ export const NULL_LOCATION: Location = { latitude: null, longitude: null }; export enum UPLOAD_STAGES { START, READING_GOOGLE_METADATA_FILES, + EXTRACTING_METADATA, UPLOADING, FINISH, } diff --git a/src/services/upload/uploadManager.ts b/src/services/upload/uploadManager.ts index 7f52b4150..e4642ede6 100644 --- a/src/services/upload/uploadManager.ts +++ b/src/services/upload/uploadManager.ts @@ -92,11 +92,12 @@ class UploadManager { ); } if (mediaFiles.length) { - UIService.setUploadStage(UPLOAD_STAGES.START); + UIService.setUploadStage(UPLOAD_STAGES.EXTRACTING_METADATA); await this.extractMetadataFromFiles(mediaFiles); uploadService.setMetadataAndFileTypeInfoMap( this.metadataAndFileTypeInfoMap ); + UIService.setUploadStage(UPLOAD_STAGES.START); await this.uploadMediaFiles(mediaFiles); } UIService.setUploadStage(UPLOAD_STAGES.FINISH); diff --git a/src/utils/strings/englishConstants.tsx b/src/utils/strings/englishConstants.tsx index cec9704f5..adfc149dd 100644 --- a/src/utils/strings/englishConstants.tsx +++ b/src/utils/strings/englishConstants.tsx @@ -103,9 +103,10 @@ const englishConstants = { UPLOAD: { 0: 'preparing to upload', 1: 'reading google metadata files', - 2: (fileCounter) => + 2: 'reading file metadata to organize file', + 3: (fileCounter) => `${fileCounter.finished} / ${fileCounter.total} files backed up`, - 3: 'backup complete', + 4: 'backup complete', }, UPLOADING_FILES: 'file upload', FILE_NOT_UPLOADED_LIST: 'the following files were not uploaded',