fix file size

This commit is contained in:
Rushikesh Tote 2022-03-25 16:09:36 +05:30
parent ddb37de58c
commit 36a2a71b44
4 changed files with 17 additions and 5 deletions

View file

@ -215,16 +215,17 @@ export function PhotoList({
const groupByFileSize = (timeStampList: TimeStampListItem[]) => {
let index = 0;
while (index < filteredData.length) {
const file = filteredData[index];
const currentFileSize = file.file.size;
const currentFileSize = deduplicating.fileSizeMap.get(file.id);
const currentCreationTime = file.metadata.creationTime;
let lastFileIndex = index;
while (lastFileIndex < filteredData.length) {
if (
filteredData[lastFileIndex].file.size !== currentFileSize ||
deduplicating.fileSizeMap.get(
filteredData[lastFileIndex].id
) !== currentFileSize ||
(deduplicating.clubByTime &&
filteredData[lastFileIndex].metadata.creationTime !==
currentCreationTime)

View file

@ -49,6 +49,7 @@ export default function Deduplicate() {
const resync = useRef(false);
const appContext = useContext(AppContext);
const [clubByTime, setClubByTime] = useState(false);
const [fileSizeMap, setFileSizeMap] = useState(new Map<number, number>());
const [notificationAttributes, setNotificationAttributes] =
useState<NotificationAttributes>(null);
@ -105,6 +106,8 @@ export default function Deduplicate() {
);
}
const currFileSizeMap = new Map<number, number>();
let allDuplicateFiles: EnteFile[] = [];
let toSelectFileIDs: number[] = [];
let count = 0;
@ -116,8 +119,13 @@ export default function Deduplicate() {
dupe.files.slice(1).map((f) => f.id)
);
count += dupe.files.length - 1;
for (const file of dupe.files) {
currFileSizeMap.set(file.id, dupe.size);
}
}
setDuplicateFiles(allDuplicateFiles);
setFileSizeMap(currFileSizeMap);
const selectedFiles = {
count: count,
@ -257,7 +265,10 @@ export default function Deduplicate() {
activeCollection={ALL_SECTION}
isSharedCollection={false}
enableDownload={true}
deduplicating={{ clubByTime: clubByTime }}
deduplicating={{
clubByTime: clubByTime,
fileSizeMap: fileSizeMap,
}}
/>
) : (
<b

View file

@ -5,7 +5,6 @@ export interface fileAttribute {
encryptedData?: DataStream | Uint8Array;
objectKey?: string;
decryptionHeader: string;
size?: number;
}
export interface MagicMetadataCore {

View file

@ -44,4 +44,5 @@ export interface NotificationAttributes {
export interface DeduplicatingType {
clubByTime: boolean;
fileSizeMap: Map<number, number>;
}