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

merge metadatas before sorting

Browse source
This commit is contained in:
Abhinav 2021-10-30 20:35:13 +05:30
parent dc794090a6
commit ebccb6a981
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/services/fileService.ts
View file

@ -10,7 +10,7 @@ import {
import { Collection } from './collectionService';
import HTTPService from './HTTPService';
import { logError } from 'utils/sentry';
import { decryptFile, sortFiles } from 'utils/file';
import { decryptFile, mergeMetadata, sortFiles } from 'utils/file';
import CryptoWorker from 'utils/crypto';
const ENDPOINT = getEndpoint();
@ -164,12 +164,12 @@ export const syncFiles = async (
}
files.push(file);
}
files = sortFiles(files);
await localForage.setItem('files', files);
await localForage.setItem(
`${collection.id}-time`,
collection.updationTime
);
files = sortFiles(mergeMetadata(files));
setFiles(
files.map((item) => ({
...item,
@ -234,8 +234,10 @@ export const getFiles = async (
}
setFiles(
sortFiles(
[...(files || []), ...decryptedFiles].filter(
(item) => !item.isDeleted
mergeMetadata(
[...(files || []), ...decryptedFiles].filter(
(item) => !item.isDeleted
)
)
)
);

9
src/utils/file/index.ts
View file

@ -140,13 +140,8 @@ export function sortFiles(files: File[]) {
files = files
.map((file, index) => ({ index, file }))
.sort((a, b) => {
const fileACreationTime =
a.file.pubMagicMetadata?.data.editedTime ??
a.file.metadata.creationTime;
const fileBCreationTime =
b.file.pubMagicMetadata?.data.editedTime ??
a.file.metadata.creationTime;
let diff = fileBCreationTime - fileACreationTime;
let diff =
b.file.metadata.creationTime - a.file.metadata.creationTime;
if (diff === 0) {
diff = a.index - b.index;
}