RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

metadata: fix display of dates without tz info 

Signed-off-by: Varun Patil <radialapps@gmail.com>
dexie
Varun Patil 2023-10-01 09:34:48 -07:00
parent 9f246ff58b
commit 4a595db3f5
3 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/components/Metadata.vue
View File

@ -208,41 +208,40 @@ export default defineComponent({
/** Date taken info */ /** Date taken info */
dateOriginal(): DateTime | null { dateOriginal(): DateTime | null {
const epoch = this.exif.DateTimeEpoch || this.baseInfo.datetaken; // Try to get timezone info
let date = DateTime.fromSeconds(epoch); let dateWithTz: DateTime | null = null;
if (!epoch || !date.isValid) return null; const valid = () => dateWithTz?.isValid;
// The fallback to datetaken can be eventually removed // If we have an actual epoch, we can shift the date to the correct timezone
// and then this can be discarded if (!valid() && this.exif.DateTimeEpoch) {
if (this.exif.DateTimeEpoch) { const date = DateTime.fromSeconds(this.exif.DateTimeEpoch);
const tzOffset = this.exif.OffsetTimeOriginal || this.exif.OffsetTime; // e.g. -05:00 if (date.isValid) {
const tzId = this.exif.LocationTZID; // e.g. America/New_York const tzOffset = this.exif.OffsetTimeOriginal || this.exif.OffsetTime; // e.g. -05:00
const tzId = this.exif.LocationTZID; // e.g. America/New_York
let dateWithTz: DateTime | undefined = undefined; // Use timezone offset if available
if (!valid() && tzOffset) {
dateWithTz = date.setZone('UTC' + tzOffset);
}
// If no timezone info is available, we will show the local time only // Fall back to tzId
// In this case, everything happens in UTC if (!valid() && tzId) {
if (!tzOffset && !tzId) { dateWithTz = date.setZone(tzId);
dateWithTz = date.setZone('UTC'); }
}
// Use timezone offset if available
if (!dateWithTz?.isValid && tzOffset) {
dateWithTz = date.setZone('UTC' + tzOffset);
}
// Fall back to tzId
if (!dateWithTz?.isValid && tzId) {
dateWithTz = date.setZone(tzId);
}
// Use the timezone only if the date is valid
if (dateWithTz?.isValid) {
date = dateWithTz;
} }
} }
return date; // If tz info is unavailable / wrong, we will show the local time only
// In this case, use the datetaken instead, which is guaranteed to be local, shifted to UTC
if (!valid() && this.baseInfo.datetaken) {
const date = DateTime.fromSeconds(this.baseInfo.datetaken);
if (date.isValid) {
dateWithTz = date.setZone('UTC');
}
}
// Return only if we found a valid date
return valid() ? dateWithTz : null;
}, },
dateOriginalStr(): string | null { dateOriginalStr(): string | null {

14
src/components/modal/EditDate.vue
View File

@ -253,14 +253,14 @@ export default defineComponent({
} }
if (this.sortedPhotos.length === 1) { if (this.sortedPhotos.length === 1) {
return this.getExifFormat(this.date); return utils.getExifDateStr(this.date);
} }
// Interpolate date // Interpolate date
const dT = this.date.getTime(); const dT = this.date.getTime();
const doT = this.origDateNewest.getTime(); const doT = this.origDateNewest.getTime();
const offset = ((photo.datetaken ?? 0) * 1000 || doT) - doT; const offset = ((photo.datetaken ?? 0) * 1000 || doT) - doT;
return this.getExifFormat(new Date(dT + offset * this.scaleFactor)); return utils.getExifDateStr(new Date(dT + offset * this.scaleFactor));
}, },
newestChange(time = false) { newestChange(time = false) {
@ -292,16 +292,6 @@ export default defineComponent({
this.oldestDirty = true; this.oldestDirty = true;
}, },
getExifFormat(date: Date) {
const year = date.getUTCFullYear().toString().padStart(4, '0');
const month = (date.getUTCMonth() + 1).toString().padStart(2, '0');
const day = date.getUTCDate().toString().padStart(2, '0');
const hour = date.getUTCHours().toString().padStart(2, '0');
const minute = date.getUTCMinutes().toString().padStart(2, '0');
const second = date.getUTCSeconds().toString().padStart(2, '0');
return `${year}:${month}:${day} ${hour}:${minute}:${second}`;
},
makeDate(yearS: string, monthS: string, dayS: string, hourS: string, minuteS: string, secondS: string) { makeDate(yearS: string, monthS: string, dayS: string, hourS: string, minuteS: string, secondS: string) {
const date = new Date(); const date = new Date();
const year = parseInt(yearS, 10); const year = parseInt(yearS, 10);

15
src/services/utils/date.ts
View File

@ -54,6 +54,21 @@ export function getMonthDateStr(date: Date) {
}); });
} }
/**
* Get the EXIF date string from a datetaken object
* @param date The datetaken value from photo metadata (UTC relative date)
* @returns YYYY:MM:DD HH:MM:SS
*/
export function getExifDateStr(date: Date) {
const year = date.getUTCFullYear().toString().padStart(4, '0');
const month = (date.getUTCMonth() + 1).toString().padStart(2, '0');
const day = date.getUTCDate().toString().padStart(2, '0');
const hour = date.getUTCHours().toString().padStart(2, '0');
const minute = date.getUTCMinutes().toString().padStart(2, '0');
const second = date.getUTCSeconds().toString().padStart(2, '0');
return `${year}:${month}:${day} ${hour}:${minute}:${second}`;
}
/** Get text like "5 years ago" from a date */ /** Get text like "5 years ago" from a date */
export function getFromNowStr(date: Date) { export function getFromNowStr(date: Date) {
// Get fromNow in correct locale // Get fromNow in correct locale