Remove reduntant interface & type (#1136)
This commit is contained in:
commit
c4f6c61265
|
@ -10,7 +10,7 @@ import { SetProgressTracker } from 'components/FixLargeThumbnail';
|
|||
import { getFileType } from 'services/typeDetectionService';
|
||||
import { getLocalTrashedFiles } from './trashService';
|
||||
import { UploadURL } from 'types/upload';
|
||||
import { FileAttributes } from 'types/file';
|
||||
import { S3FileAttributes } from 'types/file';
|
||||
import { USE_CF_PROXY } from 'constants/upload';
|
||||
import { Remote } from 'comlink';
|
||||
import { DedicatedCryptoWorker } from 'worker/crypto.worker';
|
||||
|
@ -107,7 +107,7 @@ export async function uploadThumbnail(
|
|||
fileKey: string,
|
||||
updatedThumbnail: Uint8Array,
|
||||
uploadURL: UploadURL
|
||||
): Promise<FileAttributes> {
|
||||
): Promise<S3FileAttributes> {
|
||||
const { file: encryptedThumbnail } = await worker.encryptThumbnail(
|
||||
updatedThumbnail,
|
||||
fileKey
|
||||
|
@ -134,7 +134,7 @@ export async function uploadThumbnail(
|
|||
|
||||
export async function updateThumbnail(
|
||||
fileID: number,
|
||||
newThumbnail: FileAttributes
|
||||
newThumbnail: S3FileAttributes
|
||||
) {
|
||||
try {
|
||||
const token = getToken();
|
||||
|
|
|
@ -5,21 +5,15 @@ import {
|
|||
} from 'types/magicMetadata';
|
||||
import { Metadata } from 'types/upload';
|
||||
|
||||
interface FileAttributesBase {
|
||||
export interface MetadataFileAttributes {
|
||||
encryptedData: string;
|
||||
decryptionHeader: string;
|
||||
}
|
||||
|
||||
interface MetadataFileAttributes extends FileAttributesBase {
|
||||
encryptedData: string;
|
||||
objectKey?: string;
|
||||
}
|
||||
interface S3FileAttributes extends FileAttributesBase {
|
||||
export interface S3FileAttributes {
|
||||
objectKey: string;
|
||||
encryptedData?: string;
|
||||
decryptionHeader: string;
|
||||
}
|
||||
|
||||
export type FileAttributes = MetadataFileAttributes | S3FileAttributes;
|
||||
|
||||
export interface FileInfo {
|
||||
fileSize: number;
|
||||
thumbSize: number;
|
||||
|
@ -29,9 +23,9 @@ export interface EncryptedEnteFile {
|
|||
id: number;
|
||||
collectionID: number;
|
||||
ownerID: number;
|
||||
file: FileAttributes;
|
||||
thumbnail: FileAttributes;
|
||||
metadata: FileAttributes;
|
||||
file: S3FileAttributes;
|
||||
thumbnail: S3FileAttributes;
|
||||
metadata: MetadataFileAttributes;
|
||||
info: FileInfo;
|
||||
magicMetadata: EncryptedMagicMetadata;
|
||||
pubMagicMetadata: EncryptedMagicMetadata;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { FILE_TYPE } from 'constants/file';
|
||||
import { Collection } from 'types/collection';
|
||||
import { B64EncryptionResult, LocalFileAttributes } from 'types/crypto';
|
||||
import { FileAttributes } from 'types/file';
|
||||
import { MetadataFileAttributes, S3FileAttributes } from 'types/file';
|
||||
import {
|
||||
EncryptedMagicMetadata,
|
||||
FilePublicMagicMetadata,
|
||||
|
@ -122,9 +122,9 @@ export interface ProcessedFile {
|
|||
localID: number;
|
||||
}
|
||||
export interface BackupedFile {
|
||||
file: FileAttributes;
|
||||
thumbnail: FileAttributes;
|
||||
metadata: FileAttributes;
|
||||
file: S3FileAttributes;
|
||||
thumbnail: S3FileAttributes;
|
||||
metadata: MetadataFileAttributes;
|
||||
pubMagicMetadata: EncryptedMagicMetadata;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue