Move

web/apps/photos/src/services/export/index.ts

@@ -1,5 +1,6 @@
 import { ensureElectron } from "@/base/electron";
 import log from "@/base/log";
+import { writeStream } from "@/gallery/utils/native-stream";
 import type { Collection } from "@/media/collection";
 import { mergeMetadata, type EnteFile } from "@/media/file";
 import {
@@ -20,7 +21,6 @@ import {
 } from "@/new/photos/services/export";
 import { getAllLocalFiles } from "@/new/photos/services/files";
 import { safeDirectoryName, safeFileName } from "@/new/photos/utils/native-fs";
-import { writeStream } from "@/new/photos/utils/native-stream";
 import { CustomError } from "@ente/shared/error";
 import { LS_KEYS, getData, setData } from "@ente/shared/storage/localStorage";
 import QueueProcessor, {

web/apps/photos/src/services/upload/takeout.ts

@@ -5,8 +5,8 @@ import { ensureElectron } from "@/base/electron";
 import { nameAndExtension } from "@/base/file-name";
 import log from "@/base/log";
 import { type Location } from "@/base/types";
+import { readStream } from "@/gallery/utils/native-stream";
 import type { UploadItem } from "@/new/photos/services/upload/types";
-import { readStream } from "@/new/photos/utils/native-stream";
 import { maybeParseInt } from "@/utils/parse";
 
 /**

web/apps/photos/src/services/upload/upload-service.ts

@@ -6,6 +6,7 @@ import { basename, nameAndExtension } from "@/base/file-name";
 import log from "@/base/log";
 import { CustomErrorMessage } from "@/base/types/ipc";
 import { detectFileTypeInfoFromChunk } from "@/gallery/utils/detect-type";
+import { readStream } from "@/gallery/utils/native-stream";
 import {
     EncryptedMagicMetadata,
     EnteFile,
@@ -34,7 +35,6 @@ import {
     RANDOM_PERCENTAGE_PROGRESS_FOR_PUT,
     UPLOAD_RESULT,
 } from "@/new/photos/services/upload/types";
-import { readStream } from "@/new/photos/utils/native-stream";
 import { mergeUint8Arrays } from "@/utils/array";
 import { ensureInteger, ensureNumber } from "@/utils/ensure";
 import { CustomError, handleUploadError } from "@ente/shared/error";

web/apps/photos/src/utils/file/index.ts

@@ -3,6 +3,7 @@ import log from "@/base/log";
 import { type Electron } from "@/base/types/ipc";
 import { downloadAndRevokeObjectURL } from "@/base/utils/web";
 import { detectFileTypeInfo } from "@/gallery/utils/detect-type";
+import { writeStream } from "@/gallery/utils/native-stream";
 import {
     EncryptedEnteFile,
     EnteFile,
@@ -22,7 +23,6 @@ import {
     updateMagicMetadata,
 } from "@/new/photos/services/magic-metadata";
 import { safeFileName } from "@/new/photos/utils/native-fs";
-import { writeStream } from "@/new/photos/utils/native-stream";
 import { withTimeout } from "@/utils/promise";
 import { LS_KEYS, getData } from "@ente/shared/storage/localStorage";
 import type { User } from "@ente/shared/user/types";

web/packages/gallery/utils/convert.ts

@@ -2,9 +2,9 @@ import { isDesktop } from "@/base/app";
 import log from "@/base/log";
 import { CustomErrorMessage } from "@/base/types/ipc";
 import { workerBridge } from "@/base/worker/worker-bridge";
-import { detectFileTypeInfo } from "@/gallery/utils/detect-type";
 import { isHEICExtension, needsJPEGConversion } from "@/media/formats";
 import { heicToJPEG } from "@/media/heic-convert";
+import { detectFileTypeInfo } from "./detect-type";
 
 /**
  * This will be set to false if we get an error from the Node.js side of our

web/packages/new/photos/services/download.ts

@@ -16,7 +16,7 @@ import type { EnteFile, LivePhotoSourceURL, SourceURLs } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { decodeLivePhoto } from "@/media/live-photo";
 import { convertToMP4 } from "./ffmpeg";
-import { renderableImageBlob } from "@/new/photos/utils/file";
+import { renderableImageBlob } from "@/gallery/utils/convert";
 import { CustomError } from "@ente/shared/error";
 import HTTPService from "@ente/shared/network/HTTPService";
 

web/packages/new/photos/services/ffmpeg/index.ts

@@ -2,17 +2,17 @@ import { ensureElectron } from "@/base/electron";
 import log from "@/base/log";
 import type { Electron } from "@/base/types/ipc";
 import { ComlinkWorker } from "@/base/worker/comlink-worker";
+import {
+    readConvertToMP4Done,
+    readConvertToMP4Stream,
+    writeConvertToMP4Stream,
+} from "@/gallery/utils/native-stream";
 import { parseMetadataDate, type ParsedMetadata } from "@/media/file-metadata";
 import {
     toDataOrPathOrZipEntry,
     type DesktopUploadItem,
     type UploadItem,
 } from "@/new/photos/services/upload/types";
-import {
-    readConvertToMP4Done,
-    readConvertToMP4Stream,
-    writeConvertToMP4Stream,
-} from "@/new/photos/utils/native-stream";
 import type { Remote } from "comlink";
 import {
     ffmpegPathPlaceholder,

web/packages/new/photos/services/ml/blob.ts

@@ -1,10 +1,10 @@
 import { basename } from "@/base/file-name";
 import type { ElectronMLWorker } from "@/base/types/ipc";
+import { renderableImageBlob } from "@/gallery/utils/convert";
+import { readStream } from "@/gallery/utils/native-stream";
 import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { decodeLivePhoto } from "@/media/live-photo";
-import { renderableImageBlob } from "../../utils/file";
-import { readStream } from "../../utils/native-stream";
 import DownloadManager from "../download";
 import type { UploadItem } from "../upload/types";