diff --git a/web/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx b/web/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx index 34fdb8e34a..a6d37ccf49 100644 --- a/web/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx +++ b/web/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx @@ -17,7 +17,7 @@ import { t } from "i18next"; import { AppContext } from "pages/_app"; import { GalleryContext } from "pages/gallery"; import { useContext, useEffect, useMemo, useState } from "react"; -import { getEXIFLocation } from "services/upload/exifService"; +import { getEXIFLocation } from "services/exif"; import { EnteFile } from "types/file"; import { PublicCollectionGalleryContext } from "utils/publicCollectionGallery"; import { diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx index 552c531f5d..a19469a6f4 100644 --- a/web/apps/photos/src/components/PhotoViewer/index.tsx +++ b/web/apps/photos/src/components/PhotoViewer/index.tsx @@ -44,9 +44,9 @@ import isElectron from "is-electron"; import { AppContext } from "pages/_app"; import { GalleryContext } from "pages/gallery"; import downloadManager, { LoadedLivePhotoSourceURL } from "services/download"; +import { getParsedExifData } from "services/exif"; import { trashFiles } from "services/fileService"; import { getFileType } from "services/typeDetectionService"; -import { getParsedExifData } from "services/upload/exifService"; import { SetFilesDownloadProgressAttributesCreator } from "types/gallery"; import { isClipboardItemPresent } from "utils/common"; import { pauseVideo, playVideo } from "utils/photoFrame"; diff --git a/web/apps/photos/src/services/upload/exifService.ts b/web/apps/photos/src/services/exif.ts similarity index 100% rename from web/apps/photos/src/services/upload/exifService.ts rename to web/apps/photos/src/services/exif.ts diff --git a/web/apps/photos/src/services/updateCreationTimeWithExif.ts b/web/apps/photos/src/services/updateCreationTimeWithExif.ts index e446219150..55f3dce128 100644 --- a/web/apps/photos/src/services/updateCreationTimeWithExif.ts +++ b/web/apps/photos/src/services/updateCreationTimeWithExif.ts @@ -9,7 +9,7 @@ import { updateExistingFilePubMetadata, } from "utils/file"; import downloadManager from "./download"; -import { getParsedExifData } from "./upload/exifService"; +import { getParsedExifData } from "./exif"; const EXIF_TIME_TAGS = [ "DateTimeOriginal", diff --git a/web/apps/photos/src/services/upload/metadata.ts b/web/apps/photos/src/services/upload/metadata.ts index d6acb9abd3..b8859854cf 100644 --- a/web/apps/photos/src/services/upload/metadata.ts +++ b/web/apps/photos/src/services/upload/metadata.ts @@ -22,7 +22,7 @@ import { type LivePhotoAssets2, type UploadAsset2, } from "types/upload"; -import { getEXIFLocation, getEXIFTime, getParsedExifData } from "./exifService"; +import { getEXIFLocation, getEXIFTime, getParsedExifData } from "../exif"; import { MAX_FILE_NAME_LENGTH_GOOGLE_EXPORT, getClippedMetadataJSONMapKeyForFile, diff --git a/web/apps/photos/src/utils/file/index.ts b/web/apps/photos/src/utils/file/index.ts index fa681c2cde..1ae6804bbd 100644 --- a/web/apps/photos/src/utils/file/index.ts +++ b/web/apps/photos/src/utils/file/index.ts @@ -11,6 +11,7 @@ import { t } from "i18next"; import isElectron from "is-electron"; import { moveToHiddenCollection } from "services/collectionService"; import DownloadManager from "services/download"; +import { updateFileCreationDateInEXIF } from "services/exif"; import { deleteFromTrash, trashFiles, @@ -19,7 +20,6 @@ import { } from "services/fileService"; import { heicToJPEG } from "services/heic-convert"; import { getFileType } from "services/typeDetectionService"; -import { updateFileCreationDateInEXIF } from "services/upload/exifService"; import { EncryptedEnteFile, EnteFile,