Skip to content

Commit a3adec3

Browse files
authored
[desktop] Derive both formatted and timestamp from same source (#4980)
/cc @ua741
2 parents 91a9ff5 + 7d892c5 commit a3adec3

File tree

1 file changed

+6
-9
lines changed
  • web/apps/photos/src/services/export

1 file changed

+6
-9
lines changed

web/apps/photos/src/services/export/index.ts

+6-9
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ import { downloadManager } from "@/gallery/services/download";
55
import { writeStream } from "@/gallery/utils/native-stream";
66
import type { Collection } from "@/media/collection";
77
import { mergeMetadata, type EnteFile } from "@/media/file";
8-
import {
9-
fileCreationPhotoDate,
10-
fileLocation,
11-
type Metadata,
12-
} from "@/media/file-metadata";
8+
import { fileLocation, type Metadata } from "@/media/file-metadata";
139
import { FileType } from "@/media/file-type";
1410
import { decodeLivePhoto } from "@/media/live-photo";
1511
import {
@@ -1392,17 +1388,18 @@ const getGoogleLikeMetadataFile = (
13921388
dateTimeFormatter: Intl.DateTimeFormat,
13931389
) => {
13941390
const metadata: Metadata = file.metadata;
1395-
const creationTime = Math.floor(metadata.creationTime / 1e6);
1391+
const publicMagicMetadata = file.pubMagicMetadata?.data;
1392+
const creationTime = Math.floor(
1393+
(publicMagicMetadata?.editedTime ?? metadata.creationTime) / 1e6,
1394+
);
13961395
const modificationTime = Math.floor(
13971396
(metadata.modificationTime ?? metadata.creationTime) / 1e6,
13981397
);
13991398
const result: Record<string, unknown> = {
14001399
title: fileExportName,
14011400
creationTime: {
14021401
timestamp: creationTime,
1403-
formatted: dateTimeFormatter.format(
1404-
fileCreationPhotoDate(file, file.pubMagicMetadata?.data),
1405-
),
1402+
formatted: dateTimeFormatter.format(creationTime * 1000),
14061403
},
14071404
modificationTime: {
14081405
timestamp: modificationTime,

0 commit comments

Comments
 (0)