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

Merge pull request #258 from ente-io/master

Browse source 
release
This commit is contained in:
abhinavkgrd 2021-11-30 11:51:04 +05:30 committed by GitHub
parent dcef6cda39 aa49c8a775
commit 03595c6888
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/services/upload/exifService.ts
View file

@ -31,19 +31,28 @@ export async function getExifData(
receivedFile: globalThis.File,
fileTypeInfo: FileTypeInfo
): Promise<ParsedEXIFData> {
const exifData = await getRawExif(receivedFile, fileTypeInfo);
if (!exifData) {
return { location: NULL_LOCATION, creationTime: null };
}
const parsedEXIFData = {
location: getEXIFLocation(exifData),
creationTime: getUNIXTime(
exifData.DateTimeOriginal ??
exifData.CreateDate ??
exifData.ModifyDate
),
const nullExifData: ParsedEXIFData = {
location: NULL_LOCATION,
creationTime: null,
};
return parsedEXIFData;
try {
const exifData = await getRawExif(receivedFile, fileTypeInfo);
if (!exifData) {
return nullExifData;
}
const parsedEXIFData = {
location: getEXIFLocation(exifData),
creationTime: getUNIXTime(
exifData.DateTimeOriginal ??
exifData.CreateDate ??
exifData.ModifyDate
),
};
return parsedEXIFData;
} catch (e) {
logError(e, 'getExifData failed');
return nullExifData;
}
}
export async function getRawExif(
@ -63,14 +72,18 @@ export async function getRawExif(
}
export function getUNIXTime(dateTime: Date) {
if (!dateTime) {
return null;
}
const unixTime = dateTime.getTime() * 1000;
if (unixTime <= 0) {
return null;
} else {
return unixTime;
try {
if (!dateTime) {
return null;
}
const unixTime = dateTime.getTime() * 1000;
if (unixTime <= 0) {
return null;
} else {
return unixTime;
}
} catch (e) {
logError(e, 'getUNIXTime failed', { dateTime });
}
}