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

check full file name before checking clipped one

Browse source
This commit is contained in:
Abhinav 2023-11-17 16:59:54 +05:30
parent 6cfdc1731e
commit 514cdf690b
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/photos/src/services/upload/fileService.ts
View file

@ -17,7 +17,8 @@ import { getFileNameSize } from '@ente/shared/logging/web';
import { encryptFiledata } from './encryptionService';
import {
extractMetadata,
getMetadataJSONMapKeyForFile,
getClippedMetadataJSONMapKeyForFile,
getFullMetadataJSONMapKeyForFile,
} from './metadataService';
import {
getFileStream,
@ -83,8 +84,12 @@ export async function extractFileMetadata(
const originalName = getFileOriginalName(rawFile);
const googleMetadata =
parsedMetadataJSONMap.get(
getMetadataJSONMapKeyForFile(collectionID, originalName)
) ?? {};
getFullMetadataJSONMapKeyForFile(collectionID, originalName)
) ??
parsedMetadataJSONMap.get(
getClippedMetadataJSONMapKeyForFile(collectionID, originalName)
) ??
{};
const { metadata, publicMagicMetadata } = await extractMetadata(
worker,

9
apps/photos/src/services/upload/metadataService.ts
View file

@ -119,13 +119,20 @@ export const getMetadataJSONMapKeyForJSON = (
return `${collectionID}-${title}`;
};
export const getMetadataJSONMapKeyForFile = (
export const getClippedMetadataJSONMapKeyForFile = (
collectionID: number,
fileName: string
) => {
return `${collectionID}-${fileName.slice(0, 46)}`;
};
export const getFullMetadataJSONMapKeyForFile = (
collectionID: number,
fileName: string
) => {
return `${collectionID}-${fileName}`;
};
export async function parseMetadataJSON(receivedFile: File | ElectronFile) {
try {
if (!(receivedFile instanceof File)) {