Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

update(metadata-json):check-files-without-truncation

Aswin Asok02eade8741c6
diff --git a/web/packages/gallery/services/upload/metadata-json.ts b/web/packages/gallery/services/upload/metadata-json.ts
index 5f6ad1dc5b..4646ead2b2 100644
--- a/web/packages/gallery/services/upload/metadata-json.ts
+++ b/web/packages/gallery/services/upload/metadata-json.ts
@@ -96,9 +96,13 @@ export const matchJSONMetadata = (
takeoutMetadata = parsedMetadataJSONMap.get(key);
if (takeoutMetadata) return takeoutMetadata;
- // Newer exports append this suffix before clipping.
+ // Newer exports append this suffix, sometimes without clipping.
const supplSuffix = ".supplemental-metadata";
baseFileName = `${name}${extension}${supplSuffix}`;
+ key = makeKey(`${baseFileName}${numberedSuffix}`);
+ takeoutMetadata = parsedMetadataJSONMap.get(key);
+ if (takeoutMetadata) return takeoutMetadata;
+
key = makeKey(
`${baseFileName.slice(0, maxGoogleFileNameLength)}${numberedSuffix}`,
);
@@ -109,6 +113,10 @@ export const matchJSONMetadata = (
// Some exports leave "(n)" before the extension.
if (numberedSuffix) {
const originalBaseFileName = `${originalName}${extension}${supplSuffix}`;
+ key = makeKey(originalBaseFileName);
+ takeoutMetadata = parsedMetadataJSONMap.get(key);
+ if (takeoutMetadata) return takeoutMetadata;
+
key = makeKey(originalBaseFileName.slice(0, maxGoogleFileNameLength));
takeoutMetadata = parsedMetadataJSONMap.get(key);
if (takeoutMetadata) return takeoutMetadata;