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

Remove exportService indirection

Browse source
This commit is contained in:
Manav Rathi 2024-04-14 09:55:41 +05:30
parent ea34eebfc9
commit 3824ebe91a
No known key found for this signature in database
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1141,12 +1141,12 @@ class ExportService {
file,
);
try {
await ensureElectron().saveStreamToDisk(
await electron.saveStreamToDisk(
`${collectionExportPath}/${videoExportName}`,
videoStream,
);
} catch (e) {
await ensureElectron().deleteFile(
await electron.deleteFile(
`${collectionExportPath}/${imageExportName}`,
);
throw e;

9
web/apps/photos/src/services/export/migration.ts
View file

@ -246,10 +246,10 @@ async function migrateFiles(
const newFilePath = `${collectionPath}/${newFileName}`;
const newFileMetadataPath = `${metadataPath}/${newFileName}.json`;
if (!(await exportService.exists(oldFilePath))) continue;
if (!(await fs.exists(oldFilePath))) continue;
await exportService.rename(oldFilePath, newFilePath);
await exportService.rename(oldFileMetadataPath, newFileMetadataPath);
await fs.rename(oldFilePath, newFilePath);
await fs.rename(oldFileMetadataPath, newFileMetadataPath);
}
}
@ -409,6 +409,7 @@ async function removeCollectionExportMissingMetadataFolder(
exportDir: string,
exportRecord: ExportRecord,
) {
const fs = ensureElectron().fs;
if (!exportRecord?.collectionExportNames) {
return;
}
@ -422,7 +423,7 @@ async function removeCollectionExportMissingMetadataFolder(
collectionExportName,
] of properlyExportedCollectionsAll) {
if (
await exportService.exists(
await fs.exists(
getMetadataFolderExportPath(
`${exportDir}/${collectionExportName}`,
),