From eb5a0cb1dbb54608138ba83645a28916de9b8a96 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Fri, 20 Jun 2025 17:02:19 +0530 Subject: [PATCH] Prune --- web/packages/gallery/services/file.ts | 122 ------------------ web/packages/gallery/services/video.ts | 8 +- .../new/photos/services/collection.ts | 3 +- 3 files changed, 4 insertions(+), 129 deletions(-) delete mode 100644 web/packages/gallery/services/file.ts diff --git a/web/packages/gallery/services/file.ts b/web/packages/gallery/services/file.ts deleted file mode 100644 index c83c059cb9..0000000000 --- a/web/packages/gallery/services/file.ts +++ /dev/null @@ -1,122 +0,0 @@ -/* TODO: Audit this file */ -/* eslint-disable @typescript-eslint/ban-ts-comment */ - -import { encryptMetadataJSON } from "ente-base/crypto"; -import { apiURL } from "ente-base/origins"; -import { updateMagicMetadata } from "ente-gallery/services/magic-metadata"; -import type { - EncryptedMagicMetadata, - EnteFile, - FilePublicMagicMetadata, - FilePublicMagicMetadataProps, - FileWithUpdatedPublicMagicMetadata, -} from "ente-media/file"; -import { mergeMetadata } from "ente-media/file"; -import HTTPService from "ente-shared/network/HTTPService"; -import { getToken } from "ente-shared/storage/localStorage/helpers"; - -export interface UpdateMagicMetadataRequest { - id: number; - magicMetadata: EncryptedMagicMetadata; -} - -interface BulkUpdateMagicMetadataRequest { - metadataList: UpdateMagicMetadataRequest[]; -} - -export const updateFilePublicMagicMetadata = async ( - fileWithUpdatedPublicMagicMetadataList: FileWithUpdatedPublicMagicMetadata[], -): Promise => { - const token = getToken(); - if (!token) { - // @ts-ignore - return; - } - const reqBody: BulkUpdateMagicMetadataRequest = { metadataList: [] }; - for (const { - file, - updatedPublicMagicMetadata, - } of fileWithUpdatedPublicMagicMetadataList) { - const { encryptedData, decryptionHeader } = await encryptMetadataJSON( - updatedPublicMagicMetadata.data, - file.key, - ); - reqBody.metadataList.push({ - id: file.id, - magicMetadata: { - version: updatedPublicMagicMetadata.version, - count: updatedPublicMagicMetadata.count, - data: encryptedData, - header: decryptionHeader, - }, - }); - } - await HTTPService.put( - await apiURL("/files/public-magic-metadata"), - reqBody, - // @ts-ignore - null, - { "X-Auth-Token": token }, - ); - return fileWithUpdatedPublicMagicMetadataList.map( - ({ file, updatedPublicMagicMetadata }): EnteFile => ({ - ...file, - pubMagicMetadata: { - ...updatedPublicMagicMetadata, - version: updatedPublicMagicMetadata.version + 1, - }, - }), - ); -}; - -export async function changeFileName( - file: EnteFile, - editedName: string, -): Promise { - const updatedPublicMagicMetadataProps: FilePublicMagicMetadataProps = { - editedName, - }; - - const updatedPublicMagicMetadata: FilePublicMagicMetadata = - await updateMagicMetadata( - updatedPublicMagicMetadataProps, - file.pubMagicMetadata, - file.key, - ); - const updateResult = await updateFilePublicMagicMetadata([ - { file, updatedPublicMagicMetadata }, - ]); - // @ts-ignore - return updateResult[0]; -} - -export async function changeCaption( - file: EnteFile, - caption: string, -): Promise { - const updatedPublicMagicMetadataProps: FilePublicMagicMetadataProps = { - caption, - }; - - const updatedPublicMagicMetadata: FilePublicMagicMetadata = - await updateMagicMetadata( - updatedPublicMagicMetadataProps, - file.pubMagicMetadata, - file.key, - ); - const updateResult = await updateFilePublicMagicMetadata([ - { file, updatedPublicMagicMetadata }, - ]); - // @ts-ignore - return updateResult[0]; -} - -export function updateExistingFilePubMetadata( - existingFile: EnteFile, - updatedFile: EnteFile, -) { - // @ts-ignore - existingFile.pubMagicMetadata = updatedFile.pubMagicMetadata; - // @ts-ignore - existingFile.metadata = mergeMetadata([existingFile])[0].metadata; -} diff --git a/web/packages/gallery/services/video.ts b/web/packages/gallery/services/video.ts index 65ee371e9f..ebdfb362f2 100644 --- a/web/packages/gallery/services/video.ts +++ b/web/packages/gallery/services/video.ts @@ -10,11 +10,9 @@ import log from "ente-base/log"; import { apiURL } from "ente-base/origins"; import { ensureAuthToken } from "ente-base/token"; import { fileLogID, type EnteFile } from "ente-media/file"; -import { - filePublicMagicMetadata, - updateRemotePublicMagicMetadata, -} from "ente-media/file-metadata"; +import { filePublicMagicMetadata } from "ente-media/file-metadata"; import { FileType } from "ente-media/file-type"; +import { updateFilePublicMagicMetadata } from "ente-new/photos/services/file"; import { getAllLocalFiles, getLocalTrashFileIDs, @@ -1040,7 +1038,7 @@ const processQueueItem = async ({ if (!res) { log.info(`Generate HLS for ${fileLogID(file)} | not-required`); // See: [Note: Marking files which do not need video processing] - await updateRemotePublicMagicMetadata(file, { sv: 1 }); + await updateFilePublicMagicMetadata(file, { sv: 1 }); return; } diff --git a/web/packages/new/photos/services/collection.ts b/web/packages/new/photos/services/collection.ts index a78c78f4f0..b185f0d671 100644 --- a/web/packages/new/photos/services/collection.ts +++ b/web/packages/new/photos/services/collection.ts @@ -9,7 +9,6 @@ import { import { authenticatedRequestHeaders, ensureOk } from "ente-base/http"; import { apiURL } from "ente-base/origins"; import { ensureMasterKeyFromSession } from "ente-base/session"; -import type { UpdateMagicMetadataRequest } from "ente-gallery/services/file"; import { CollectionSubType, decryptRemoteCollection, @@ -32,7 +31,7 @@ import { } from "ente-media/magic-metadata"; import { batch } from "ente-utils/array"; import { z } from "zod/v4"; -import { requestBatchSize } from "./file"; +import { requestBatchSize, type UpdateMagicMetadataRequest } from "./file"; import { ensureUserKeyPair, getPublicKey } from "./user"; const uncategorizedCollectionName = "Uncategorized";