move magicMetadata types to its own type file

src/types/file/index.ts

@@ -1,7 +1,7 @@
 import {
     EncryptedMagicMetadata,
-    MagicMetadataCore,
-    VISIBILITY_STATE,
+    FileMagicMetadata,
+    FilePublicMagicMetadata,
 } from 'types/magicMetadata';
 import { Metadata } from 'types/upload';
 
@@ -68,27 +68,6 @@ export interface EnteFile
     dataIndex?: number;
 }
 
-export interface FileMagicMetadataProps {
-    visibility?: VISIBILITY_STATE;
-    filePaths?: string[];
-}
-
-export interface FileMagicMetadata extends Omit<MagicMetadataCore, 'data'> {
-    data: FileMagicMetadataProps;
-}
-
-export interface FilePublicMagicMetadataProps {
-    editedTime?: number;
-    editedName?: string;
-    caption?: string;
-    uploaderName?: string;
-}
-
-export interface FilePublicMagicMetadata
-    extends Omit<MagicMetadataCore, 'data'> {
-    data: FilePublicMagicMetadataProps;
-}
-
 export interface TrashRequest {
     items: TrashRequestItems[];
 }

src/types/magicMetadata/index.ts

@@ -10,6 +10,27 @@ export interface EncryptedMagicMetadata
     data: string;
 }
 
+export interface FileMagicMetadataProps {
+    visibility?: VISIBILITY_STATE;
+    filePaths?: string[];
+}
+
+export interface FileMagicMetadata extends Omit<MagicMetadataCore, 'data'> {
+    data: FileMagicMetadataProps;
+}
+
+export interface FilePublicMagicMetadataProps {
+    editedTime?: number;
+    editedName?: string;
+    caption?: string;
+    uploaderName?: string;
+}
+
+export interface FilePublicMagicMetadata
+    extends Omit<MagicMetadataCore, 'data'> {
+    data: FilePublicMagicMetadataProps;
+}
+
 export enum VISIBILITY_STATE {
     VISIBLE = 0,
     ARCHIVED = 1,

src/types/upload/index.ts

@@ -1,7 +1,10 @@
 import { FILE_TYPE } from 'constants/file';
 import { Collection } from 'types/collection';
-import { FilePublicMagicMetadata, FileAttributes } from 'types/file';
-import { EncryptedMagicMetadata } from 'types/magicMetadata';
+import { FileAttributes } from 'types/file';
+import {
+    EncryptedMagicMetadata,
+    FilePublicMagicMetadata,
+} from 'types/magicMetadata';
 
 export interface DataStream {
     stream: ReadableStream<Uint8Array>;
@@ -132,7 +135,7 @@ export interface ProcessedFile {
     file: LocalFileAttributes<Uint8Array | DataStream>;
     thumbnail: LocalFileAttributes<Uint8Array>;
     metadata: LocalFileAttributes<string>;
-    pubMagicMetadata: EncryptedMagicMetadata;
+    pubMagicMetadata: FilePublicMagicMetadata;
     localID: number;
 }
 export interface BackupedFile {

src/utils/file/index.ts

@@ -1,12 +1,5 @@
 import { SelectedState } from 'types/gallery';
-import {
-    EnteFile,
-    EncryptedEnteFile,
-    FileMagicMetadata,
-    FileMagicMetadataProps,
-    FilePublicMagicMetadata,
-    FilePublicMagicMetadataProps,
-} from 'types/file';
+import { EnteFile, EncryptedEnteFile } from 'types/file';
 import { decodeMotionPhoto } from 'services/motionPhotoService';
 import { getFileType } from 'services/typeDetectionService';
 import DownloadManager from 'services/downloadManager';
@@ -25,7 +18,14 @@ import {
 import PublicCollectionDownloadManager from 'services/publicCollectionDownloadManager';
 import heicConversionService from 'services/heicConversionService';
 import * as ffmpegService from 'services/ffmpeg/ffmpegService';
-import { NEW_FILE_MAGIC_METADATA, VISIBILITY_STATE } from 'types/magicMetadata';
+import {
+    FileMagicMetadata,
+    FileMagicMetadataProps,
+    FilePublicMagicMetadata,
+    FilePublicMagicMetadataProps,
+    NEW_FILE_MAGIC_METADATA,
+    VISIBILITY_STATE,
+} from 'types/magicMetadata';
 import { IsArchived, updateMagicMetadataProps } from 'utils/magicMetadata';
 
 import { addLogLine } from 'utils/logging';