beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

throw export stopped error to skip doing post processing for stopped export

Browse source
This commit is contained in:
Abhinav 2023-05-15 14:09:07 +05:30
parent 02bfbedae6
commit 63350bf1a3
2 changed files with 45 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
apps/photos/src/services/export/index.ts
View file

@ -352,7 +352,10 @@ class ExportService {
await this.postExport();
}
} catch (e) {
if (e.message !== CustomError.EXPORT_FOLDER_DOES_NOT_EXIST) {
if (
e.message !== CustomError.EXPORT_FOLDER_DOES_NOT_EXIST &&
e.message !== CustomError.EXPORT_STOPPED
) {
logError(e, 'scheduleExport failed');
}
}
@ -479,7 +482,10 @@ class ExportService {
);
}
} catch (e) {
if (e.message !== CustomError.EXPORT_FOLDER_DOES_NOT_EXIST) {
if (
e.message !== CustomError.EXPORT_FOLDER_DOES_NOT_EXIST &&
e.message !== CustomError.EXPORT_STOPPED
) {
logError(e, 'runExport failed');
}
throw e;
@ -496,6 +502,9 @@ class ExportService {
try {
for (const collection of renamedCollections) {
try {
if (this.stopExport) {
throw Error(CustomError.EXPORT_STOPPED);
}
this.verifyExportFolderExists(exportFolder);
const oldCollectionExportName =
collectionIDExportNameMap.get(collection.id);
@ -540,14 +549,19 @@ class ExportService {
if (
e.message ===
CustomError.UPDATE_EXPORTED_RECORD_FAILED ||
e.message === CustomError.EXPORT_FOLDER_DOES_NOT_EXIST
e.message ===
CustomError.EXPORT_FOLDER_DOES_NOT_EXIST ||
e.message === CustomError.EXPORT_STOPPED
) {
throw e;
}
}
}
} catch (e) {
if (e.message !== CustomError.EXPORT_FOLDER_DOES_NOT_EXIST) {
if (
e.message !== CustomError.EXPORT_FOLDER_DOES_NOT_EXIST &&
e.message !== CustomError.EXPORT_STOPPED
) {
logError(e, 'collectionRenamer failed');
}
throw e;
@ -568,6 +582,9 @@ class ExportService {
);
for (const collectionID of deletedExportedCollectionIDs) {
try {
if (this.stopExport) {
throw Error(CustomError.EXPORT_STOPPED);
}
this.verifyExportFolderExists(exportFolder);
addLocalLog(
() =>
@ -606,14 +623,19 @@ class ExportService {
if (
e.message ===
CustomError.UPDATE_EXPORTED_RECORD_FAILED ||
e.message === CustomError.EXPORT_FOLDER_DOES_NOT_EXIST
e.message ===
CustomError.EXPORT_FOLDER_DOES_NOT_EXIST ||
e.message === CustomError.EXPORT_STOPPED
) {
throw e;
}
}
}
} catch (e) {
if (e.message !== CustomError.EXPORT_FOLDER_DOES_NOT_EXIST) {
if (
e.message !== CustomError.EXPORT_FOLDER_DOES_NOT_EXIST &&
e.message !== CustomError.EXPORT_STOPPED
) {
logError(e, 'collectionRemover failed');
}
throw e;
@ -639,7 +661,7 @@ class ExportService {
)}`
);
if (this.stopExport) {
break;
throw Error(CustomError.EXPORT_STOPPED);
}
try {
this.verifyExportFolderExists(exportDir);
@ -686,14 +708,19 @@ class ExportService {
if (
e.message ===
CustomError.UPDATE_EXPORTED_RECORD_FAILED ||
e.message === CustomError.EXPORT_FOLDER_DOES_NOT_EXIST
e.message ===
CustomError.EXPORT_FOLDER_DOES_NOT_EXIST ||
e.message === CustomError.EXPORT_STOPPED
) {
throw e;
}
}
}
} catch (e) {
if (e.message !== CustomError.EXPORT_FOLDER_DOES_NOT_EXIST) {
if (
e.message !== CustomError.EXPORT_FOLDER_DOES_NOT_EXIST &&
e.message !== CustomError.EXPORT_STOPPED
) {
logError(e, 'fileExporter failed');
}
throw e;
@ -716,7 +743,7 @@ class ExportService {
this.verifyExportFolderExists(exportDir);
addLocalLog(() => `trashing file with id ${fileUID}`);
if (this.stopExport) {
break;
throw Error(CustomError.EXPORT_STOPPED);
}
try {
const fileExportName = fileIDExportNameMap.get(fileUID);
@ -811,14 +838,19 @@ class ExportService {
if (
e.message ===
CustomError.UPDATE_EXPORTED_RECORD_FAILED ||
e.message === CustomError.EXPORT_FOLDER_DOES_NOT_EXIST
e.message ===
CustomError.EXPORT_FOLDER_DOES_NOT_EXIST ||
e.message === CustomError.EXPORT_STOPPED
) {
throw e;
}
}
}
} catch (e) {
if (e.message !== CustomError.EXPORT_FOLDER_DOES_NOT_EXIST) {
if (
e.message !== CustomError.EXPORT_FOLDER_DOES_NOT_EXIST &&
e.message !== CustomError.EXPORT_STOPPED
) {
logError(e, 'fileTrasher failed');
}
throw e;

1
apps/photos/src/utils/error/index.ts
View file

@ -56,6 +56,7 @@ export const CustomError = {
NETWORK_ERROR: 'Network Error',
NOT_FILE_OWNER: 'not file owner',
UPDATE_EXPORTED_RECORD_FAILED: 'update file exported record failed',
EXPORT_STOPPED: 'export stopped',
NO_EXPORT_FOLDER_SELECTED: 'no export folder selected',
EXPORT_FOLDER_DOES_NOT_EXIST: 'export folder does not exist',
NO_INTERNET_CONNECTION: 'no internet connection',