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

handle export Resume with previous stats

Browse source
This commit is contained in:
Abhinav-grd 2021-07-14 11:22:27 +05:30
parent 1df42f0a58
commit 757e2d1d21
4 changed files with 84 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/ExportInProgress.tsx
View file

@ -16,7 +16,7 @@ interface Props {
exportSize: string
exportStage: ExportStage
exportStats: ExportStats
exportFiles: () => void;
resumeExport: () => void;
cancelExport: () => void
pauseExport: () => void;
}
@ -36,7 +36,7 @@ export default function ExportInProgress(props: Props) {
</div>
<div style={{ width: '100%', display: 'flex', justifyContent: 'space-around' }}>
{props.exportStage === ExportStage.PAUSED ?
<Button block variant={'outline-secondary'} onClick={props.exportFiles}>{constants.RESUME}</Button> :
<Button block variant={'outline-secondary'} onClick={props.resumeExport}>{constants.RESUME}</Button> :
<Button block variant={'outline-secondary'} onClick={props.pauseExport}>{constants.PAUSE}</Button>
}
<div style={{ width: '30px' }} />

83
src/components/ExportModal.tsx
View file

@ -42,12 +42,12 @@ export default function ExportModal(props: Props) {
if (!isElectron()) {
return;
}
setExportFolder(getData(LS_KEYS.EXPORT_FOLDER));
setExportFolder(getData(LS_KEYS.EXPORT)?.folder);
exportService.ElectronAPIs.registerStopExportListener(stopExport);
exportService.ElectronAPIs.registerPauseExportListener(pauseExport);
exportService.ElectronAPIs.registerStartExportListener(startExport);
exportService.ElectronAPIs.registerRetryFailedExportListener(exportService.retryFailedFiles.bind(this, setExportStats));
exportService.ElectronAPIs.registerResumeExportListener(resumeExport);
exportService.ElectronAPIs.registerRetryFailedExportListener(retryFailedExport);
}, []);
useEffect(() => {
const main = async () => {
@ -67,26 +67,26 @@ export default function ExportModal(props: Props) {
setExportSize(props.usage);
}, [props.usage]);
const updateExportFolder = (newFolder) => {
const updateExportFolder = (newFolder: string) => {
setExportFolder(newFolder);
setData(LS_KEYS.EXPORT_FOLDER, newFolder);
setData(LS_KEYS.EXPORT, { folder: newFolder });
};
const updateExportStage = (newStage) => {
const updateExportStage = (newStage: ExportStage) => {
setExportStage(newStage);
exportService.updateExportRecord({ stage: newStage });
};
const updateExportTime = (newTime) => {
const updateExportTime = (newTime: number) => {
setLastExportTime(newTime);
exportService.updateExportRecord({ time: newTime });
};
const updateExportStats = (newStats) => {
const updateExportStats = (newStats: ExportStats) => {
setExportStats(newStats);
exportService.updateExportRecord({ stats: newStats });
};
const startExport = async () => {
const exportFolder = getData(LS_KEYS.EXPORT_FOLDER);
const exportFolder = getData(LS_KEYS.EXPORT)?.folder;
if (!exportFolder) {
const folderSelected = await selectExportDirectory();
if (!folderSelected) {
@ -96,10 +96,65 @@ export default function ExportModal(props: Props) {
}
updateExportStage(ExportStage.INPROGRESS);
updateExportStats({ current: 0, total: 0, failed: 0 });
await exportService.exportFiles(updateExportStats);
updateExportStage(ExportStage.FINISHED);
await sleep(100);
updateExportTime(Date.now());
const finished = await exportService.exportFiles(updateExportStats);
if (finished) {
updateExportStage(ExportStage.FINISHED);
await sleep(100);
updateExportTime(Date.now());
}
};
const retryFailedExport = async () => {
const exportFolder = getData(LS_KEYS.EXPORT)?.folder;
if (!exportFolder) {
const folderSelected = await selectExportDirectory();
if (!folderSelected) {
// no-op as select folder aborted
return;
}
}
updateExportStage(ExportStage.INPROGRESS);
updateExportStats({ current: 0, total: 0, failed: 0 });
const finished = await exportService.retryFailedFiles(updateExportStats);
if (finished) {
updateExportStage(ExportStage.FINISHED);
await sleep(100);
updateExportTime(Date.now());
}
};
const resumeExport = async () => {
const exportFolder = getData(LS_KEYS.EXPORT)?.folder;
if (!exportFolder) {
const folderSelected = await selectExportDirectory();
if (!folderSelected) {
// no-op as select folder aborted
return;
}
}
const exportRecord = await exportService.getExportRecord();
if (exportRecord.stage !== ExportStage.PAUSED) {
// export not paused
return;
}
const pausedStageStats = exportRecord.stats;
updateExportStage(ExportStage.INPROGRESS);
updateExportStats(pausedStageStats);
const updateExportStatsWithOffset = ((stats: ExportStats) => updateExportStats(
{
current: pausedStageStats.current + stats.current,
total: pausedStageStats.current + stats.total,
failed: pausedStageStats.failed + stats.failed,
},
));
const finished = await exportService.exportFiles(updateExportStatsWithOffset);
if (finished) {
updateExportStage(ExportStage.FINISHED);
await sleep(100);
updateExportTime(Date.now());
}
};
const selectExportDirectory = async () => {
@ -163,7 +218,7 @@ export default function ExportModal(props: Props) {
exportSize={exportSize}
exportStage={exportStage}
exportStats={exportStats}
exportFiles={startExport}
resumeExport={resumeExport}
cancelExport={stopExport}
pauseExport={pauseExport}
/>

21
src/services/exportService.ts
View file

@ -68,16 +68,18 @@ class ExportService {
return this.exportInProgress;
}
this.ElectronAPIs.showOnTray('starting export');
const dir = getData(LS_KEYS.EXPORT_FOLDER);
const dir = getData(LS_KEYS.EXPORT)?.folder;
if (!dir) {
// no-export folder set
return;
}
const exportRecord = await this.getExportRecord(dir);
const exportedFiles = new Set(exportRecord?.exportedFiles);
const failedFiles = new Set(exportRecord?.failedFiles);
console.log(dir, exportedFiles);
const unExportedFiles = files.filter((file) => {
if (!exportedFiles.has(`${file.id}_${file.collectionID}`)) {
const fileUID = `${file.id}_${file.collectionID}`;
if (!exportedFiles.has(fileUID) && !failedFiles.has(fileUID)) {
return files;
}
});
@ -97,20 +99,21 @@ class ExportService {
return this.exportInProgress;
}
this.ElectronAPIs.showOnTray('starting export');
const dir = getData(LS_KEYS.EXPORT_FOLDER);
const dir = getData(LS_KEYS.EXPORT)?.folder;
console.log(dir);
if (!dir) {
// no-export folder set
return;
}
const exportRecord = await this.getExportRecord(dir);
const failedFiles = new Set(exportRecord?.failedFiles);
const failedFilesIds = new Set((await this.getExportRecord()).failedFiles ?? []);
const failedFiles = files.filter((file) => {
if (failedFilesIds.has(`${file.id}_${file.collectionID}`)) {
const filesToExport = files.filter((file) => {
if (failedFiles.has(`${file.id}_${file.collectionID}`)) {
return files;
}
});
this.exportInProgress = this.fileExporter(failedFiles, collections, updateProgress, dir);
this.exportInProgress = this.fileExporter(filesToExport, collections, updateProgress, dir);
return this.exportInProgress;
}
@ -219,7 +222,7 @@ class ExportService {
this.recordUpdateInProgress = (async () => {
try {
if (!folder) {
folder = getData(LS_KEYS.EXPORT_FOLDER);
folder = getData(LS_KEYS.EXPORT)?.folder;
}
const exportRecord = await this.getExportRecord(folder);
const newRecord = { ...exportRecord, ...newData };
@ -235,7 +238,7 @@ class ExportService {
try {
console.log(folder);
if (!folder) {
folder = getData(LS_KEYS.EXPORT_FOLDER);
folder = getData(LS_KEYS.EXPORT)?.folder;
}
const recordFile = await this.ElectronAPIs.getExportRecord(folder);
if (recordFile) {

2
src/utils/storage/localStorage.ts
View file

@ -10,7 +10,7 @@ export enum LS_KEYS {
IS_FIRST_LOGIN = 'isFirstLogin',
JUST_SIGNED_UP = 'justSignedUp',
SHOW_BACK_BUTTON = 'showBackButton',
EXPORT_FOLDER = 'exportFolder'
EXPORT = 'export'
}
export const setData = (key: LS_KEYS, value: object) => {