Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[INJIMOB-867] - remove all files including unsynced files #1281

Merged
merged 1 commit into from
Feb 21, 2024
Merged

[INJIMOB-867] - remove all files including unsynced files #1281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions shared/CloudBackupAndRestoreUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class Cloud {
'https://www.googleapis.com/auth/drive.file',
];
private static readonly BACKUP_FILE_REG_EXP = /backup_[0-9]*.zip$/g;
private static readonly ALL_BACKUP_FILE_REG_EXP = /backup_[0-9]*.zip/g;
private static readonly UNSYNCED_BACKUP_FILE_REG_EXP =
/backup_[0-9]*.zip.icloud/g;
private static readonly RETRY_SLEEP_TIME = 5000;
Expand Down Expand Up @@ -64,6 +65,15 @@ class Cloud {
return await CloudStorage.readdir(`/`, CloudStorageScope.AppData);
};

private static getLatestFileName = (allFiles: string[]): string => {
const sortedFiles = allFiles.sort((a, b) => {
const dateA = new Date(Number(a.split('.')[0].split('_')[1]));
const dateB = new Date(Number(b.split('.')[0].split('_')[1]));
return dateB > dateA ? 1 : dateB < dateA ? -1 : 0;
});
return sortedFiles[0];
};

private static async syncBackupFiles() {
const isSyncDone = await this.downloadUnSyncedBackupFiles();
if (isSyncDone) return;
Expand Down Expand Up @@ -202,7 +212,7 @@ class Cloud {
if (availableBackupFilesInCloud.length === 0) {
throw new Error(this.NO_BACKUP_FILE);
}
cloudFileName = availableBackupFilesInCloud[0];
cloudFileName = this.getLatestFileName(availableBackupFilesInCloud);
}
const {birthtimeMs: creationTime, size} = await CloudStorage.stat(
cloudFileName,
Expand All @@ -218,7 +228,7 @@ class Cloud {
static async removeOldDriveBackupFiles(fileName: string) {
const toBeRemovedFiles = (await this.getBackupFilesList())
.filter(file => file !== fileName)
.filter(file => file.match(this.BACKUP_FILE_REG_EXP));
.filter(file => file.match(this.ALL_BACKUP_FILE_REG_EXP));
for (const oldFileName of toBeRemovedFiles) {
await CloudStorage.unlink(`/${oldFileName}`);
}
Expand Down Expand Up @@ -323,7 +333,9 @@ class Cloud {
throw new Error(Cloud.NO_BACKUP_FILE);
}

const fileName = `/${availableBackupFilesInCloud[0]}`;
const fileName = `/${this.getLatestFileName(
availableBackupFilesInCloud,
)}`;
const fileContent = await CloudStorage.readFile(
fileName,
CloudStorageScope.AppData,
Expand Down
Loading