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

properly reassign the updateExportProgress UI handler on modal remount

Browse source
This commit is contained in:
Abhinav 2023-02-21 17:10:16 +05:30
parent 58f886015a
commit 1e7684c396
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/components/ExportModal.tsx
View file

@ -81,6 +81,7 @@ export default function ExportModal(props: Props) {
exportService.electronAPIs.registerRetryFailedExportListener(
retryFailedExport
);
exportService.setUpdateExportProgress(updateExportProgress);
} catch (e) {
logError(e, 'error while registering export listeners');
}
@ -237,7 +238,6 @@ export default function ExportModal(props: Props) {
await preExportRun();
updateExportProgress({ current: 0, total: 0 });
const exportResult = await exportService.exportFiles(
updateExportProgress,
ExportType.NEW
);
await postExportRun(exportResult);
@ -284,8 +284,8 @@ export default function ExportModal(props: Props) {
current: pausedStageProgress.current + progress.current,
total: pausedStageProgress.current + progress.total,
});
exportService.setUpdateExportProgress(updateExportStatsWithOffset);
const exportResult = await exportService.exportFiles(
updateExportStatsWithOffset,
ExportType.PENDING
);
@ -303,7 +303,6 @@ export default function ExportModal(props: Props) {
updateExportProgress({ current: 0, total: exportStats.failed });
const exportResult = await exportService.exportFiles(
updateExportProgress,
ExportType.RETRY_FAILED
);
await postExportRun(exportResult);

22
src/services/exportService.ts
View file

@ -62,11 +62,19 @@ class ExportService {
private pauseExport: boolean = false;
private allElectronAPIsExist: boolean = false;
private fileReader: FileReader = null;
private updateExportProgress: (progress: ExportProgress) => void = null;
constructor() {
this.electronAPIs = runningInBrowser() && window['ElectronAPIs'];
this.allElectronAPIsExist = !!this.electronAPIs?.exists;
}
setUpdateExportProgress(
updateExportProgress: (progress: ExportProgress) => void
) {
this.updateExportProgress = updateExportProgress;
}
async selectExportDirectory() {
try {
return await this.electronAPIs.selectRootDirectory();
@ -82,10 +90,7 @@ class ExportService {
pauseRunningExport() {
this.pauseExport = true;
}
async exportFiles(
updateProgress: (progress: ExportProgress) => void,
exportType: ExportType
) {
async exportFiles(exportType: ExportType) {
try {
if (this.exportInProgress) {
this.electronAPIs.sendNotification(
@ -159,7 +164,6 @@ class ExportService {
newCollections,
renamedCollections,
collectionIDPathMap,
updateProgress,
exportDir
);
const resp = await this.exportInProgress;
@ -176,7 +180,6 @@ class ExportService {
newCollections: Collection[],
renamedCollections: Collection[],
collectionIDPathMap: CollectionIDPathMap,
updateProgress: (progress: ExportProgress) => void,
exportDir: string
): Promise<{ paused: boolean }> {
try {
@ -211,7 +214,7 @@ class ExportService {
this.electronAPIs.showOnTray({
export_progress: `0 / ${files.length} files exported`,
});
updateProgress({
this.updateExportProgress({
current: 0,
total: files.length,
});
@ -254,7 +257,10 @@ class ExportService {
files.length
} files exported`,
});
updateProgress({ current: index + 1, total: files.length });
this.updateExportProgress({
current: index + 1,
total: files.length,
});
}
if (this.stopExport) {
this.electronAPIs.sendNotification(ExportNotification.ABORT);