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

Images

Browse source
This commit is contained in:
Manav Rathi 2024-04-25 14:21:06 +05:30
parent eb4d83749f
commit c8542211b4
No known key found for this signature in database
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
web/apps/photos/src/services/upload/uploadService.ts
View file

@ -656,13 +656,22 @@ async function tryExtractImageMetadata(
fileTypeInfo: FileTypeInfo,
lastModifiedMs: number,
): Promise<ParsedExtractedMetadata> {
let file: File;
if (fileOrPath instanceof File) {
file = fileOrPath;
} else {
const path = fileOrPath;
// The library we use for extracting EXIF from images, exifr, doesn't
// support streams. But unlike videos, for images it is reasonable to
// read the entire stream into memory here.
const { response } = await readStream(ensureElectron(), path);
file = new File([await response.arrayBuffer()], basename(path), {
lastModified: lastModifiedMs,
});
}
try {
if (!(fileOrPath instanceof File)) {
fileOrPath = new File([await fileOrPath.blob()], fileOrPath.name, {
lastModified: lastModifiedMs,
});
}
return await parseImageMetadata(fileOrPath, fileTypeInfo);
return await parseImageMetadata(file, fileTypeInfo);
} catch (e) {
log.error(`Failed to extract image metadata for ${fileOrPath}`, e);
return undefined;