From f31a6f240171cf71cbb36e42540cb954f29fce13 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 09:39:15 +0530
Subject: [PATCH] Move

---
 web/apps/photos/src/components/FixCreationTime.tsx    | 2 +-
 web/apps/photos/src/components/PhotoViewer/index.tsx  | 2 +-
 web/apps/photos/src/services/upload/upload-service.ts | 2 +-
 web/packages/gallery/components/FileInfo.tsx          | 2 +-
 web/packages/gallery/components/viewer/data-source.ts | 2 +-
 web/packages/{new/photos => gallery}/services/exif.ts | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename web/packages/{new/photos => gallery}/services/exif.ts (100%)

diff --git a/web/apps/photos/src/components/FixCreationTime.tsx b/web/apps/photos/src/components/FixCreationTime.tsx
index 878a9d1c60..171433cb46 100644
--- a/web/apps/photos/src/components/FixCreationTime.tsx
+++ b/web/apps/photos/src/components/FixCreationTime.tsx
@@ -2,6 +2,7 @@ import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import type { ModalVisibilityProps } from "@/base/components/utils/modal";
 import log from "@/base/log";
 import { downloadManager } from "@/gallery/services/download";
+import { extractExifDates } from "@/gallery/services/exif";
 import { fileLogID, type EnteFile } from "@/media/file";
 import {
     decryptPublicMagicMetadata,
@@ -11,7 +12,6 @@ import {
 } from "@/media/file-metadata";
 import { FileType } from "@/media/file-type";
 import { PhotoDateTimePicker } from "@/new/photos/components/PhotoDateTimePicker";
-import { extractExifDates } from "@/new/photos/services/exif";
 import {
     Dialog,
     DialogContent,
diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index 4f7bc0d348..af1295677a 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -12,6 +12,7 @@ import log from "@/base/log";
 import { FileInfo, type FileInfoProps } from "@/gallery/components/FileInfo";
 import { type FileInfoExif } from "@/gallery/components/viewer/data-source";
 import { downloadManager } from "@/gallery/services/download";
+import { extractRawExif, parseExif } from "@/gallery/services/exif";
 import type { Collection } from "@/media/collection";
 import { fileLogID, type EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
@@ -19,7 +20,6 @@ import { isHEICExtension, needsJPEGConversion } from "@/media/formats";
 import { ConfirmDeleteFileDialog } from "@/new/photos/components/FileViewerComponents";
 import { ImageEditorOverlay } from "@/new/photos/components/ImageEditorOverlay";
 import { moveToTrash } from "@/new/photos/services/collection";
-import { extractRawExif, parseExif } from "@/new/photos/services/exif";
 import { usePhotosAppContext } from "@/new/photos/types/context";
 import AlbumOutlinedIcon from "@mui/icons-material/AlbumOutlined";
 import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
diff --git a/web/apps/photos/src/services/upload/upload-service.ts b/web/apps/photos/src/services/upload/upload-service.ts
index c26f14b23b..87603866f3 100644
--- a/web/apps/photos/src/services/upload/upload-service.ts
+++ b/web/apps/photos/src/services/upload/upload-service.ts
@@ -5,6 +5,7 @@ import { ensureElectron } from "@/base/electron";
 import { basename, nameAndExtension } from "@/base/file-name";
 import type { PublicAlbumsCredentials } from "@/base/http";
 import log from "@/base/log";
+import { extractExif } from "@/gallery/services/exif";
 import { extractVideoMetadata } from "@/gallery/services/ffmpeg";
 import {
     getNonEmptyMagicMetadataProps,
@@ -38,7 +39,6 @@ import {
 import { FileType, type FileTypeInfo } from "@/media/file-type";
 import { encodeLivePhoto } from "@/media/live-photo";
 import { addToCollection } from "@/new/photos/services/collection";
-import { extractExif } from "@/new/photos/services/exif";
 import { mergeUint8Arrays } from "@/utils/array";
 import { ensureInteger, ensureNumber } from "@/utils/ensure";
 import { CustomError, handleUploadError } from "@ente/shared/error";
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index b85bf6f94d..3a0c46d9d8 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -24,6 +24,7 @@ import { nameAndExtension } from "@/base/file-name";
 import log from "@/base/log";
 import type { Location } from "@/base/types";
 import { CopyButton } from "@/gallery/components/FileInfoComponents";
+import { tagNumericValue, type RawExifTags } from "@/gallery/services/exif";
 import {
     changeCaption,
     changeFileName,
@@ -49,7 +50,6 @@ import {
     aboveFileViewerContentZ,
     fileInfoDrawerZ,
 } from "@/new/photos/components/utils/z-index";
-import { tagNumericValue, type RawExifTags } from "@/new/photos/services/exif";
 import {
     getAnnotatedFacesForFile,
     isMLEnabled,
diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 9a0415e4bd..50f234d8ea 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -12,7 +12,7 @@ import {
     extractRawExif,
     parseExif,
     type RawExifTags,
-} from "@/new/photos/services/exif";
+} from "@/gallery/services/exif";
 
 /**
  * This is a subset of the fields expected by PhotoSwipe itself (see the
diff --git a/web/packages/new/photos/services/exif.ts b/web/packages/gallery/services/exif.ts
similarity index 100%
rename from web/packages/new/photos/services/exif.ts
rename to web/packages/gallery/services/exif.ts