Merge pull request #284 from ente-io/rename-type-MetadataObject-to-Metadata

Rename type MetadataObject to Metadata

src/services/exportService.ts

@@ -39,7 +39,7 @@ import {
 } from 'utils/file';
 
 import { updateFileCreationDateInEXIF } from './upload/exifService';
-import { MetadataObject } from 'types/upload';
+import { Metadata } from 'types/upload';
 import QueueProcessor from './queueProcessor';
 import { Collection } from 'types/collection';
 import {
@@ -509,7 +509,7 @@ class ExportService {
     private async saveMetadataFile(
         collectionFolderPath: string,
         fileSaveName: string,
-        metadata: MetadataObject
+        metadata: Metadata
     ) {
         await this.ElectronAPIs.saveFileToDisk(
             getFileMetadataSavePath(collectionFolderPath, fileSaveName),

src/services/upload/metadataService.ts

@@ -2,7 +2,7 @@ import { FILE_TYPE } from 'constants/file';
 import { logError } from 'utils/sentry';
 import { getExifData } from './exifService';
 import {
-    MetadataObject,
+    Metadata,
     ParsedMetaDataJSON,
     Location,
     FileTypeInfo,
@@ -29,7 +29,7 @@ export async function extractMetadata(
         exifData = await getExifData(receivedFile, fileTypeInfo);
     }
 
-    const extractedMetadata: MetadataObject = {
+    const extractedMetadata: Metadata = {
         title: receivedFile.name,
         creationTime:
             exifData?.creationTime ?? receivedFile.lastModified * 1000,

src/services/upload/uploadService.ts

@@ -18,7 +18,7 @@ import {
     FileWithMetadata,
     isDataStream,
     MetadataMap,
-    MetadataObject,
+    Metadata,
     ParsedMetaDataJSON,
     ProcessedFile,
     UploadFile,
@@ -62,13 +62,13 @@ class UploadService {
         rawFile: File,
         collection: Collection,
         fileTypeInfo: FileTypeInfo
-    ): Promise<MetadataObject> {
+    ): Promise<Metadata> {
         const originalName = getFileOriginalName(rawFile);
         const googleMetadata =
             this.metadataMap.get(
                 getMetadataMapKey(collection.id, originalName)
             ) ?? {};
-        const extractedMetadata: MetadataObject = await extractMetadata(
+        const extractedMetadata: Metadata = await extractMetadata(
             rawFile,
             fileTypeInfo
         );

src/services/upload/uploader.ts

@@ -16,7 +16,7 @@ import {
     FileTypeInfo,
     FileWithCollection,
     FileWithMetadata,
-    MetadataObject,
+    Metadata,
     UploadFile,
 } from 'types/upload';
 import { FILE_TYPE } from 'constants/file';
@@ -40,7 +40,7 @@ export default async function uploader(
 
     let file: FileInMemory = null;
     let encryptedFile: EncryptedFile = null;
-    let metadata: MetadataObject = null;
+    let metadata: Metadata = null;
     let fileTypeInfo: FileTypeInfo = null;
     let fileWithMetadata: FileWithMetadata = null;
 

src/types/file/index.ts

@@ -1,5 +1,5 @@
 import { VISIBILITY_STATE } from 'constants/file';
-import { DataStream, MetadataObject } from 'types/upload';
+import { DataStream, Metadata } from 'types/upload';
 
 export interface fileAttribute {
     encryptedData?: DataStream | Uint8Array;
@@ -42,7 +42,7 @@ export interface EnteFile {
     ownerID: number;
     file: fileAttribute;
     thumbnail: fileAttribute;
-    metadata: MetadataObject;
+    metadata: Metadata;
     magicMetadata: MagicMetadata;
     pubMagicMetadata: PublicMagicMetadata;
     encryptedKey: string;

src/types/upload/index.ts

@@ -17,7 +17,7 @@ export interface EncryptionResult {
     key: string;
 }
 
-export interface MetadataObject {
+export interface Metadata {
     title: string;
     creationTime: number;
     modificationTime: number;
@@ -90,7 +90,7 @@ export interface FileInMemory {
 
 export interface FileWithMetadata
     extends Omit<FileInMemory, 'hasStaticThumbnail'> {
-    metadata: MetadataObject;
+    metadata: Metadata;
 }
 
 export interface EncryptedFile {

src/utils/export/index.ts

@@ -4,7 +4,7 @@ import { CollectionIDPathMap, ExportRecord } from 'types/export';
 
 import { EnteFile } from 'types/file';
 
-import { MetadataObject } from 'types/upload';
+import { Metadata } from 'types/upload';
 import { formatDate, splitFilenameAndExtension } from 'utils/file';
 import { METADATA_FOLDER_NAME } from 'constants/export';
 
@@ -127,7 +127,7 @@ export const dedupe = (files: any[]) => {
 
 export const getGoogleLikeMetadataFile = (
     fileSaveName: string,
-    metadata: MetadataObject
+    metadata: Metadata
 ) => {
     const creationTime = Math.floor(metadata.creationTime / 1000000);
     const modificationTime = Math.floor(

src/utils/upload/index.ts

@@ -1,11 +1,11 @@
-import { FileWithCollection, MetadataObject } from 'types/upload';
+import { FileWithCollection, Metadata } from 'types/upload';
 import { EnteFile } from 'types/file';
 
 const TYPE_JSON = 'json';
 
 export function fileAlreadyInCollection(
     existingFilesInCollection: EnteFile[],
-    newFileMetadata: MetadataObject
+    newFileMetadata: Metadata
 ): boolean {
     for (const existingFile of existingFilesInCollection) {
         if (areFilesSame(existingFile.metadata, newFileMetadata)) {
@@ -15,8 +15,8 @@ export function fileAlreadyInCollection(
     return false;
 }
 export function areFilesSame(
-    existingFile: MetadataObject,
+    existingFile: Metadata,
-    newFile: MetadataObject
+    newFile: Metadata
 ): boolean {
     if (
         existingFile.fileType === newFile.fileType &&