helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-11-07 17:27:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "perf(web): optimize date groups" (#7638)

Browse source 
Revert "perf(web): optimize date groups (#7593)"

This reverts commit 762c4684f8.
This commit is contained in:
Michel Heusschen 2024-03-05 16:43:24 +01:00 • committed by GitHub
parent 967019d9e0
commit facd0bc3a4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 103 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

139
web/src/lib/stores/assets.store.ts
View file

@ -1,5 +1,4 @@
import { getKey } from '$lib/utils';
import { fromLocalDateTime, groupDateFormat } from '$lib/utils/timeline-util';
import { TimeBucketSize, getTimeBucket, getTimeBuckets, type AssetResponseDto } from '@immich/sdk';
import { throttle } from 'lodash-es';
import { DateTime } from 'luxon';
@ -27,60 +26,17 @@ interface AssetLookup {
assetIndex: number;
}
type BucketConstructor = {
height: number;
date: string;
count: number;
assets?: AssetResponseDto[];
position?: BucketPosition;
};
export class AssetBucket {
/**
* The DOM height of the bucket in pixel
* This value is first estimated by the number of asset and later is corrected as the user scroll
*/
height!: number;
date!: string;
count!: number;
bucketHeight!: number;
bucketDate!: string;
bucketCount!: number;
assets!: AssetResponseDto[];
cancelToken!: AbortController | null;
position!: BucketPosition;
dateGroups!: Map<string, AssetResponseDto[]>;
constructor({ height, date, count, assets = [], position = BucketPosition.Unknown }: BucketConstructor) {
this.height = height;
this.date = date;
this.count = count;
this.assets = assets;
this.position = position;
this.cancelToken = null;
this.dateGroups = new Map();
}
public addAssets(assets: AssetResponseDto[]) {
if (this.assets.length === 0) {
this.assets = assets;
} else {
this.assets.push(...assets);
}
this.updateDateGroups();
}
public updateDateGroups() {
if (this.assets.length === 0) {
return;
}
for (const asset of this.assets) {
const curLocale = fromLocalDateTime(asset.localDateTime).toLocaleString(groupDateFormat);
if (this.dateGroups.has(curLocale)) {
this.dateGroups.get(curLocale)?.push(asset);
} else {
this.dateGroups.set(curLocale, [asset]);
}
}
}
}
const isMismatched = (option: boolean | undefined, value: boolean): boolean =>
@ -209,25 +165,37 @@ export class AssetStore {
this.initialized = true;
let viewHeight = 0;
const loaders = [];
for (const { timeBucket, count } of buckets) {
const unwrappedWidth = (3 / 2) * count * THUMBNAIL_HEIGHT * (7 / 10);
this.buckets = buckets.map((bucket) => {
const unwrappedWidth = (3 / 2) * bucket.count * THUMBNAIL_HEIGHT * (7 / 10);
const rows = Math.ceil(unwrappedWidth / viewport.width);
const bucketHeight = rows * THUMBNAIL_HEIGHT;
const height = rows * THUMBNAIL_HEIGHT;
const bucket = new AssetBucket({ height: bucketHeight, date: timeBucket, count });
this.buckets.push(bucket);
if (viewHeight < viewport.height) {
viewHeight += bucket.height;
loaders.push(this.loadBucket(bucket.date, BucketPosition.Visible));
}
}
return {
bucketDate: bucket.timeBucket,
bucketHeight: height,
bucketCount: bucket.count,
assets: [],
cancelToken: null,
position: BucketPosition.Unknown,
};
});
this.timelineHeight = this.buckets.reduce((accumulator, b) => accumulator + b.height, 0);
this.timelineHeight = this.buckets.reduce((accumulator, b) => accumulator + b.bucketHeight, 0);
await Promise.all(loaders);
this.emit(false);
let height = 0;
const loaders = [];
for (const bucket of this.buckets) {
if (height < viewport.height) {
height += bucket.bucketHeight;
loaders.push(this.loadBucket(bucket.bucketDate, BucketPosition.Visible));
continue;
}
break;
}
await Promise.all(loaders);
}
async loadBucket(bucketDate: string, position: BucketPosition): Promise<void> {
@ -275,7 +243,8 @@ export class AssetStore {
return;
}
bucket.addAssets(assets);
bucket.assets = assets;
this.emit(true);
} catch (error) {
handleError(error, 'Failed to load assets');
@ -292,10 +261,10 @@ export class AssetStore {
return 0;
}
const delta = height - bucket.height;
const delta = height - bucket.bucketHeight;
const scrollTimeline = bucket.position == BucketPosition.Above;
bucket.height = height;
bucket.bucketHeight = height;
bucket.position = BucketPosition.Unknown;
this.timelineHeight += delta;
@ -328,17 +297,29 @@ export class AssetStore {
let bucket = this.getBucketByDate(timeBucket);
if (!bucket) {
bucket = new AssetBucket({ height: 0, date: timeBucket, count: 0 });
bucket = {
bucketDate: timeBucket,
bucketHeight: THUMBNAIL_HEIGHT,
bucketCount: 0,
assets: [],
cancelToken: null,
position: BucketPosition.Unknown,
};
this.buckets.push(bucket);
this.buckets = this.buckets.sort((a, b) => {
const aDate = DateTime.fromISO(a.date).toUTC();
const bDate = DateTime.fromISO(b.date).toUTC();
const aDate = DateTime.fromISO(a.bucketDate).toUTC();
const bDate = DateTime.fromISO(b.bucketDate).toUTC();
return bDate.diff(aDate).milliseconds;
});
}
bucket.addAssets([asset]);
bucket.assets.push(asset);
bucket.assets.sort((a, b) => {
const aDate = DateTime.fromISO(a.fileCreatedAt).toUTC();
const bDate = DateTime.fromISO(b.fileCreatedAt).toUTC();
return bDate.diff(aDate).milliseconds;
});
// If we added an asset to the store, we need to recalculate
// asset store containers
@ -347,7 +328,7 @@ export class AssetStore {
}
getBucketByDate(bucketDate: string): AssetBucket | null {
return this.buckets.find((bucket) => bucket.date === bucketDate) || null;
return this.buckets.find((bucket) => bucket.bucketDate === bucketDate) || null;
}
getBucketInfoForAssetId(assetId: string) {
@ -359,14 +340,16 @@ export class AssetStore {
}
async getRandomAsset(): Promise<AssetResponseDto | null> {
let index = Math.floor(Math.random() * this.buckets.reduce((accumulator, bucket) => accumulator + bucket.count, 0));
let index = Math.floor(
Math.random() * this.buckets.reduce((accumulator, bucket) => accumulator + bucket.bucketCount, 0),
);
for (const bucket of this.buckets) {
if (index < bucket.count) {
await this.loadBucket(bucket.date, BucketPosition.Unknown);
if (index < bucket.bucketCount) {
await this.loadBucket(bucket.bucketDate, BucketPosition.Unknown);
return bucket.assets[index] || null;
}
index -= bucket.count;
index -= bucket.bucketCount;
}
return null;
@ -403,8 +386,8 @@ export class AssetStore {
}
bucket.assets.splice(index_, 1);
bucket.count = bucket.assets.length;
if (bucket.count === 0) {
bucket.bucketCount = bucket.assets.length;
if (bucket.bucketCount === 0) {
this.buckets.splice(index, 1);
}
@ -432,7 +415,7 @@ export class AssetStore {
}
const previousBucket = this.buckets[bucketIndex - 1];
await this.loadBucket(previousBucket.date, BucketPosition.Unknown);
await this.loadBucket(previousBucket.bucketDate, BucketPosition.Unknown);
return previousBucket.assets.at(-1)?.id || null;
}
@ -453,7 +436,7 @@ export class AssetStore {
}
const nextBucket = this.buckets[bucketIndex + 1];
await this.loadBucket(nextBucket.date, BucketPosition.Unknown);
await this.loadBucket(nextBucket.bucketDate, BucketPosition.Unknown);
return nextBucket.assets[0]?.id || null;
}
@ -469,7 +452,7 @@ export class AssetStore {
for (let index = 0; index < this.buckets.length; index++) {
const bucket = this.buckets[index];
if (bucket.assets.length > 0) {
bucket.count = bucket.assets.length;
bucket.bucketCount = bucket.assets.length;
}
for (let index_ = 0; index_ < bucket.assets.length; index_++) {
const asset = bucket.assets[index_];