return current state instead of original state on errors

this should be a more graceful behaviour on errors
This commit is contained in:
Manav Rathi
2025-05-13 10:46:29 +05:30
parent 6a907d0f7d
commit 5a2ba82fff

View File

@@ -379,23 +379,23 @@ export async function syncTrash(
const updatedTrash = await updateTrash(
collectionMap,
trash,
lastSyncTime,
onUpdateTrashFiles,
onPruneDeletedFiles,
trash,
);
await cleanTrashCollections(updatedTrash);
}
const updateTrash = async (
collections: Map<number, Collection>,
currentTrash: Trash,
sinceTime: number,
onUpdateTrashFiles: (files: EnteFile[]) => void,
onPruneDeletedFiles: (files: EnteFile[]) => void,
currentTrash: Trash,
): Promise<Trash> => {
let updatedTrash: Trash = [...currentTrash];
try {
let updatedTrash: Trash = [...currentTrash];
let time = sinceTime;
let resp;
@@ -441,11 +441,10 @@ const updateTrash = async (
await localForage.setItem(TRASH, updatedTrash);
await localForage.setItem(TRASH_TIME, time);
} while (resp.data.hasMore);
return updatedTrash;
} catch (e) {
log.error("Get trash files failed", e);
}
return currentTrash;
return updatedTrash;
};
export const emptyTrash = async () => {