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

corrected to have only unique instances of collection in localDB

Browse source
This commit is contained in:
Abhinav-grd 2021-02-03 13:32:54 +05:30
parent e524e0bc46
commit 0c23e63bec
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/services/collectionService.ts
View file

@ -97,7 +97,7 @@ const getCollections = async (
return await Promise.all(promises); return await Promise.all(promises);
} }
catch (e) { catch (e) {
console.log("getCollections falied- " + e); console.log("getCollections failed- " + e);
} }
}; };
@ -107,13 +107,24 @@ export const getLocalCollections = async (): Promise<collection[]> => {
} }
export const fetchUpdatedCollections = async (token: string, key: string) => { export const fetchUpdatedCollections = async (token: string, key: string) => {
const collectionUpdateTime = await localForage.getItem('collection-update-time') as string; const collectionUpdateTime = await localForage.getItem('collection-update-time') as string;
const updatedCollections = await getCollections(token, collectionUpdateTime ?? '0', key); const updatedCollections = await getCollections(token, collectionUpdateTime ?? '0', key) || [];
const favCollection = await localForage.getItem('fav-collection') as collection[] ?? updatedCollections.filter(collection => collection.type === CollectionType.favorites); const favCollection = await localForage.getItem('fav-collection') as collection[] ?? updatedCollections.filter(collection => collection.type === CollectionType.favorites);
const localCollections = await getLocalCollections(); const localCollections = await getLocalCollections();
const allCollectionsInstances = [...localCollections, ...updatedCollections];
var latestCollectionsInstances = new Map<string, collection>();
allCollectionsInstances.forEach((collection) => {
if (!latestCollectionsInstances.has(collection.id) || latestCollectionsInstances.get(collection.id).updationTime < collection.updationTime) {
latestCollectionsInstances.set(collection.id, collection);
}
});
let collections = [], updationTime = 0;
for (const [_, collection] of latestCollectionsInstances) {
collections.push(collection);
updationTime = Math.max(updationTime, collection.updationTime);
}
await localForage.setItem('fav-collection', favCollection); await localForage.setItem('fav-collection', favCollection);
await localForage.setItem('collection-update-time', Date.now() * 1000); await localForage.setItem('collection-update-time', updationTime);
await localForage.setItem('collections', [...localCollections, ...updatedCollections]); await localForage.setItem('collections', collections);
return updatedCollections; return updatedCollections;
}; };

2
src/services/fileService.ts
View file

@ -87,7 +87,7 @@ export const fetchFiles = async (
} }
}); });
files = []; files = [];
for (const [_, file] of latestFiles.entries()) { for (const [_, file] of latestFiles) {
if (!file.isDeleted) if (!file.isDeleted)
files.push(file); files.push(file);
} }