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

Inline

Browse source
This commit is contained in:
Manav Rathi 2024-04-13 21:42:59 +05:30
parent acd50bb172
commit e268b9204e
No known key found for this signature in database
1 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -235,29 +235,21 @@ async function migrateFiles(
const collectionPath = collectionIDPathMap.get(file.collectionID);
const metadataPath = `${collectionPath}/${exportMetadataDirectoryName}`;
const oldFileSavePath = getOldFileSavePath(collectionPath, file);
const oldFileMetadataSavePath = `${metadataPath}/${file.id}_${oldSanitizeName(file.metadata.title)}.json`;
const oldFileName = `${file.id}_${oldSanitizeName(file.metadata.title)}`;
const oldFilePath = `${collectionPath}/${oldFileName}`;
const oldFileMetadataPath = `${metadataPath}/${oldFileName}.json`;
const newFileSaveName = await safeFileName(
const newFileName = await safeFileName(
collectionPath,
file.metadata.title,
);
const newFilePath = `${collectionPath}/${newFileName}`;
const newFileMetadataPath = `${metadataPath}/${newFileName}.json`;
const newFileSavePath = getFileSavePath(
collectionPath,
newFileSaveName,
);
if (!(await exportService.exists(oldFilePath))) continue;
const newFileMetadataSavePath = `${metadataPath}/${newFileSaveName}.json`;
if (!(await exportService.exists(oldFileSavePath))) {
continue;
}
await exportService.rename(oldFileSavePath, newFileSavePath);
await exportService.rename(
oldFileMetadataSavePath,
newFileMetadataSavePath,
);
await exportService.rename(oldFilePath, newFilePath);
await exportService.rename(oldFileMetadataPath, newFileMetadataPath);
}
}
@ -507,11 +499,6 @@ const getOldCollectionFolderPath = (
collectionName: string,
) => `${dir}/${collectionID}_${oldSanitizeName(collectionName)}`;
const getOldFileSavePath = (collectionFolderPath: string, file: EnteFile) =>
`${collectionFolderPath}/${file.id}_${oldSanitizeName(
file.metadata.title,
)}`;
const getUniqueFileExportNameForMigration = (
collectionPath: string,
filename: string,