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

use public metadata creation time for sorting

Browse source
This commit is contained in:
Abhinav 2021-10-29 17:39:57 +05:30
parent 69c9f423fe
commit 8fb7146236
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/services/fileService.ts
View file

@ -233,12 +233,11 @@ export const getFiles = async (
time = resp.data.diff.slice(-1)[0].updationTime;
}
setFiles(
[...(files || []), ...decryptedFiles]
.filter((item) => !item.isDeleted)
.sort(
(a, b) =>
b.metadata.creationTime - a.metadata.creationTime
sortFiles(
[...(files || []), ...decryptedFiles].filter(
(item) => !item.isDeleted
)
)
);
} while (resp.data.diff.length === limit);
return decryptedFiles;

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

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