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

Inline 2

Browse source
This commit is contained in:
Manav Rathi 2024-04-13 16:54:26 +05:30
parent ca114a467d
commit 284d7920b3
No known key found for this signature in database
1 changed files with 10 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -483,11 +483,7 @@ class ExportService {
await this.verifyExportFolderExists(exportFolder);
const oldCollectionExportName =
collectionIDExportNameMap.get(collection.id);
const oldCollectionExportPath = getCollectionExportPath(
exportFolder,
oldCollectionExportName,
);
const oldCollectionExportPath = `${exportFolder}/${oldCollectionExportName}`;
const newCollectionExportName =
await getUniqueCollectionExportName(
exportFolder,
@ -496,11 +492,7 @@ class ExportService {
log.info(
`renaming collection with id ${collection.id} from ${oldCollectionExportName} to ${newCollectionExportName}`,
);
const newCollectionExportPath = getCollectionExportPath(
exportFolder,
newCollectionExportName,
);
const newCollectionExportPath = `${exportFolder}/${newCollectionExportName}`;
await this.addCollectionExportedRecord(
exportFolder,
collection.id,
@ -586,10 +578,7 @@ class ExportService {
"collection is not empty, can't remove",
);
}
const collectionExportPath = getCollectionExportPath(
exportFolder,
collectionExportName,
);
const collectionExportPath = `${exportFolder}/${collectionExportName}`;
await this.removeCollectionExportedRecord(
exportFolder,
collectionID,
@ -681,10 +670,7 @@ class ExportService {
collectionExportName,
);
}
const collectionExportPath = getCollectionExportPath(
exportDir,
collectionExportName,
);
const collectionExportPath = `${exportDir}/${collectionExportName}`;
await ensureElectron().checkExistsAndCreateDir(
collectionExportPath,
);
@ -749,10 +735,10 @@ class ExportService {
try {
const fileExportName = fileIDExportNameMap.get(fileUID);
const collectionID = getCollectionIDFromFileUID(fileUID);
const collectionExportPath = getCollectionExportPath(
exportDir,
collectionIDExportNameMap.get(collectionID),
);
const collectionExportName =
collectionIDExportNameMap.get(collectionID);
const collectionExportPath = `${exportDir}/${collectionExportName}`;
await this.removeFileExportedRecord(exportDir, fileUID);
try {
if (isLivePhotoExportName(fileExportName)) {
@ -1036,10 +1022,7 @@ class ExportService {
exportFolder,
collectionName,
);
const collectionExportPath = getCollectionExportPath(
exportFolder,
collectionExportName,
);
const collectionExportPath = `${exportFolder}/${collectionExportName}`;
await ensureElectron().checkExistsAndCreateDir(collectionExportPath);
await ensureElectron().checkExistsAndCreateDir(
getMetadataFolderExportPath(collectionExportPath),
@ -1217,9 +1200,5 @@ class ExportService {
return exportRecord;
};
}
export default new ExportService();
const getCollectionExportPath = (
exportFolder: string,
collectionExportName: string,
) => `${exportFolder}/${collectionExportName}`;
export default new ExportService();