diff --git a/web/packages/gallery/utils/convert.ts b/web/packages/gallery/services/convert.ts similarity index 99% rename from web/packages/gallery/utils/convert.ts rename to web/packages/gallery/services/convert.ts index 3bc69efe88..851557cc60 100644 --- a/web/packages/gallery/utils/convert.ts +++ b/web/packages/gallery/services/convert.ts @@ -4,8 +4,8 @@ import { workerBridge } from "ente-base/worker/worker-bridge"; import { FileType } from "ente-media/file-type"; import { isHEICExtension, needsJPEGConversion } from "ente-media/formats"; import { heicToJPEG } from "ente-media/heic-convert"; -import { convertToMP4 } from "../services/ffmpeg"; -import { detectFileTypeInfo } from "./detect-type"; +import { convertToMP4 } from "./ffmpeg"; +import { detectFileTypeInfo } from "../utils/detect-type"; /** * Return a new {@link Blob} containing an image's data in a format that the diff --git a/web/packages/gallery/services/download.ts b/web/packages/gallery/services/download.ts index 01c2eaa711..c77930171b 100644 --- a/web/packages/gallery/services/download.ts +++ b/web/packages/gallery/services/download.ts @@ -15,13 +15,10 @@ import { import { ensureAuthToken } from "ente-base/local-user"; import log from "ente-base/log"; import { customAPIOrigin } from "ente-base/origins"; -import { - playableVideoURL, - renderableImageBlob, -} from "ente-gallery/utils/convert"; import type { EnteFile } from "ente-media/file"; import { FileType } from "ente-media/file-type"; import { decodeLivePhoto } from "ente-media/live-photo"; +import { playableVideoURL, renderableImageBlob } from "./convert"; /** * URL(s) for the original image or video, alongwith with potential conversions diff --git a/web/packages/new/photos/services/ml/blob.ts b/web/packages/new/photos/services/ml/blob.ts index 8bf9ae04e0..ce4f31bef8 100644 --- a/web/packages/new/photos/services/ml/blob.ts +++ b/web/packages/new/photos/services/ml/blob.ts @@ -1,8 +1,8 @@ import { basename } from "ente-base/file-name"; import type { ElectronMLWorker } from "ente-base/types/ipc"; +import { renderableImageBlob } from "ente-gallery/services/convert"; import { downloadManager } from "ente-gallery/services/download"; import type { UploadItem } from "ente-gallery/services/upload"; -import { renderableImageBlob } from "ente-gallery/utils/convert"; import { readStream } from "ente-gallery/utils/native-stream"; import type { EnteFile } from "ente-media/file"; import { FileType } from "ente-media/file-type";