refactor(mobile): render list (#16239)

* refactor(mobile): trash provider

* refactor(mobile): trash provider

* pr feedback

* archive timeline

* favorite

* album

* trash timeline

* all videos timeline

* refactor

* refactor: home timeline and partner timeline

* update analysis option
This commit is contained in:
Alex
2025-02-21 09:01:46 -06:00
committed by GitHub
parent 616905211d
commit 5acf6868b7
24 changed files with 284 additions and 196 deletions
@@ -1,5 +1,4 @@
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/constants/enums.dart';
import 'package:immich_mobile/domain/models/store.model.dart';
import 'package:immich_mobile/entities/album.entity.dart';
import 'package:immich_mobile/entities/asset.entity.dart';
@@ -9,7 +8,6 @@ import 'package:immich_mobile/interfaces/album.interface.dart';
import 'package:immich_mobile/models/albums/album_search.model.dart';
import 'package:immich_mobile/providers/db.provider.dart';
import 'package:immich_mobile/repositories/database.repository.dart';
import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';
import 'package:isar/isar.dart';
final albumRepositoryProvider =
@@ -177,22 +175,4 @@ class AlbumRepository extends DatabaseRepository implements IAlbumRepository {
Stream<Album?> watchAlbum(int id) {
return db.albums.watchObject(id, fireImmediately: true);
}
@override
Stream<RenderList> getRenderListStream(Album album) async* {
final query = album.assets.filter().isTrashedEqualTo(false);
final withSortedOption = switch (album.sortOrder) {
SortOrder.asc => query.sortByFileCreatedAt(),
SortOrder.desc => query.sortByFileCreatedAtDesc(),
};
yield await RenderList.fromQuery(
withSortedOption,
GroupAssetsBy.none,
);
await for (final _ in query.watchLazy()) {
yield await RenderList.fromQuery(withSortedOption, GroupAssetsBy.none);
}
}
}
@@ -11,7 +11,6 @@ import 'package:immich_mobile/entities/ios_device_asset.entity.dart';
import 'package:immich_mobile/interfaces/asset.interface.dart';
import 'package:immich_mobile/providers/db.provider.dart';
import 'package:immich_mobile/repositories/database.repository.dart';
import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';
import 'package:isar/isar.dart';
final assetRepositoryProvider =
@@ -234,20 +233,6 @@ class AssetRepository extends DatabaseRepository implements IAssetRepository {
.isTrashedEqualTo(true)
.findAll();
}
@override
Stream<RenderList> getTrashRenderListStream(int userId) async* {
final query = db.assets
.filter()
.ownerIdEqualTo(userId)
.isTrashedEqualTo(true)
.sortByFileCreatedAtDesc();
yield await RenderList.fromQuery(query, GroupAssetsBy.none);
await for (final _ in query.watchLazy()) {
yield await RenderList.fromQuery(query, GroupAssetsBy.none);
}
}
}
Future<List<Asset>> _getMatchesImpl(
@@ -0,0 +1,120 @@
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/constants/enums.dart';
import 'package:immich_mobile/entities/album.entity.dart';
import 'package:immich_mobile/entities/asset.entity.dart';
import 'package:immich_mobile/interfaces/timeline.interface.dart';
import 'package:immich_mobile/providers/db.provider.dart';
import 'package:immich_mobile/repositories/database.repository.dart';
import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';
import 'package:isar/isar.dart';
final timelineRepositoryProvider =
Provider((ref) => TimelineRepository(ref.watch(dbProvider)));
class TimelineRepository extends DatabaseRepository
implements ITimelineRepository {
TimelineRepository(super.db);
@override
Stream<RenderList> watchArchiveTimeline(int userId) {
final query = db.assets
.where()
.ownerIdEqualToAnyChecksum(userId)
.filter()
.isArchivedEqualTo(true)
.isTrashedEqualTo(false)
.sortByFileCreatedAtDesc();
return _watchRenderList(query, GroupAssetsBy.none);
}
@override
Stream<RenderList> watchFavoriteTimeline(int userId) {
final query = db.assets
.where()
.ownerIdEqualToAnyChecksum(userId)
.filter()
.isFavoriteEqualTo(true)
.isTrashedEqualTo(false)
.sortByFileCreatedAtDesc();
return _watchRenderList(query, GroupAssetsBy.none);
}
@override
Stream<RenderList> watchAlbumTimeline(Album album) {
final query = album.assets.filter().isTrashedEqualTo(false);
final withSortedOption = switch (album.sortOrder) {
SortOrder.asc => query.sortByFileCreatedAt(),
SortOrder.desc => query.sortByFileCreatedAtDesc(),
};
return _watchRenderList(withSortedOption, GroupAssetsBy.none);
}
@override
Stream<RenderList> watchTrashTimeline(int userId) {
final query = db.assets
.filter()
.ownerIdEqualTo(userId)
.isTrashedEqualTo(true)
.sortByFileCreatedAtDesc();
return _watchRenderList(query, GroupAssetsBy.none);
}
@override
Stream<RenderList> watchAllVideosTimeline() {
final query = db.assets
.filter()
.isArchivedEqualTo(false)
.isTrashedEqualTo(false)
.typeEqualTo(AssetType.video)
.sortByFileCreatedAtDesc();
return _watchRenderList(query, GroupAssetsBy.none);
}
@override
Stream<RenderList> watchHomeTimeline(
int userId,
GroupAssetsBy groupAssetByOption,
) {
final query = db.assets
.where()
.ownerIdEqualToAnyChecksum(userId)
.filter()
.isArchivedEqualTo(false)
.isTrashedEqualTo(false)
.stackPrimaryAssetIdIsNull()
.sortByFileCreatedAtDesc();
return _watchRenderList(query, groupAssetByOption);
}
@override
Stream<RenderList> watchMultiUsersTimeline(
List<int> userIds,
GroupAssetsBy groupAssetByOption,
) {
final query = db.assets
.where()
.anyOf(userIds, (qb, userId) => qb.ownerIdEqualToAnyChecksum(userId))
.filter()
.isArchivedEqualTo(false)
.isTrashedEqualTo(false)
.stackPrimaryAssetIdIsNull()
.sortByFileCreatedAtDesc();
return _watchRenderList(query, groupAssetByOption);
}
Stream<RenderList> _watchRenderList(
QueryBuilder<Asset, Asset, QAfterSortBy> query,
GroupAssetsBy groupAssetsBy,
) async* {
yield await RenderList.fromQuery(query, groupAssetsBy);
await for (final _ in query.watchLazy()) {
yield await RenderList.fromQuery(query, groupAssetsBy);
}
}
}