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

skip shared-collections during export

Browse source
This commit is contained in:
Abhinav 2021-11-02 17:31:53 +05:30
parent 15f12a6f8e
commit b651d16ee5
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/ExportModal.tsx
View file

@ -8,6 +8,7 @@ import exportService, {
ExportType,
} from 'services/exportService';
import { getLocalFiles } from 'services/fileService';
import { User } from 'services/userService';
import styled from 'styled-components';
import { sleep } from 'utils/common';
import { getExportRecordFileUID } from 'utils/export';
@ -105,12 +106,16 @@ export default function ExportModal(props: Props) {
return;
}
const main = async () => {
const user: User = getData(LS_KEYS.USER);
if (exportStage === ExportStage.FINISHED) {
const localFiles = await getLocalFiles();
const userPersonalFiles = localFiles.filter(
(file) => file.ownerID === user?.id
);
const exportRecord = await exportService.getExportRecord();
const exportedFileCnt = exportRecord.exportedFiles.length;
const failedFilesCnt = exportRecord.failedFiles.length;
const syncedFilesCnt = localFiles.length;
const syncedFilesCnt = userPersonalFiles.length;
if (syncedFilesCnt > exportedFileCnt + failedFilesCnt) {
updateExportProgress({
current: exportedFileCnt + failedFilesCnt,
@ -120,7 +125,7 @@ export default function ExportModal(props: Props) {
...exportRecord.exportedFiles,
...exportRecord.failedFiles,
]);
const unExportedFiles = localFiles.filter(
const unExportedFiles = userPersonalFiles.filter(
(file) =>
!exportFileUIDs.has(getExportRecordFileUID(file))
);

7
src/services/exportService.ts
View file

@ -22,6 +22,7 @@ import {
fileNameWithoutExtension,
generateStreamFromArrayBuffer,
} from 'utils/file';
import { User } from './userService';
export interface ExportProgress {
current: number;
@ -111,6 +112,10 @@ class ExportService {
collections,
allFiles
);
const user: User = getData(LS_KEYS.USER);
const userCollections = nonEmptyCollections.filter(
(collection) => collection.owner.id === user?.id
);
const exportRecord = await this.getExportRecord(exportDir);
if (exportType === ExportType.NEW) {
@ -125,7 +130,7 @@ class ExportService {
}
this.exportInProgress = this.fileExporter(
filesToExport,
nonEmptyCollections,
userCollections,
updateProgress,
exportDir
);