beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

update needed API to use batch util

Browse source
This commit is contained in:
Abhinav 2023-03-06 14:55:43 +05:30
parent 3ba38ac71a
commit 882003ecce
2 changed files with 84 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/services/collectionService.ts
View file

@ -66,6 +66,8 @@ import {
} from 'utils/collection'; } from 'utils/collection';
import ComlinkCryptoWorker from 'utils/comlink/ComlinkCryptoWorker'; import ComlinkCryptoWorker from 'utils/comlink/ComlinkCryptoWorker';
import { getLocalFiles } from './fileService'; import { getLocalFiles } from './fileService';
import { REQUEST_BATCH_SIZE } from 'constants/api';
import { batch } from 'utils/common';
const ENDPOINT = getEndpoint(); const ENDPOINT = getEndpoint();
const COLLECTION_TABLE = 'collections'; const COLLECTION_TABLE = 'collections';
@ -405,8 +407,10 @@ export const addToCollection = async (
) => { ) => {
try { try {
const token = getToken(); const token = getToken();
const batchedFiles = batch(files, REQUEST_BATCH_SIZE);
for (const batch of batchedFiles) {
const fileKeysEncryptedWithNewCollection = const fileKeysEncryptedWithNewCollection =
await encryptWithNewCollectionKey(collection, files); await encryptWithNewCollectionKey(collection, batch);
const requestBody: AddToCollectionRequest = { const requestBody: AddToCollectionRequest = {
collectionID: collection.id, collectionID: collection.id,
@ -420,6 +424,7 @@ export const addToCollection = async (
'X-Auth-Token': token, 'X-Auth-Token': token,
} }
); );
}
} catch (e) { } catch (e) {
logError(e, 'Add to collection Failed '); logError(e, 'Add to collection Failed ');
throw e; throw e;
@ -432,8 +437,10 @@ export const restoreToCollection = async (
) => { ) => {
try { try {
const token = getToken(); const token = getToken();
const batchedFiles = batch(files, REQUEST_BATCH_SIZE);
for (const batch of batchedFiles) {
const fileKeysEncryptedWithNewCollection = const fileKeysEncryptedWithNewCollection =
await encryptWithNewCollectionKey(collection, files); await encryptWithNewCollectionKey(collection, batch);
const requestBody: AddToCollectionRequest = { const requestBody: AddToCollectionRequest = {
collectionID: collection.id, collectionID: collection.id,
@ -447,6 +454,7 @@ export const restoreToCollection = async (
'X-Auth-Token': token, 'X-Auth-Token': token,
} }
); );
}
} catch (e) { } catch (e) {
logError(e, 'restore to collection Failed '); logError(e, 'restore to collection Failed ');
throw e; throw e;
@ -459,8 +467,10 @@ export const moveToCollection = async (
) => { ) => {
try { try {
const token = getToken(); const token = getToken();
const batchedFiles = batch(files, REQUEST_BATCH_SIZE);
for (const batch of batchedFiles) {
const fileKeysEncryptedWithNewCollection = const fileKeysEncryptedWithNewCollection =
await encryptWithNewCollectionKey(toCollection, files); await encryptWithNewCollectionKey(toCollection, batch);
const requestBody: MoveToCollectionRequest = { const requestBody: MoveToCollectionRequest = {
fromCollectionID: fromCollectionID, fromCollectionID: fromCollectionID,
@ -475,6 +485,7 @@ export const moveToCollection = async (
'X-Auth-Token': token, 'X-Auth-Token': token,
} }
); );
}
} catch (e) { } catch (e) {
logError(e, 'move to collection Failed '); logError(e, 'move to collection Failed ');
throw e; throw e;
@ -605,10 +616,11 @@ export const removeNonUserFiles = async (
try { try {
const fileIDs = nonUserFiles.map((f) => f.id); const fileIDs = nonUserFiles.map((f) => f.id);
const token = getToken(); const token = getToken();
const batchedFileIDs = batch(fileIDs, REQUEST_BATCH_SIZE);
for (const batch of batchedFileIDs) {
const request: RemoveFromCollectionRequest = { const request: RemoveFromCollectionRequest = {
collectionID, collectionID,
fileIDs, fileIDs: batch,
}; };
await HTTPService.post( await HTTPService.post(
@ -617,6 +629,7 @@ export const removeNonUserFiles = async (
null, null,
{ 'X-Auth-Token': token } { 'X-Auth-Token': token }
); );
}
} catch (e) { } catch (e) {
logError(e, 'remove non user files failed '); logError(e, 'remove non user files failed ');
throw e; throw e;

63
src/services/fileService.ts
View file

@ -12,9 +12,8 @@ import {
sortFiles, sortFiles,
} from 'utils/file'; } from 'utils/file';
import { eventBus, Events } from './events'; import { eventBus, Events } from './events';
import { EnteFile, EncryptedEnteFile, TrashRequest } from 'types/file'; import { EnteFile, EncryptedEnteFile } from 'types/file';
import { SetFiles } from 'types/gallery'; import { SetFiles } from 'types/gallery';
import { MAX_TRASH_BATCH_SIZE } from 'constants/file';
import { BulkUpdateMagicMetadataRequest } from 'types/magicMetadata'; import { BulkUpdateMagicMetadataRequest } from 'types/magicMetadata';
import { addLogLine } from 'utils/logging'; import { addLogLine } from 'utils/logging';
import { isCollectionHidden } from 'utils/collection'; import { isCollectionHidden } from 'utils/collection';
@ -24,6 +23,8 @@ import {
getCollectionLastSyncTime, getCollectionLastSyncTime,
setCollectionLastSyncTime, setCollectionLastSyncTime,
} from './collectionService'; } from './collectionService';
import { REQUEST_BATCH_SIZE } from 'constants/api';
import { batch } from 'utils/common';
const ENDPOINT = getEndpoint(); const ENDPOINT = getEndpoint();
const FILES_TABLE = 'files'; const FILES_TABLE = 'files';
@ -161,24 +162,11 @@ export const trashFiles = async (filesToTrash: EnteFile[]) => {
if (!token) { if (!token) {
return; return;
} }
const batchedFilesToTrash = batch(filesToTrash, REQUEST_BATCH_SIZE);
const trashBatch: TrashRequest = { for (const batch of batchedFilesToTrash) {
items: [], await HTTPService.post(`${ENDPOINT}/files/trash`, batch, null, {
}; 'X-Auth-Token': token,
for (const file of filesToTrash) {
trashBatch.items.push({
collectionID: file.collectionID,
fileID: file.id,
}); });
if (trashBatch.items.length >= MAX_TRASH_BATCH_SIZE) {
await trashFilesFromServer(trashBatch, token);
trashBatch.items = [];
}
}
if (trashBatch.items.length > 0) {
await trashFilesFromServer(trashBatch, token);
} }
} catch (e) { } catch (e) {
logError(e, 'trash file failed'); logError(e, 'trash file failed');
@ -192,35 +180,19 @@ export const deleteFromTrash = async (filesToDelete: number[]) => {
if (!token) { if (!token) {
return; return;
} }
let deleteBatch: number[] = []; const batchedFilesToDelete = batch(filesToDelete, REQUEST_BATCH_SIZE);
for (const fileID of filesToDelete) { for (const batch of batchedFilesToDelete) {
deleteBatch.push(fileID);
if (deleteBatch.length >= MAX_TRASH_BATCH_SIZE) {
await deleteBatchFromTrash(token, deleteBatch);
deleteBatch = [];
}
}
if (deleteBatch.length > 0) {
await deleteBatchFromTrash(token, deleteBatch);
}
} catch (e) {
logError(e, 'deleteFromTrash failed');
throw e;
}
};
const deleteBatchFromTrash = async (token: string, deleteBatch: number[]) => {
try {
await HTTPService.post( await HTTPService.post(
`${ENDPOINT}/trash/delete`, `${ENDPOINT}/trash/delete`,
{ fileIDs: deleteBatch }, { fileIDs: batch },
null, null,
{ {
'X-Auth-Token': token, 'X-Auth-Token': token,
} }
); );
}
} catch (e) { } catch (e) {
logError(e, 'deleteBatchFromTrash failed'); logError(e, 'deleteFromTrash failed');
throw e; throw e;
} }
}; };
@ -303,14 +275,3 @@ export const updateFilePublicMagicMetadata = async (files: EnteFile[]) => {
}) })
); );
}; };
async function trashFilesFromServer(trashBatch: TrashRequest, token: any) {
try {
await HTTPService.post(`${ENDPOINT}/files/trash`, trashBatch, null, {
'X-Auth-Token': token,
});
} catch (e) {
logError(e, 'trash files from server failed');
throw e;
}
}