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

fix(server): exif time extraction (#2583)

Browse source
This commit is contained in:
Michel Heusschen 2023-05-27 23:24:07 +02:00 committed by GitHub
parent e41e0df27e
commit fd4357cf23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/apps/microservices/src/processors/metadata-extraction.processor.ts
View file

@ -115,12 +115,12 @@ export class MetadataExtractionProcessor {
})
: {};
const exifToDate = (exifDate: string | ExifDateTime | undefined) => {
const exifToDate = (exifDate: string | Date | ExifDateTime | undefined) => {
if (!exifDate) {
return null;
}
const date = typeof exifDate === 'string' ? new Date(exifDate) : exifDate.toDate();
const date = exifDate instanceof ExifDateTime ? exifDate.toDate() : new Date(exifDate);
if (isNaN(date.valueOf())) {
return null;
}
@ -128,10 +128,9 @@ export class MetadataExtractionProcessor {
return date;
};
const exifTimeZone = (exifDate: string | ExifDateTime | undefined) => {
if (!exifDate) return null;
if (typeof exifDate === 'string') {
const exifTimeZone = (exifDate: string | Date | ExifDateTime | undefined) => {
const isExifDate = exifDate instanceof ExifDateTime;
if (!isExifDate) {
return null;
}