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

Write file exported record after success

Browse source
This commit is contained in:
Manav Rathi 2024-05-07 19:30:11 +05:30
parent eb60c3f811
commit ff3c37e703
No known key found for this signature in database
1 changed files with 41 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
web/apps/photos/src/services/export/index.ts
View file

@ -985,26 +985,21 @@ class ExportService {
file.metadata.title,
electron.fs.exists,
);
await this.saveMetadataFile(
collectionExportPath,
fileExportName,
file,
);
await writeStream(
electron,
`${collectionExportPath}/${fileExportName}`,
updatedFileStream,
);
await this.addFileExportedRecord(
exportDir,
fileUID,
fileExportName,
);
try {
await this.saveMetadataFile(
collectionExportPath,
fileExportName,
file,
);
await writeStream(
electron,
`${collectionExportPath}/${fileExportName}`,
updatedFileStream,
);
} catch (e) {
await this.removeFileExportedRecord(exportDir, fileUID);
throw e;
}
}
} catch (e) {
log.error("download and save failed", e);
@ -1032,52 +1027,46 @@ class ExportService {
livePhoto.videoFileName,
fs.exists,
);
const livePhotoExportName = getLivePhotoExportName(
imageExportName,
videoExportName,
);
const imageStream = generateStreamFromArrayBuffer(livePhoto.imageData);
await this.saveMetadataFile(
collectionExportPath,
imageExportName,
file,
);
await writeStream(
electron,
`${collectionExportPath}/${imageExportName}`,
imageStream,
);
const videoStream = generateStreamFromArrayBuffer(livePhoto.videoData);
await this.saveMetadataFile(
collectionExportPath,
videoExportName,
file,
);
try {
await writeStream(
electron,
`${collectionExportPath}/${videoExportName}`,
videoStream,
);
} catch (e) {
await fs.rm(`${collectionExportPath}/${imageExportName}`);
throw e;
}
await this.addFileExportedRecord(
exportDir,
fileUID,
livePhotoExportName,
);
try {
const imageStream = generateStreamFromArrayBuffer(
livePhoto.imageData,
);
await this.saveMetadataFile(
collectionExportPath,
imageExportName,
file,
);
await writeStream(
electron,
`${collectionExportPath}/${imageExportName}`,
imageStream,
);
const videoStream = generateStreamFromArrayBuffer(
livePhoto.videoData,
);
await this.saveMetadataFile(
collectionExportPath,
videoExportName,
file,
);
try {
await writeStream(
electron,
`${collectionExportPath}/${videoExportName}`,
videoStream,
);
} catch (e) {
await fs.rm(`${collectionExportPath}/${imageExportName}`);
throw e;
}
} catch (e) {
await this.removeFileExportedRecord(exportDir, fileUID);
throw e;
}
}
private async saveMetadataFile(