High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
feat(mobile): drift locked folder page (#19746)
Daimoleancf91d9bdfcf1
diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dartindex fc8b2a86fd..2e56e6e10c 100644--- a/mobile/lib/domain/services/timeline.service.dart+++ b/mobile/lib/domain/services/timeline.service.dart@@ -67,6 +67,15 @@ class TimelineFactory {bucketSource: () =>_timelineRepository.watchArchiveBucket(userId, groupBy: groupBy),);++ TimelineService lockedFolder(String userId) => TimelineService(+ assetSource: (offset, count) => _timelineRepository+ .getLockedFolderBucketAssets(userId, offset: offset, count: count),+ bucketSource: () => _timelineRepository.watchLockedFolderBucket(+ userId,+ groupBy: groupBy,+ ),+ );}class TimelineService {diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dartindex acddb38534..45e2c5dac9 100644--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart@@ -313,6 +313,58 @@ class DriftTimelineRepository extends DriftDatabaseRepository {return query.map((row) => row.toDto()).get();}++ Stream<List<Bucket>> watchLockedFolderBucket(+ String userId, {+ GroupAssetsBy groupBy = GroupAssetsBy.day,+ }) {+ if (groupBy == GroupAssetsBy.none) {+ return _db.remoteAssetEntity+ .count(+ where: (row) =>+ row.visibility.equalsValue(AssetVisibility.locked) &+ row.ownerId.equals(userId),+ )+ .map(_generateBuckets)+ .watchSingle();+ }++ final assetCountExp = _db.remoteAssetEntity.id.count();+ final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);++ final query = _db.remoteAssetEntity.selectOnly()+ ..addColumns([assetCountExp, dateExp])+ ..where(+ _db.remoteAssetEntity.ownerId.equals(userId) &+ _db.remoteAssetEntity.visibility+ .equalsValue(AssetVisibility.locked),+ )+ ..groupBy([dateExp])+ ..orderBy([OrderingTerm.desc(dateExp)]);++ return query.map((row) {+ final timeline = row.read(dateExp)!.dateFmt(groupBy);+ final assetCount = row.read(assetCountExp)!;+ return TimeBucket(date: timeline, assetCount: assetCount);+ }).watch();+ }++ Future<List<BaseAsset>> getLockedFolderBucketAssets(+ String userId, {+ required int offset,+ required int count,+ }) {+ final query = _db.remoteAssetEntity.select()+ ..where(+ (row) =>+ row.visibility.equalsValue(AssetVisibility.locked) &+ row.ownerId.equals(userId),+ )+ ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])+ ..limit(count, offset: offset);++ return query.map((row) => row.toDto()).get();+ }}extension on Expression<DateTime> {diff --git a/mobile/lib/presentation/pages/dev/drift_locked_folder.page.dart b/mobile/lib/presentation/pages/dev/drift_locked_folder.page.dartnew file mode 100644index 0000000000..5ab7c71347--- /dev/null+++ b/mobile/lib/presentation/pages/dev/drift_locked_folder.page.dart@@ -0,0 +1,33 @@+import 'package:auto_route/auto_route.dart';+import 'package:flutter/widgets.dart';+import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';+import 'package:immich_mobile/providers/user.provider.dart';++@RoutePage()+class DriftLockedFolderPage extends StatelessWidget {+ const DriftLockedFolderPage({super.key});++ @override+ Widget build(BuildContext context) {+ return ProviderScope(+ overrides: [+ timelineServiceProvider.overrideWith(+ (ref) {+ final user = ref.watch(currentUserProvider);+ if (user == null) {+ throw Exception('User must be logged in to access locked folder');+ }++ final timelineService =+ ref.watch(timelineFactoryProvider).lockedFolder(user.id);+ ref.onDispose(timelineService.dispose);+ return timelineService;+ },+ ),+ ],+ child: const Timeline(),+ );+ }+}diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dartindex 8bfd02ab31..e4c4f1c879 100644--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart@@ -109,6 +109,11 @@ final _features = [icon: Icons.archive_outlined,onTap: (ctx, _) => ctx.pushRoute(const DriftArchiveRoute()),),+ _Feature(+ name: 'Locked Folder',+ icon: Icons.lock_outline_rounded,+ onTap: (ctx, _) => ctx.pushRoute(const DriftLockedFolderRoute()),+ ),];@RoutePage()diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dartindex 85e8700300..8513b0606c 100644--- a/mobile/lib/routing/router.dart+++ b/mobile/lib/routing/router.dart@@ -68,6 +68,7 @@ import 'package:immich_mobile/pages/search/search.page.dart';import 'package:immich_mobile/pages/share_intent/share_intent.page.dart';import 'package:immich_mobile/presentation/pages/dev/drift_trash.page.dart';import 'package:immich_mobile/presentation/pages/dev/drift_archive.page.dart';+import 'package:immich_mobile/presentation/pages/dev/drift_locked_folder.page.dart';import 'package:immich_mobile/presentation/pages/dev/feat_in_development.page.dart';import 'package:immich_mobile/presentation/pages/dev/local_timeline.page.dart';import 'package:immich_mobile/presentation/pages/dev/main_timeline.page.dart';@@ -402,6 +403,10 @@ class AppRouter extends RootStackRouter {page: DriftArchiveRoute.page,guards: [_authGuard, _duplicateGuard],),+ AutoRoute(+ page: DriftLockedFolderRoute.page,+ guards: [_authGuard, _duplicateGuard],+ ),// required to handle all deeplinks in deep_link.service.dart// auto_route_library#1722RedirectRoute(path: '*', redirectTo: '/'),diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dartindex 0a861898aa..cf34bc0d50 100644--- a/mobile/lib/routing/router.gr.dart+++ b/mobile/lib/routing/router.gr.dart@@ -634,6 +634,22 @@ class DriftArchiveRoute extends PageRouteInfo<void> {);}+/// generated route for+/// [DriftLockedFolderPage]+class DriftLockedFolderRoute extends PageRouteInfo<void> {+ const DriftLockedFolderRoute({List<PageRouteInfo>? children})+ : super(DriftLockedFolderRoute.name, initialChildren: children);++ static const String name = 'DriftLockedFolderRoute';++ static PageInfo page = PageInfo(+ name,+ builder: (data) {+ return const DriftLockedFolderPage();+ },+ );+}+/// generated route for/// [DriftMemoryPage]class DriftMemoryRoute extends PageRouteInfo<DriftMemoryRouteArgs> {