Use UI date

This commit is contained in:
Manav Rathi
2024-08-23 21:37:18 +05:30
parent a84aa346f5
commit 68d722d06b
3 changed files with 7 additions and 5 deletions

View File

@@ -20,7 +20,7 @@ import { formattedByteSize } from "@/new/photos/utils/units";
import CopyButton from "@ente/shared/components/CodeBlock/CopyButton";
import { FlexWrapper } from "@ente/shared/components/Container";
import EnteSpinner from "@ente/shared/components/EnteSpinner";
import { getPublicMagicMetadataMTSync } from "@ente/shared/file-metadata";
import { getPublicMagicMetadataSync } from "@ente/shared/file-metadata";
import { formatDate, formatTime } from "@ente/shared/time/format";
import CalendarTodayIcon from "@mui/icons-material/CalendarToday";
import CameraOutlined from "@mui/icons-material/CameraOutlined";
@@ -366,7 +366,7 @@ export const CreationTime: React.FC<CreationTimeProps> = ({
const openEditMode = () => setIsInEditMode(true);
const closeEditMode = () => setIsInEditMode(false);
const publicMagicMetadata = getPublicMagicMetadataMTSync(enteFile);
const publicMagicMetadata = getPublicMagicMetadataSync(enteFile);
const originalDate = getUICreationDate(enteFile, publicMagicMetadata);
const saveEdits = async (pickedTime: ParsedMetadataDate) => {

View File

@@ -1,5 +1,7 @@
import { getUICreationDate } from "@/media/file-metadata";
import type { SearchDateComponents } from "@/new/photos/services/search/types";
import { EnteFile } from "@/new/photos/types/file";
import { getPublicMagicMetadataSync } from "@ente/shared/file-metadata";
import * as Comlink from "comlink";
import {
isInsideCity,
@@ -31,7 +33,7 @@ function isSearchedFile(file: EnteFile, search: Search) {
if (search?.date) {
return isDateComponentsMatch(
search.date,
new Date(file.metadata.creationTime / 1000),
getUICreationDate(file, getPublicMagicMetadataSync(file)),
);
}
if (search?.location) {

View File

@@ -8,7 +8,7 @@ import { fileLogID } from "@/new/photos/utils/file";
/**
* On-demand decrypt the public magic metadata for an {@link EnteFile} for code
* running on the main thread, but do it synchronously.
* running synchronously.
*
* It both modifies the given file object, and also returns the decrypted
* metadata.
@@ -18,7 +18,7 @@ import { fileLogID } from "@/new/photos/utils/file";
* check and should be a no-op in usually. On debug builds it'll throw if it
* finds its assumptions broken.
*/
export const getPublicMagicMetadataMTSync = (enteFile: EnteFile) => {
export const getPublicMagicMetadataSync = (enteFile: EnteFile) => {
if (!enteFile.pubMagicMetadata) return undefined;
if (typeof enteFile.pubMagicMetadata.data == "string") {
if (isDevBuild)