fix file size
This commit is contained in:
parent
ddb37de58c
commit
36a2a71b44
|
@ -215,16 +215,17 @@ export function PhotoList({
|
||||||
|
|
||||||
const groupByFileSize = (timeStampList: TimeStampListItem[]) => {
|
const groupByFileSize = (timeStampList: TimeStampListItem[]) => {
|
||||||
let index = 0;
|
let index = 0;
|
||||||
|
|
||||||
while (index < filteredData.length) {
|
while (index < filteredData.length) {
|
||||||
const file = filteredData[index];
|
const file = filteredData[index];
|
||||||
const currentFileSize = file.file.size;
|
const currentFileSize = deduplicating.fileSizeMap.get(file.id);
|
||||||
const currentCreationTime = file.metadata.creationTime;
|
const currentCreationTime = file.metadata.creationTime;
|
||||||
let lastFileIndex = index;
|
let lastFileIndex = index;
|
||||||
|
|
||||||
while (lastFileIndex < filteredData.length) {
|
while (lastFileIndex < filteredData.length) {
|
||||||
if (
|
if (
|
||||||
filteredData[lastFileIndex].file.size !== currentFileSize ||
|
deduplicating.fileSizeMap.get(
|
||||||
|
filteredData[lastFileIndex].id
|
||||||
|
) !== currentFileSize ||
|
||||||
(deduplicating.clubByTime &&
|
(deduplicating.clubByTime &&
|
||||||
filteredData[lastFileIndex].metadata.creationTime !==
|
filteredData[lastFileIndex].metadata.creationTime !==
|
||||||
currentCreationTime)
|
currentCreationTime)
|
||||||
|
|
|
@ -49,6 +49,7 @@ export default function Deduplicate() {
|
||||||
const resync = useRef(false);
|
const resync = useRef(false);
|
||||||
const appContext = useContext(AppContext);
|
const appContext = useContext(AppContext);
|
||||||
const [clubByTime, setClubByTime] = useState(false);
|
const [clubByTime, setClubByTime] = useState(false);
|
||||||
|
const [fileSizeMap, setFileSizeMap] = useState(new Map<number, number>());
|
||||||
|
|
||||||
const [notificationAttributes, setNotificationAttributes] =
|
const [notificationAttributes, setNotificationAttributes] =
|
||||||
useState<NotificationAttributes>(null);
|
useState<NotificationAttributes>(null);
|
||||||
|
@ -105,6 +106,8 @@ export default function Deduplicate() {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const currFileSizeMap = new Map<number, number>();
|
||||||
|
|
||||||
let allDuplicateFiles: EnteFile[] = [];
|
let allDuplicateFiles: EnteFile[] = [];
|
||||||
let toSelectFileIDs: number[] = [];
|
let toSelectFileIDs: number[] = [];
|
||||||
let count = 0;
|
let count = 0;
|
||||||
|
@ -116,8 +119,13 @@ export default function Deduplicate() {
|
||||||
dupe.files.slice(1).map((f) => f.id)
|
dupe.files.slice(1).map((f) => f.id)
|
||||||
);
|
);
|
||||||
count += dupe.files.length - 1;
|
count += dupe.files.length - 1;
|
||||||
|
|
||||||
|
for (const file of dupe.files) {
|
||||||
|
currFileSizeMap.set(file.id, dupe.size);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
setDuplicateFiles(allDuplicateFiles);
|
setDuplicateFiles(allDuplicateFiles);
|
||||||
|
setFileSizeMap(currFileSizeMap);
|
||||||
|
|
||||||
const selectedFiles = {
|
const selectedFiles = {
|
||||||
count: count,
|
count: count,
|
||||||
|
@ -257,7 +265,10 @@ export default function Deduplicate() {
|
||||||
activeCollection={ALL_SECTION}
|
activeCollection={ALL_SECTION}
|
||||||
isSharedCollection={false}
|
isSharedCollection={false}
|
||||||
enableDownload={true}
|
enableDownload={true}
|
||||||
deduplicating={{ clubByTime: clubByTime }}
|
deduplicating={{
|
||||||
|
clubByTime: clubByTime,
|
||||||
|
fileSizeMap: fileSizeMap,
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
<b
|
<b
|
||||||
|
|
|
@ -5,7 +5,6 @@ export interface fileAttribute {
|
||||||
encryptedData?: DataStream | Uint8Array;
|
encryptedData?: DataStream | Uint8Array;
|
||||||
objectKey?: string;
|
objectKey?: string;
|
||||||
decryptionHeader: string;
|
decryptionHeader: string;
|
||||||
size?: number;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface MagicMetadataCore {
|
export interface MagicMetadataCore {
|
||||||
|
|
|
@ -44,4 +44,5 @@ export interface NotificationAttributes {
|
||||||
|
|
||||||
export interface DeduplicatingType {
|
export interface DeduplicatingType {
|
||||||
clubByTime: boolean;
|
clubByTime: boolean;
|
||||||
|
fileSizeMap: Map<number, number>;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue