Prune

web/apps/cast/src/constants/collection.ts

@@ -1,24 +0,0 @@
-export enum CollectionType {
-    folder = "folder",
-    favorites = "favorites",
-    album = "album",
-    uncategorized = "uncategorized",
-}
-
-export enum CollectionSummaryType {
-    folder = "folder",
-    favorites = "favorites",
-    album = "album",
-    archive = "archive",
-    trash = "trash",
-    uncategorized = "uncategorized",
-    all = "all",
-    outgoingShare = "outgoingShare",
-    incomingShareViewer = "incomingShareViewer",
-    incomingShareCollaborator = "incomingShareCollaborator",
-    sharedOnlyViaLink = "sharedOnlyViaLink",
-    archived = "archived",
-    defaultHidden = "defaultHidden",
-    hiddenItems = "hiddenItems",
-    pinned = "pinned",
-}

web/apps/cast/src/types/collection/index.ts → web/apps/cast/src/types/collection.ts

@@ -1,4 +1,3 @@
-import { CollectionSummaryType, CollectionType } from "constants/collection";
 import { EnteFile } from "types/file";
 import {
     EncryptedMagicMetadata,
@@ -20,6 +19,13 @@ export interface CollectionUser {
     role: COLLECTION_ROLE;
 }
 
+enum CollectionType {
+    folder = "folder",
+    favorites = "favorites",
+    album = "album",
+    uncategorized = "uncategorized",
+}
+
 export interface EncryptedCollection {
     id: number;
     owner: CollectionUser;
@@ -32,7 +38,7 @@ export interface EncryptedCollection {
     type: CollectionType;
     attributes: collectionAttributes;
     sharees: CollectionUser[];
-    publicURLs?: PublicURL[];
+    publicURLs?: unknown;
     updationTime: number;
     isDeleted: boolean;
     magicMetadata: EncryptedMagicMetadata;
@@ -61,54 +67,6 @@ export interface Collection
 // define a method on Collection interface to return the sync key as collection.id-time
 // this is used to store the last sync time of a collection in local storage
 
-export interface PublicURL {
-    url: string;
-    deviceLimit: number;
-    validTill: number;
-    enableDownload: boolean;
-    enableCollect: boolean;
-    passwordEnabled: boolean;
-    nonce?: string;
-    opsLimit?: number;
-    memLimit?: number;
-}
-
-export interface UpdatePublicURL {
-    collectionID: number;
-    disablePassword?: boolean;
-    enableDownload?: boolean;
-    enableCollect?: boolean;
-    validTill?: number;
-    deviceLimit?: number;
-    passHash?: string;
-    nonce?: string;
-    opsLimit?: number;
-    memLimit?: number;
-}
-
-export interface CreatePublicAccessTokenRequest {
-    collectionID: number;
-    validTill?: number;
-    deviceLimit?: number;
-}
-
-export interface EncryptedFileKey {
-    id: number;
-    encryptedKey: string;
-    keyDecryptionNonce: string;
-}
-
-export interface AddToCollectionRequest {
-    collectionID: number;
-    files: EncryptedFileKey[];
-}
-
-export interface MoveToCollectionRequest {
-    fromCollectionID: number;
-    toCollectionID: number;
-    files: EncryptedFileKey[];
-}
-
 export interface collectionAttributes {
     encryptedPath?: string;
     pathDecryptionNonce?: string;
@@ -116,11 +74,6 @@ export interface collectionAttributes {
 
 export type CollectionToFileMap = Map<number, EnteFile>;
 
-export interface RemoveFromCollectionRequest {
-    collectionID: number;
-    fileIDs: number[];
-}
-
 export interface CollectionMagicMetadataProps {
     visibility?: VISIBILITY_STATE;
     subType?: SUB_TYPE;
@@ -144,16 +97,4 @@ export interface CollectionPublicMagicMetadataProps {
 export type CollectionPublicMagicMetadata =
     MagicMetadataCore<CollectionPublicMagicMetadataProps>;
 
-export interface CollectionSummary {
-    id: number;
-    name: string;
-    type: CollectionSummaryType;
-    coverFile: EnteFile;
-    latestFile: EnteFile;
-    fileCount: number;
-    updationTime: number;
-    order?: number;
-}
-
-export type CollectionSummaries = Map<number, CollectionSummary>;
 export type CollectionFilesCount = Map<number, number>;

web/apps/cast/src/types/file/index.ts

@@ -64,25 +64,6 @@ export interface EnteFile
     isConverted?: boolean;
 }
 
-export interface TrashRequest {
-    items: TrashRequestItems[];
-}
-
-export interface TrashRequestItems {
-    fileID: number;
-    collectionID: number;
-}
-
-export interface FileWithUpdatedMagicMetadata {
-    file: EnteFile;
-    updatedMagicMetadata: FileMagicMetadata;
-}
-
-export interface FileWithUpdatedPublicMagicMetadata {
-    file: EnteFile;
-    updatedPublicMagicMetadata: FilePublicMagicMetadata;
-}
-
 export interface FileMagicMetadataProps {
     visibility?: VISIBILITY_STATE;
     filePaths?: string[];

web/apps/cast/src/types/upload.ts

@@ -0,0 +1,25 @@
+import { FILE_TYPE } from "constants/file";
+
+export interface Metadata {
+    title: string;
+    creationTime: number;
+    modificationTime: number;
+    latitude: number;
+    longitude: number;
+    fileType: FILE_TYPE;
+    hasStaticThumbnail?: boolean;
+    hash?: string;
+    imageHash?: string;
+    videoHash?: string;
+    localID?: number;
+    version?: number;
+    deviceFolder?: string;
+}
+
+export interface FileTypeInfo {
+    fileType: FILE_TYPE;
+    exactType: string;
+    mimeType?: string;
+    imageType?: string;
+    videoType?: string;
+}

web/apps/cast/src/types/upload/index.ts

@@ -1,107 +0,0 @@
-import {
-    B64EncryptionResult,
-    LocalFileAttributes,
-} from "@ente/shared/crypto/types";
-import { FILE_TYPE } from "constants/file";
-import {
-    FilePublicMagicMetadata,
-    FilePublicMagicMetadataProps,
-    MetadataFileAttributes,
-    S3FileAttributes,
-} from "types/file";
-import { EncryptedMagicMetadata } from "types/magicMetadata";
-
-export interface DataStream {
-    stream: ReadableStream<Uint8Array>;
-    chunkCount: number;
-}
-
-export function isDataStream(object: any): object is DataStream {
-    return "stream" in object;
-}
-
-export type Logger = (message: string) => void;
-
-export interface Metadata {
-    title: string;
-    creationTime: number;
-    modificationTime: number;
-    latitude: number;
-    longitude: number;
-    fileType: FILE_TYPE;
-    hasStaticThumbnail?: boolean;
-    hash?: string;
-    imageHash?: string;
-    videoHash?: string;
-    localID?: number;
-    version?: number;
-    deviceFolder?: string;
-}
-
-export interface FileTypeInfo {
-    fileType: FILE_TYPE;
-    exactType: string;
-    mimeType?: string;
-    imageType?: string;
-    videoType?: string;
-}
-
-export interface UploadURL {
-    url: string;
-    objectKey: string;
-}
-
-export interface FileInMemory {
-    filedata: Uint8Array | DataStream;
-    thumbnail: Uint8Array;
-    hasStaticThumbnail: boolean;
-}
-
-export interface FileWithMetadata
-    extends Omit<FileInMemory, "hasStaticThumbnail"> {
-    metadata: Metadata;
-    localID: number;
-    pubMagicMetadata: FilePublicMagicMetadata;
-}
-
-export interface EncryptedFile {
-    file: ProcessedFile;
-    fileKey: B64EncryptionResult;
-}
-export interface ProcessedFile {
-    file: LocalFileAttributes<Uint8Array | DataStream>;
-    thumbnail: LocalFileAttributes<Uint8Array>;
-    metadata: LocalFileAttributes<string>;
-    pubMagicMetadata: EncryptedMagicMetadata;
-    localID: number;
-}
-export interface BackupedFile {
-    file: S3FileAttributes;
-    thumbnail: S3FileAttributes;
-    metadata: MetadataFileAttributes;
-    pubMagicMetadata: EncryptedMagicMetadata;
-}
-
-export interface UploadFile extends BackupedFile {
-    collectionID: number;
-    encryptedKey: string;
-    keyDecryptionNonce: string;
-}
-
-export interface ParsedExtractedMetadata {
-    location: Location;
-    creationTime: number;
-    width: number;
-    height: number;
-}
-
-export interface PublicUploadProps {
-    token: string;
-    passwordToken: string;
-    accessedThroughSharedURL: boolean;
-}
-
-export interface ExtractMetadataResult {
-    metadata: Metadata;
-    publicMagicMetadata: FilePublicMagicMetadataProps;
-}

web/apps/photos/src/services/upload/uploadService.ts

@@ -918,19 +918,14 @@ interface PartEtag {
     ETag: string;
 }
 
-function calculatePartCount(chunkCount: number) {
-    const partCount = Math.ceil(
-        chunkCount / FILE_CHUNKS_COMBINED_FOR_A_UPLOAD_PART,
-    );
-    return partCount;
-}
-
 export async function uploadStreamUsingMultipart(
     logger: Logger,
     fileLocalID: number,
     dataStream: DataStream,
 ) {
-    const uploadPartCount = calculatePartCount(dataStream.chunkCount);
+    const uploadPartCount = Math.ceil(
+        dataStream.chunkCount / FILE_CHUNKS_COMBINED_FOR_A_UPLOAD_PART,
+    );
     logger(`fetching ${uploadPartCount} urls for multipart upload`);
     const multipartUploadURLs =
         await uploadService.fetchMultipartUploadURLs(uploadPartCount);