Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Fix UTC video creation time handling

Manav Rathi4059b0d84c67
diff --git a/web/apps/albums/src/public-album/upload/pipeline/upload-service.ts b/web/apps/albums/src/public-album/upload/pipeline/upload-service.ts
index 85c8cf9dd4..5fb6b9d3de 100644
--- a/web/apps/albums/src/public-album/upload/pipeline/upload-service.ts
+++ b/web/apps/albums/src/public-album/upload/pipeline/upload-service.ts
@@ -151,16 +151,12 @@ export default uploadService;
export const uploadItemFileName = (uploadItem: UploadItem) => uploadItem.name;
-export type ExternalParsedMetadata = ParsedMetadata & {
- creationTime?: number | undefined;
-};
-
export interface UploadAsset {
isLivePhoto?: boolean;
livePhotoAssets?: LivePhotoAssets;
uploadItem?: UploadItem;
pathPrefix: UploadPathPrefix | undefined;
- externalParsedMetadata?: ExternalParsedMetadata;
+ externalParsedMetadata?: ParsedMetadata;
}
interface ThumbnailedFile {
@@ -338,7 +334,9 @@ const uploadItemCreationDate = async (
);
}
- return parsedMetadata?.creationDate?.timestamp;
+ return (
+ parsedMetadata?.creationDate?.timestamp ?? parsedMetadata?.creationTime
+ );
};
export const uploadCancelledErrorMessage = "Upload cancelled";
@@ -678,7 +676,7 @@ const extractLivePhotoMetadata = async (
const extractImageOrVideoMetadata = async (
uploadItem: UploadItem,
pathPrefix: UploadPathPrefix | undefined,
- externalParsedMetadata: ExternalParsedMetadata | undefined,
+ externalParsedMetadata: ParsedMetadata | undefined,
fileType: FileType,
lastModifiedMs: number,
collectionID: number,
@@ -687,7 +685,7 @@ const extractImageOrVideoMetadata = async (
) => {
const fileName = uploadItemFileName(uploadItem);
- let parsedMetadata: (ParsedMetadata & ExternalParsedMetadata) | undefined;
+ let parsedMetadata: ParsedMetadata | undefined;
if (fileType == FileType.image) {
parsedMetadata = await tryExtractImageMetadata(uploadItem);
} else if (fileType == FileType.video) {
diff --git a/web/packages/gallery/services/ffmpeg/index.ts b/web/packages/gallery/services/ffmpeg/index.ts
index 3ad462b21f..298bd8ae97 100644
--- a/web/packages/gallery/services/ffmpeg/index.ts
+++ b/web/packages/gallery/services/ffmpeg/index.ts
@@ -120,11 +120,17 @@ const parseFFmpegExtractedMetadata = (ffmpegOutput: Uint8Array) => {
const result: ParsedMetadata = {};
- // Prefer QuickTime metadata because it retains the time-zone offset.
- const creationDate =
- parseFFMetadataDate(kv.get("com.apple.quicktime.creationdate")) ??
- parseFFMetadataDate(kv.get("creation_time"));
- if (creationDate) result.creationDate = creationDate;
+ const creationDate = parseFFMetadataDate(
+ kv.get("com.apple.quicktime.creationdate"),
+ );
+ if (creationDate) {
+ result.creationDate = creationDate;
+ } else {
+ const creationTime = parseFFMetadataDate(
+ kv.get("creation_time"),
+ )?.timestamp;
+ if (creationTime) result.creationTime = creationTime;
+ }
const location =
parseFFMetadataLocation(
diff --git a/web/packages/gallery/services/upload/index.ts b/web/packages/gallery/services/upload/index.ts
index 4edcf03463..57b9acea9e 100644
--- a/web/packages/gallery/services/upload/index.ts
+++ b/web/packages/gallery/services/upload/index.ts
@@ -5,8 +5,8 @@ import type { ZipItem } from "ente-base/types/ipc";
import { exportMetadataDirectoryName } from "ente-gallery/export-dirs";
import type { Collection } from "ente-media/collection";
import type { EnteFile } from "ente-media/file";
+import type { ParsedMetadata } from "ente-media/file-metadata";
import { tryParseTakeoutAlbumNameMetadataJSON } from "./metadata-json";
-import type { ExternalParsedMetadata } from "./upload-service";
class UploadState {
shouldDisableCFUploadProxy = false;
@@ -119,7 +119,7 @@ export interface ClusteredUploadItem {
isLivePhoto: boolean;
uploadItem?: UploadItem;
pathPrefix: UploadPathPrefix | undefined;
- externalParsedMetadata?: ExternalParsedMetadata;
+ externalParsedMetadata?: ParsedMetadata;
// TODO: Tie this to the isLivePhoto flag using a discriminated union.
livePhotoAssets?: LivePhotoAssets;
}
diff --git a/web/packages/gallery/services/upload/upload-service.ts b/web/packages/gallery/services/upload/upload-service.ts
index 3dc060bd4a..a2d80c2e00 100644
--- a/web/packages/gallery/services/upload/upload-service.ts
+++ b/web/packages/gallery/services/upload/upload-service.ts
@@ -261,16 +261,12 @@ export const uploadItemFileName = (uploadItem: UploadItem) => {
return uploadItem.file.name;
};
-export type ExternalParsedMetadata = ParsedMetadata & {
- creationTime?: number | undefined;
-};
-
export interface UploadAsset {
isLivePhoto?: boolean;
livePhotoAssets?: LivePhotoAssets;
uploadItem?: UploadItem;
pathPrefix: UploadPathPrefix | undefined;
- externalParsedMetadata?: ExternalParsedMetadata;
+ externalParsedMetadata?: ParsedMetadata;
}
interface ThumbnailedFile {
@@ -449,7 +445,9 @@ const uploadItemCreationDate = async (
);
}
- return parsedMetadata?.creationDate?.timestamp;
+ return (
+ parsedMetadata?.creationDate?.timestamp ?? parsedMetadata?.creationTime
+ );
};
export const uploadCancelledErrorMessage = "Upload cancelled";
@@ -840,7 +838,7 @@ const extractLivePhotoMetadata = async (
const extractImageOrVideoMetadata = async (
uploadItem: UploadItem,
pathPrefix: UploadPathPrefix | undefined,
- externalParsedMetadata: ExternalParsedMetadata | undefined,
+ externalParsedMetadata: ParsedMetadata | undefined,
fileType: FileType,
lastModifiedMs: number,
collectionID: number,
@@ -849,7 +847,7 @@ const extractImageOrVideoMetadata = async (
) => {
const fileName = uploadItemFileName(uploadItem);
- let parsedMetadata: (ParsedMetadata & ExternalParsedMetadata) | undefined;
+ let parsedMetadata: ParsedMetadata | undefined;
if (fileType == FileType.image) {
parsedMetadata = await tryExtractImageMetadata(
uploadItem,
diff --git a/web/packages/media/file-metadata.ts b/web/packages/media/file-metadata.ts
index 6ef4059e38..ef4be1fc02 100644
--- a/web/packages/media/file-metadata.ts
+++ b/web/packages/media/file-metadata.ts
@@ -200,6 +200,7 @@ export const fileDurationString = (file: EnteFile): string | undefined => {
export interface ParsedMetadata {
width?: number;
height?: number;
+ creationTime?: number;
creationDate?: ParsedMetadataDate | undefined;
location?: Location;
description?: string;