mirror of
https://github.com/immich-app/immich.git
synced 2024-12-19 00:32:49 +02:00
7a1ae8691e
* Improve scroll performance by introducing repaint boundaries and moving more calculations to providers. * Add error handing for malformed dates. * Remove unused method * Use compute in different places to improve app performance during heavy tasks * Fix test * Refactor `List<RenderAssetGridElement>` to separate `RenderList` class and make `fromAssetGroups` a static method of this class. * Fix loading indicator bug * Use provider directly * `RenderList` refactoring * `AssetNotifier` refactoring * Move `combine` to static private method * Extract compute methods in cache services to static private methods. * Use `tryParse` instead of `parse` with try/catch for dates. * Fix bug in caching mechanism. * Fixed state not being used to trigger conditional rendering * styling * Corrected state Co-authored-by: Alex Tran <alex.tran1502@gmail.com>
289 lines
9.2 KiB
Dart
289 lines
9.2 KiB
Dart
import 'dart:collection';
|
|
|
|
import 'package:flutter/foundation.dart';
|
|
import 'package:hive/hive.dart';
|
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
|
import 'package:immich_mobile/constants/hive_box.dart';
|
|
import 'package:immich_mobile/modules/home/services/asset.service.dart';
|
|
import 'package:immich_mobile/modules/home/services/asset_cache.service.dart';
|
|
import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart';
|
|
import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
|
|
import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
|
|
import 'package:immich_mobile/shared/models/asset.dart';
|
|
import 'package:immich_mobile/shared/services/device_info.service.dart';
|
|
import 'package:collection/collection.dart';
|
|
import 'package:immich_mobile/utils/tuple.dart';
|
|
import 'package:intl/intl.dart';
|
|
import 'package:logging/logging.dart';
|
|
import 'package:openapi/api.dart';
|
|
import 'package:photo_manager/photo_manager.dart';
|
|
|
|
class AssetsState {
|
|
final List<Asset> allAssets;
|
|
final RenderList? renderList;
|
|
|
|
AssetsState(this.allAssets, {this.renderList});
|
|
|
|
Future<AssetsState> withRenderDataStructure(int groupSize) async {
|
|
return AssetsState(
|
|
allAssets,
|
|
renderList:
|
|
await RenderList.fromAssetGroups(await _groupByDate(), groupSize),
|
|
);
|
|
}
|
|
|
|
AssetsState withAdditionalAssets(List<Asset> toAdd) {
|
|
return AssetsState([...allAssets, ...toAdd]);
|
|
}
|
|
|
|
_groupByDate() async {
|
|
sortCompare(List<Asset> assets) {
|
|
assets.sortByCompare<DateTime>(
|
|
(e) => e.createdAt,
|
|
(a, b) => b.compareTo(a),
|
|
);
|
|
return assets.groupListsBy(
|
|
(element) => DateFormat('y-MM-dd').format(element.createdAt.toLocal()),
|
|
);
|
|
}
|
|
|
|
return await compute(sortCompare, allAssets.toList());
|
|
}
|
|
|
|
static fromAssetList(List<Asset> assets) {
|
|
return AssetsState(assets);
|
|
}
|
|
|
|
static empty() {
|
|
return AssetsState([]);
|
|
}
|
|
}
|
|
|
|
class _CombineAssetsComputeParameters {
|
|
final Iterable<Asset> local;
|
|
final Iterable<Asset> remote;
|
|
final String deviceId;
|
|
|
|
_CombineAssetsComputeParameters(this.local, this.remote, this.deviceId);
|
|
}
|
|
|
|
class AssetNotifier extends StateNotifier<AssetsState> {
|
|
final AssetService _assetService;
|
|
final AssetCacheService _assetCacheService;
|
|
final AppSettingsService _settingsService;
|
|
final log = Logger('AssetNotifier');
|
|
final DeviceInfoService _deviceInfoService = DeviceInfoService();
|
|
bool _getAllAssetInProgress = false;
|
|
bool _deleteInProgress = false;
|
|
|
|
AssetNotifier(
|
|
this._assetService,
|
|
this._assetCacheService,
|
|
this._settingsService,
|
|
) : super(AssetsState.fromAssetList([]));
|
|
|
|
_updateAssetsState(List<Asset> newAssetList, {bool cache = true}) async {
|
|
if (cache) {
|
|
_assetCacheService.put(newAssetList);
|
|
}
|
|
|
|
state =
|
|
await AssetsState.fromAssetList(newAssetList).withRenderDataStructure(
|
|
_settingsService.getSetting(AppSettingsEnum.tilesPerRow),
|
|
);
|
|
}
|
|
|
|
getAllAsset() async {
|
|
if (_getAllAssetInProgress || _deleteInProgress) {
|
|
// guard against multiple calls to this method while it's still working
|
|
return;
|
|
}
|
|
final stopwatch = Stopwatch();
|
|
try {
|
|
_getAllAssetInProgress = true;
|
|
final bool isCacheValid = await _assetCacheService.isValid();
|
|
stopwatch.start();
|
|
final Box box = Hive.box(userInfoBox);
|
|
final localTask = _assetService.getLocalAssets(urgent: !isCacheValid);
|
|
final remoteTask = _assetService.getRemoteAssets(
|
|
etag: isCacheValid ? box.get(assetEtagKey) : null,
|
|
);
|
|
if (isCacheValid && state.allAssets.isEmpty) {
|
|
await _updateAssetsState(await _assetCacheService.get(), cache: false);
|
|
log.info(
|
|
"Reading assets ${state.allAssets.length} from cache: ${stopwatch.elapsedMilliseconds}ms",
|
|
);
|
|
stopwatch.reset();
|
|
}
|
|
|
|
int remoteBegin = state.allAssets.indexWhere((a) => a.isRemote);
|
|
remoteBegin = remoteBegin == -1 ? state.allAssets.length : remoteBegin;
|
|
|
|
final List<Asset> currentLocal = state.allAssets.slice(0, remoteBegin);
|
|
|
|
final Pair<List<Asset>?, String?> remoteResult = await remoteTask;
|
|
List<Asset>? newRemote = remoteResult.first;
|
|
List<Asset>? newLocal = await localTask;
|
|
log.info("Load assets: ${stopwatch.elapsedMilliseconds}ms");
|
|
stopwatch.reset();
|
|
if (newRemote == null &&
|
|
(newLocal == null || currentLocal.equals(newLocal))) {
|
|
log.info("state is already up-to-date");
|
|
return;
|
|
}
|
|
newRemote ??= state.allAssets.slice(remoteBegin);
|
|
newLocal ??= [];
|
|
|
|
final combinedAssets = await _combineLocalAndRemoteAssets(
|
|
local: newLocal,
|
|
remote: newRemote,
|
|
);
|
|
await _updateAssetsState(combinedAssets);
|
|
|
|
log.info("Combining assets: ${stopwatch.elapsedMilliseconds}ms");
|
|
|
|
box.put(assetEtagKey, remoteResult.second);
|
|
} finally {
|
|
_getAllAssetInProgress = false;
|
|
}
|
|
}
|
|
|
|
static Future<List<Asset>> _computeCombine(
|
|
_CombineAssetsComputeParameters data,
|
|
) async {
|
|
var local = data.local;
|
|
var remote = data.remote;
|
|
final deviceId = data.deviceId;
|
|
|
|
final List<Asset> assets = [];
|
|
if (remote.isNotEmpty && local.isNotEmpty) {
|
|
final Set<String> existingIds = remote
|
|
.where((e) => e.deviceId == deviceId)
|
|
.map((e) => e.deviceAssetId)
|
|
.toSet();
|
|
local = local.where((e) => !existingIds.contains(e.id));
|
|
}
|
|
assets.addAll(local);
|
|
// the order (first all local, then remote assets) is important!
|
|
assets.addAll(remote);
|
|
return assets;
|
|
}
|
|
|
|
Future<List<Asset>> _combineLocalAndRemoteAssets({
|
|
required Iterable<Asset> local,
|
|
required List<Asset> remote,
|
|
}) async {
|
|
final String deviceId = Hive.box(userInfoBox).get(deviceIdKey);
|
|
return await compute(
|
|
_computeCombine,
|
|
_CombineAssetsComputeParameters(local, remote, deviceId),
|
|
);
|
|
}
|
|
|
|
clearAllAsset() {
|
|
_updateAssetsState([]);
|
|
}
|
|
|
|
onNewAssetUploaded(AssetResponseDto newAsset) {
|
|
final int i = state.allAssets.indexWhere(
|
|
(a) =>
|
|
a.isRemote ||
|
|
(a.id == newAsset.deviceAssetId && a.deviceId == newAsset.deviceId),
|
|
);
|
|
|
|
if (i == -1 || state.allAssets[i].deviceAssetId != newAsset.deviceAssetId) {
|
|
_updateAssetsState([...state.allAssets, Asset.remote(newAsset)]);
|
|
} else {
|
|
// order is important to keep all local-only assets at the beginning!
|
|
_updateAssetsState([
|
|
...state.allAssets.slice(0, i),
|
|
...state.allAssets.slice(i + 1),
|
|
Asset.remote(newAsset),
|
|
]);
|
|
// TODO here is a place to unify local/remote assets by replacing the
|
|
// local-only asset in the state with a local&remote asset
|
|
}
|
|
}
|
|
|
|
deleteAssets(Set<Asset> deleteAssets) async {
|
|
_deleteInProgress = true;
|
|
try {
|
|
final localDeleted = await _deleteLocalAssets(deleteAssets);
|
|
final remoteDeleted = await _deleteRemoteAssets(deleteAssets);
|
|
final Set<String> deleted = HashSet();
|
|
deleted.addAll(localDeleted);
|
|
deleted.addAll(remoteDeleted);
|
|
if (deleted.isNotEmpty) {
|
|
_updateAssetsState(
|
|
state.allAssets.where((a) => !deleted.contains(a.id)).toList(),
|
|
);
|
|
}
|
|
} finally {
|
|
_deleteInProgress = false;
|
|
}
|
|
}
|
|
|
|
Future<List<String>> _deleteLocalAssets(Set<Asset> assetsToDelete) async {
|
|
var deviceInfo = await _deviceInfoService.getDeviceInfo();
|
|
var deviceId = deviceInfo["deviceId"];
|
|
final List<String> local = [];
|
|
// Delete asset from device
|
|
for (final Asset asset in assetsToDelete) {
|
|
if (asset.isLocal) {
|
|
local.add(asset.id);
|
|
} else if (asset.deviceId == deviceId) {
|
|
// Delete asset on device if it is still present
|
|
var localAsset = await AssetEntity.fromId(asset.deviceAssetId);
|
|
if (localAsset != null) {
|
|
local.add(localAsset.id);
|
|
}
|
|
}
|
|
}
|
|
if (local.isNotEmpty) {
|
|
try {
|
|
return await PhotoManager.editor.deleteWithIds(local);
|
|
} catch (e, stack) {
|
|
log.severe("Failed to delete asset from device", e, stack);
|
|
}
|
|
}
|
|
return [];
|
|
}
|
|
|
|
Future<Iterable<String>> _deleteRemoteAssets(
|
|
Set<Asset> assetsToDelete,
|
|
) async {
|
|
final Iterable<AssetResponseDto> remote =
|
|
assetsToDelete.where((e) => e.isRemote).map((e) => e.remote!);
|
|
final List<DeleteAssetResponseDto> deleteAssetResult =
|
|
await _assetService.deleteAssets(remote) ?? [];
|
|
return deleteAssetResult
|
|
.where((a) => a.status == DeleteAssetStatus.SUCCESS)
|
|
.map((a) => a.id);
|
|
}
|
|
}
|
|
|
|
final assetProvider = StateNotifierProvider<AssetNotifier, AssetsState>((ref) {
|
|
return AssetNotifier(
|
|
ref.watch(assetServiceProvider),
|
|
ref.watch(assetCacheServiceProvider),
|
|
ref.watch(appSettingsServiceProvider),
|
|
);
|
|
});
|
|
|
|
final assetGroupByMonthYearProvider = StateProvider((ref) {
|
|
// TODO: remove `where` once temporary workaround is no longer needed (to only
|
|
// allow remote assets to be added to album). Keep `toList()` as to NOT sort
|
|
// the original list/state
|
|
final assets =
|
|
ref.watch(assetProvider).allAssets.where((e) => e.isRemote).toList();
|
|
|
|
assets.sortByCompare<DateTime>(
|
|
(e) => e.createdAt,
|
|
(a, b) => b.compareTo(a),
|
|
);
|
|
|
|
return assets.groupListsBy(
|
|
(element) => DateFormat('MMMM, y').format(element.createdAt.toLocal()),
|
|
);
|
|
});
|