Inline

web/apps/photos/src/components/Export.tsx

@@ -36,8 +36,9 @@ import exportService, {
     ExportStage,
     selectAndPrepareExportDirectory,
     type ExportOpts,
+    type ExportProgress,
+    type ExportSettings,
 } from "services/export";
-import { ExportProgress, ExportSettings } from "types/export";
 import ExportFinished from "./ExportFinished";
 import ExportInProgress from "./ExportInProgress";
 import ExportInit from "./ExportInit";

web/apps/photos/src/components/ExportInProgress.tsx

@@ -12,8 +12,7 @@ import {
 } from "@mui/material";
 import { t } from "i18next";
 import { Trans } from "react-i18next";
-import { ExportStage } from "services/export";
-import { ExportProgress } from "types/export";
+import { ExportStage, type ExportProgress } from "services/export";
 
 export const ComfySpan = styled("span")`
     padding: 0 0.5rem;

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

@@ -25,7 +25,6 @@ import { PromiseQueue } from "@/utils/promise";
 import { CustomError } from "@ente/shared/error";
 import { LS_KEYS, getData, setData } from "@ente/shared/storage/localStorage";
 import i18n from "i18next";
-import { ExportProgress, ExportSettings, ExportUIUpdaters } from "types/export";
 import { getAllLocalCollections } from "../collectionService";
 import { migrateExport, type ExportRecord } from "./migration";
 
@@ -49,6 +48,17 @@ export enum ExportStage {
     FINISHED = 7,
 }
 
+export interface ExportProgress {
+    success: number;
+    failed: number;
+    total: number;
+}
+
+export interface ExportSettings {
+    folder: string;
+    continuousExport: boolean;
+}
+
 export type CollectionExportNames = Record<number, string>;
 
 export type FileExportNames = Record<string, string>;

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

@@ -17,7 +17,6 @@ import { wait } from "@/utils/promise";
 import { LS_KEYS, getData } from "@ente/shared/storage/localStorage";
 import type { User } from "@ente/shared/user/types";
 import { getLocalCollections } from "services/collectionService";
-import { ExportProgress } from "types/export";
 import { getIDBasedSortedFiles, getPersonalFiles } from "utils/file";
 import {
     getCollectionIDFromFileUID,
@@ -25,6 +24,7 @@ import {
     getLivePhotoExportName,
     getMetadataFolderExportPath,
     type CollectionExportNames,
+    type ExportProgress,
     type ExportStage,
     type FileExportNames,
 } from ".";

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

@@ -1,13 +0,0 @@
-import { EnteFile } from "@/media/file";
-import type { ExportStage } from "services/export";
-
-export interface ExportProgress {
-    success: number;
-    failed: number;
-    total: number;
-}
-
-export interface ExportSettings {
-    folder: string;
-    continuousExport: boolean;
-}