kenmirrors/ente
1
0
Fork 0
mirror of https://github.com/ente-io/ente.git synced 2025-08-07 23:18:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[desktop] Derive both formatted and timestamp from same source (#4980)

Browse Source 
/cc @ua741
This commit is contained in:
Manav Rathi 2025-02-06 15:58:12 +05:30 committed by GitHub
commit a3adec3fee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
web/apps/photos/src/services/export/index.ts
View File

@ -5,11 +5,7 @@ import { downloadManager } from "@/gallery/services/download";
import { writeStream } from "@/gallery/utils/native-stream";
import type { Collection } from "@/media/collection";
import { mergeMetadata, type EnteFile } from "@/media/file";
import {
fileCreationPhotoDate,
fileLocation,
type Metadata,
} from "@/media/file-metadata";
import { fileLocation, type Metadata } from "@/media/file-metadata";
import { FileType } from "@/media/file-type";
import { decodeLivePhoto } from "@/media/live-photo";
import {
@ -1392,7 +1388,10 @@ const getGoogleLikeMetadataFile = (
dateTimeFormatter: Intl.DateTimeFormat,
) => {
const metadata: Metadata = file.metadata;
const creationTime = Math.floor(metadata.creationTime / 1e6);
const publicMagicMetadata = file.pubMagicMetadata?.data;
const creationTime = Math.floor(
(publicMagicMetadata?.editedTime ?? metadata.creationTime) / 1e6,
);
const modificationTime = Math.floor(
(metadata.modificationTime ?? metadata.creationTime) / 1e6,
);
@ -1400,9 +1399,7 @@ const getGoogleLikeMetadataFile = (
title: fileExportName,
creationTime: {
timestamp: creationTime,
formatted: dateTimeFormatter.format(
fileCreationPhotoDate(file, file.pubMagicMetadata?.data),
),
formatted: dateTimeFormatter.format(creationTime * 1000),
},
modificationTime: {
timestamp: modificationTime,