Merge pull request #284 from ente-io/rename-type-MetadataObject-to-Metadata
Rename type MetadataObject to Metadata
This commit is contained in:
commit
7dc9246519
|
@ -39,7 +39,7 @@ import {
|
||||||
} from 'utils/file';
|
} from 'utils/file';
|
||||||
|
|
||||||
import { updateFileCreationDateInEXIF } from './upload/exifService';
|
import { updateFileCreationDateInEXIF } from './upload/exifService';
|
||||||
import { MetadataObject } from 'types/upload';
|
import { Metadata } from 'types/upload';
|
||||||
import QueueProcessor from './queueProcessor';
|
import QueueProcessor from './queueProcessor';
|
||||||
import { Collection } from 'types/collection';
|
import { Collection } from 'types/collection';
|
||||||
import {
|
import {
|
||||||
|
@ -509,7 +509,7 @@ class ExportService {
|
||||||
private async saveMetadataFile(
|
private async saveMetadataFile(
|
||||||
collectionFolderPath: string,
|
collectionFolderPath: string,
|
||||||
fileSaveName: string,
|
fileSaveName: string,
|
||||||
metadata: MetadataObject
|
metadata: Metadata
|
||||||
) {
|
) {
|
||||||
await this.ElectronAPIs.saveFileToDisk(
|
await this.ElectronAPIs.saveFileToDisk(
|
||||||
getFileMetadataSavePath(collectionFolderPath, fileSaveName),
|
getFileMetadataSavePath(collectionFolderPath, fileSaveName),
|
||||||
|
|
|
@ -2,7 +2,7 @@ import { FILE_TYPE } from 'constants/file';
|
||||||
import { logError } from 'utils/sentry';
|
import { logError } from 'utils/sentry';
|
||||||
import { getExifData } from './exifService';
|
import { getExifData } from './exifService';
|
||||||
import {
|
import {
|
||||||
MetadataObject,
|
Metadata,
|
||||||
ParsedMetaDataJSON,
|
ParsedMetaDataJSON,
|
||||||
Location,
|
Location,
|
||||||
FileTypeInfo,
|
FileTypeInfo,
|
||||||
|
@ -29,7 +29,7 @@ export async function extractMetadata(
|
||||||
exifData = await getExifData(receivedFile, fileTypeInfo);
|
exifData = await getExifData(receivedFile, fileTypeInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
const extractedMetadata: MetadataObject = {
|
const extractedMetadata: Metadata = {
|
||||||
title: receivedFile.name,
|
title: receivedFile.name,
|
||||||
creationTime:
|
creationTime:
|
||||||
exifData?.creationTime ?? receivedFile.lastModified * 1000,
|
exifData?.creationTime ?? receivedFile.lastModified * 1000,
|
||||||
|
|
|
@ -18,7 +18,7 @@ import {
|
||||||
FileWithMetadata,
|
FileWithMetadata,
|
||||||
isDataStream,
|
isDataStream,
|
||||||
MetadataMap,
|
MetadataMap,
|
||||||
MetadataObject,
|
Metadata,
|
||||||
ParsedMetaDataJSON,
|
ParsedMetaDataJSON,
|
||||||
ProcessedFile,
|
ProcessedFile,
|
||||||
UploadFile,
|
UploadFile,
|
||||||
|
@ -62,13 +62,13 @@ class UploadService {
|
||||||
rawFile: File,
|
rawFile: File,
|
||||||
collection: Collection,
|
collection: Collection,
|
||||||
fileTypeInfo: FileTypeInfo
|
fileTypeInfo: FileTypeInfo
|
||||||
): Promise<MetadataObject> {
|
): Promise<Metadata> {
|
||||||
const originalName = getFileOriginalName(rawFile);
|
const originalName = getFileOriginalName(rawFile);
|
||||||
const googleMetadata =
|
const googleMetadata =
|
||||||
this.metadataMap.get(
|
this.metadataMap.get(
|
||||||
getMetadataMapKey(collection.id, originalName)
|
getMetadataMapKey(collection.id, originalName)
|
||||||
) ?? {};
|
) ?? {};
|
||||||
const extractedMetadata: MetadataObject = await extractMetadata(
|
const extractedMetadata: Metadata = await extractMetadata(
|
||||||
rawFile,
|
rawFile,
|
||||||
fileTypeInfo
|
fileTypeInfo
|
||||||
);
|
);
|
||||||
|
|
|
@ -16,7 +16,7 @@ import {
|
||||||
FileTypeInfo,
|
FileTypeInfo,
|
||||||
FileWithCollection,
|
FileWithCollection,
|
||||||
FileWithMetadata,
|
FileWithMetadata,
|
||||||
MetadataObject,
|
Metadata,
|
||||||
UploadFile,
|
UploadFile,
|
||||||
} from 'types/upload';
|
} from 'types/upload';
|
||||||
import { FILE_TYPE } from 'constants/file';
|
import { FILE_TYPE } from 'constants/file';
|
||||||
|
@ -40,7 +40,7 @@ export default async function uploader(
|
||||||
|
|
||||||
let file: FileInMemory = null;
|
let file: FileInMemory = null;
|
||||||
let encryptedFile: EncryptedFile = null;
|
let encryptedFile: EncryptedFile = null;
|
||||||
let metadata: MetadataObject = null;
|
let metadata: Metadata = null;
|
||||||
let fileTypeInfo: FileTypeInfo = null;
|
let fileTypeInfo: FileTypeInfo = null;
|
||||||
let fileWithMetadata: FileWithMetadata = null;
|
let fileWithMetadata: FileWithMetadata = null;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { VISIBILITY_STATE } from 'constants/file';
|
import { VISIBILITY_STATE } from 'constants/file';
|
||||||
import { DataStream, MetadataObject } from 'types/upload';
|
import { DataStream, Metadata } from 'types/upload';
|
||||||
|
|
||||||
export interface fileAttribute {
|
export interface fileAttribute {
|
||||||
encryptedData?: DataStream | Uint8Array;
|
encryptedData?: DataStream | Uint8Array;
|
||||||
|
@ -42,7 +42,7 @@ export interface EnteFile {
|
||||||
ownerID: number;
|
ownerID: number;
|
||||||
file: fileAttribute;
|
file: fileAttribute;
|
||||||
thumbnail: fileAttribute;
|
thumbnail: fileAttribute;
|
||||||
metadata: MetadataObject;
|
metadata: Metadata;
|
||||||
magicMetadata: MagicMetadata;
|
magicMetadata: MagicMetadata;
|
||||||
pubMagicMetadata: PublicMagicMetadata;
|
pubMagicMetadata: PublicMagicMetadata;
|
||||||
encryptedKey: string;
|
encryptedKey: string;
|
||||||
|
|
|
@ -17,7 +17,7 @@ export interface EncryptionResult {
|
||||||
key: string;
|
key: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface MetadataObject {
|
export interface Metadata {
|
||||||
title: string;
|
title: string;
|
||||||
creationTime: number;
|
creationTime: number;
|
||||||
modificationTime: number;
|
modificationTime: number;
|
||||||
|
@ -90,7 +90,7 @@ export interface FileInMemory {
|
||||||
|
|
||||||
export interface FileWithMetadata
|
export interface FileWithMetadata
|
||||||
extends Omit<FileInMemory, 'hasStaticThumbnail'> {
|
extends Omit<FileInMemory, 'hasStaticThumbnail'> {
|
||||||
metadata: MetadataObject;
|
metadata: Metadata;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface EncryptedFile {
|
export interface EncryptedFile {
|
||||||
|
|
|
@ -4,7 +4,7 @@ import { CollectionIDPathMap, ExportRecord } from 'types/export';
|
||||||
|
|
||||||
import { EnteFile } from 'types/file';
|
import { EnteFile } from 'types/file';
|
||||||
|
|
||||||
import { MetadataObject } from 'types/upload';
|
import { Metadata } from 'types/upload';
|
||||||
import { formatDate, splitFilenameAndExtension } from 'utils/file';
|
import { formatDate, splitFilenameAndExtension } from 'utils/file';
|
||||||
import { METADATA_FOLDER_NAME } from 'constants/export';
|
import { METADATA_FOLDER_NAME } from 'constants/export';
|
||||||
|
|
||||||
|
@ -127,7 +127,7 @@ export const dedupe = (files: any[]) => {
|
||||||
|
|
||||||
export const getGoogleLikeMetadataFile = (
|
export const getGoogleLikeMetadataFile = (
|
||||||
fileSaveName: string,
|
fileSaveName: string,
|
||||||
metadata: MetadataObject
|
metadata: Metadata
|
||||||
) => {
|
) => {
|
||||||
const creationTime = Math.floor(metadata.creationTime / 1000000);
|
const creationTime = Math.floor(metadata.creationTime / 1000000);
|
||||||
const modificationTime = Math.floor(
|
const modificationTime = Math.floor(
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
import { FileWithCollection, MetadataObject } from 'types/upload';
|
import { FileWithCollection, Metadata } from 'types/upload';
|
||||||
import { EnteFile } from 'types/file';
|
import { EnteFile } from 'types/file';
|
||||||
|
|
||||||
const TYPE_JSON = 'json';
|
const TYPE_JSON = 'json';
|
||||||
|
|
||||||
export function fileAlreadyInCollection(
|
export function fileAlreadyInCollection(
|
||||||
existingFilesInCollection: EnteFile[],
|
existingFilesInCollection: EnteFile[],
|
||||||
newFileMetadata: MetadataObject
|
newFileMetadata: Metadata
|
||||||
): boolean {
|
): boolean {
|
||||||
for (const existingFile of existingFilesInCollection) {
|
for (const existingFile of existingFilesInCollection) {
|
||||||
if (areFilesSame(existingFile.metadata, newFileMetadata)) {
|
if (areFilesSame(existingFile.metadata, newFileMetadata)) {
|
||||||
|
@ -15,8 +15,8 @@ export function fileAlreadyInCollection(
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
export function areFilesSame(
|
export function areFilesSame(
|
||||||
existingFile: MetadataObject,
|
existingFile: Metadata,
|
||||||
newFile: MetadataObject
|
newFile: Metadata
|
||||||
): boolean {
|
): boolean {
|
||||||
if (
|
if (
|
||||||
existingFile.fileType === newFile.fileType &&
|
existingFile.fileType === newFile.fileType &&
|
||||||
|
|
Loading…
Reference in a new issue