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

fix(server): date time calculation (#5204)

Browse source
This commit is contained in:
Jason Rasmussen 2023-11-20 17:26:53 -05:00 committed by GitHub
parent 30e9763888
commit 8b966a0f15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/src/domain/metadata/metadata.service.ts
View file

@ -39,7 +39,7 @@ interface DirectoryEntry {
type ExifEntityWithoutGeocodeAndTypeOrm = Omit< type ExifEntityWithoutGeocodeAndTypeOrm = Omit<
ExifEntity, ExifEntity,
'city' | 'state' | 'country' | 'description' | 'exifTextSearchableColumn' 'city' | 'state' | 'country' | 'description' | 'exifTextSearchableColumn'
>; > & { dateTimeOriginal: Date };
const exifDate = (dt: ExifDateTime | string | undefined) => (dt instanceof ExifDateTime ? dt?.toDate() : null); const exifDate = (dt: ExifDateTime | string | undefined) => (dt instanceof ExifDateTime ? dt?.toDate() : null);
const tzOffset = (dt: ExifDateTime | string | undefined) => (dt instanceof ExifDateTime ? dt?.tzoffsetMinutes : null); const tzOffset = (dt: ExifDateTime | string | undefined) => (dt instanceof ExifDateTime ? dt?.tzoffsetMinutes : null);
@ -181,7 +181,7 @@ export class MetadataService {
await this.applyReverseGeocoding(asset, exifData); await this.applyReverseGeocoding(asset, exifData);
await this.assetRepository.upsertExif(exifData); await this.assetRepository.upsertExif(exifData);
const dateTimeOriginal = exifDate(firstDateTime(tags as Tags)) ?? exifData.dateTimeOriginal; const dateTimeOriginal = exifData.dateTimeOriginal;
let localDateTime = dateTimeOriginal ?? undefined; let localDateTime = dateTimeOriginal ?? undefined;
const timeZoneOffset = tzOffset(firstDateTime(tags as Tags)) ?? 0; const timeZoneOffset = tzOffset(firstDateTime(tags as Tags)) ?? 0;