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

Improve exif date parsing (#1081)

Browse source
This commit is contained in:
Abhinav Kumar 2023-04-25 10:34:12 +05:30 committed by GitHub
parent e24c16dab5 fce639ada5
commit 7252edc794
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,6 +46,9 @@ export async function getParsedExifData(
jfif: true,
ihdr: true,
});
if (!exifData) {
return null;
}
const filteredExifData = tags
? Object.fromEntries(
Object.entries(exifData).filter(([key]) => tags.includes(key))
@ -107,13 +110,29 @@ function parseExifData(exifData: RawEXIFData): ParsedEXIFData {
return parsedExif;
}
function parseEXIFDate(dataTimeString: string) {
function parseEXIFDate(dateTimeString: string) {
try {
if (typeof dataTimeString !== 'string') {
if (typeof dateTimeString !== 'string') {
throw Error(CustomError.NOT_A_DATE);
}
const [year, month, day, hour, minute, second] = dataTimeString
// Check and parse date in the format YYYYMMDD
if (dateTimeString.length === 8) {
const year = parseInt(dateTimeString.slice(0, 4), 10);
const month = parseInt(dateTimeString.slice(4, 6), 10);
const day = parseInt(dateTimeString.slice(6, 8), 10);
if (
!Number.isNaN(year) &&
!Number.isNaN(month) &&
!Number.isNaN(day)
) {
const date = new Date(year, month - 1, day);
if (!Number.isNaN(+date)) {
return date;
}
}
}
const [year, month, day, hour, minute, second] = dateTimeString
.match(/\d+/g)
.map((component) => parseInt(component, 10));
@ -136,7 +155,7 @@ function parseEXIFDate(dataTimeString: string) {
return date;
} catch (e) {
logError(e, 'parseEXIFDate failed', {
dataTimeString,
dateTimeString,
});
return null;
}