Merge branch 'main' into timestams-with-seconds

Author: kaziu687

docs/docs/guides/database-queries.md

@@ -12,6 +12,8 @@ Run `docker exec -it immich_postgres psql --dbname=<DB_DATABASE_NAME> --username
 
 ## Assets
 
+### Name
+
 :::note
 The `"originalFileName"` column is the name of the file at time of upload, including the extension.
 :::
@@ -27,6 +29,8 @@ SELECT * FROM "asset" WHERE "originalPath" = 'upload/library/admin/2023/2023-09-
 SELECT * FROM "asset" WHERE "originalPath" LIKE 'upload/library/admin/2023/%';
 ```
 
+### ID
+
 ```sql title="Find by ID"
 SELECT * FROM "asset" WHERE "id" = '9f94e60f-65b6-47b7-ae44-a4df7b57f0e9';
 ```
@@ -35,6 +39,8 @@ SELECT * FROM "asset" WHERE "id" = '9f94e60f-65b6-47b7-ae44-a4df7b57f0e9';
 SELECT * FROM "asset" WHERE "id"::text LIKE '%ab431d3a%';
 ```
 
+### Checksum
+
 :::note
 You can calculate the checksum for a particular file by using the command `sha1sum <filename>`.
 :::
@@ -51,6 +57,8 @@ SELECT T1."checksum", array_agg(T2."id") ids FROM "asset" T1
   WHERE T1."deletedAt" IS NULL GROUP BY T1."checksum";
 ```
 
+### Metadata
+
 ```sql title="Live photos"
 SELECT * FROM "asset" WHERE "livePhotoVideoId" IS NOT NULL;
 ```
@@ -77,27 +85,37 @@ SELECT * FROM "asset"
   ORDER BY "asset_exif"."fileSizeInByte" ASC;
 ```
 
-```sql title="Without thumbnails"
-SELECT * FROM "asset" WHERE "asset"."previewPath" IS NULL OR "asset"."thumbnailPath" IS NULL;
-```
+### Type
 
 ```sql title="By type"
 SELECT * FROM "asset" WHERE "asset"."type" = 'VIDEO';
 SELECT * FROM "asset" WHERE "asset"."type" = 'IMAGE';
 ```
 
 ```sql title="Count by type"
-SELECT "asset"."type", COUNT(1) FROM "asset" GROUP BY "asset"."type";
+SELECT "asset"."type", COUNT(*) FROM "asset" GROUP BY "asset"."type";
 ```
 
 ```sql title="Count by type (per user)"
-SELECT "user"."email", "asset"."type", COUNT(1) FROM "asset"
+SELECT "user"."email", "asset"."type", COUNT(*) FROM "asset"
   JOIN "user" ON "asset"."ownerId" = "user"."id"
   GROUP BY "asset"."type", "user"."email" ORDER BY "user"."email";
 ```
 
-```sql title="Failed file movements"
-SELECT * FROM "move_history";
+## Tags
+
+```sql title="Count by tag"
+SELECT "t"."value" AS "tag_name", COUNT(*) AS "number_assets" FROM "tag" "t"
+  JOIN "tag_asset" "ta" ON "t"."id" = "ta"."tagsId" JOIN "asset" "a" ON "ta"."assetsId" = "a"."id"
+  WHERE "a"."visibility" != 'hidden'
+  GROUP BY "t"."value" ORDER BY "number_assets" DESC;
+```
+
+```sql title="Count by tag (per user)"
+SELECT "t"."value" AS "tag_name", "u"."email" as "user_email", COUNT(*) AS "number_assets" FROM "tag" "t"
+  JOIN "tag_asset" "ta" ON "t"."id" = "ta"."tagsId" JOIN "asset" "a" ON "ta"."assetsId" = "a"."id" JOIN "user" "u" ON "a"."ownerId" = "u"."id"
+  WHERE "a"."visibility" != 'hidden'
+  GROUP BY "t"."value", "u"."email" ORDER BY "number_assets" DESC;
 ```
 
 ## Users
@@ -110,18 +128,30 @@ SELECT * FROM "user";
 SELECT "user".* FROM "user" JOIN "asset" ON "user"."id" = "asset"."ownerId" WHERE "asset"."id" = 'fa310b01-2f26-4b7a-9042-d578226e021f';
 ```
 
-## System Config
+## Persons
+
+```sql title="Delete person and unset it for the faces it was associated with"
+DELETE FROM "person" WHERE "name" = 'PersonNameHere';
+```
+
+## System
+
+### Config
 
 ```sql title="Custom settings"
 SELECT "key", "value" FROM "system_metadata" WHERE "key" = 'system-config';
 ```
 
 (Only used when not using the [config file](/docs/install/config-file))
 
-## Persons
+### File properties
 
-```sql title="Delete person and unset it for the faces it was associated with"
-DELETE FROM "person" WHERE "name" = 'PersonNameHere';
+```sql title="Without thumbnails"
+SELECT * FROM "asset" WHERE "asset"."previewPath" IS NULL OR "asset"."thumbnailPath" IS NULL;
+```
+
+```sql title="Failed file movements"
+SELECT * FROM "move_history";
 ```
 
 ## Postgres internal

mobile/lib/domain/models/timeline.model.dart

@@ -45,3 +45,13 @@ class TimeBucket extends Bucket {
 class TimelineReloadEvent extends Event {
   const TimelineReloadEvent();
 }
+
+class ScrollToTopEvent extends Event {
+  const ScrollToTopEvent();
+}
+
+class ScrollToDateEvent extends Event {
+  final DateTime date;
+
+  const ScrollToDateEvent(this.date);
+}

mobile/lib/infrastructure/repositories/log.repository.dart

@@ -19,9 +19,13 @@ class IsarLogRepository extends IsarDatabaseRepository {
 
   Future<bool> insert(LogMessage log) async {
     final logEntity = LoggerMessage.fromDto(log);
-    await transaction(() async {
-      await _db.loggerMessages.put(logEntity);
-    });
+
+    try {
+      await transaction(() => _db.loggerMessages.put(logEntity));
+    } catch (e) {
+      return false;
+    }
+
     return true;
   }
 

mobile/lib/pages/common/tab_shell.page.dart

@@ -2,9 +2,10 @@ import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/timeline.model.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/providers/asset_viewer/scroll_notifier.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
@@ -155,7 +156,7 @@ class _TabShellPageState extends ConsumerState<TabShellPage> {
 void _onNavigationSelected(TabsRouter router, int index, WidgetRef ref) {
   // On Photos page menu tapped
   if (router.activeIndex == 0 && index == 0) {
-    scrollToTopNotifierProvider.scrollToTop();
+    EventStream.shared.emit(const ScrollToTopEvent());
   }
 
   // On Search page tapped

mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/cast_action_button.widget.dart';
@@ -15,6 +16,7 @@ import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asse
 import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 
 class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
   const ViewerTopAppBar({super.key});
@@ -30,6 +32,9 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
     final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
     final isInLockedView = ref.watch(inLockedViewProvider);
 
+    final previousRouteName = ref.watch(previousRouteNameProvider);
+    final showViewInTimelineButton = previousRouteName != TabShellRoute.name && previousRouteName != null;
+
     final isShowingSheet = ref.watch(assetViewerProvider.select((state) => state.showingBottomSheet));
     int opacity = ref.watch(
       assetViewerProvider.select((state) => state.backgroundOpacity),
@@ -50,6 +55,16 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
         const CastActionButton(
           menuItem: true,
         ),
+      if (showViewInTimelineButton)
+        IconButton(
+          onPressed: () async {
+            await context.maybePop();
+            await context.navigateTo(const TabShellRoute(children: [MainTimelineRoute()]));
+            EventStream.shared.emit(ScrollToDateEvent(asset.createdAt));
+          },
+          icon: const Icon(Icons.image_search),
+          tooltip: 'view_in_timeline',
+        ),
       if (asset.hasRemote && isOwner && !asset.isFavorite)
         const FavoriteActionButton(source: ActionSource.viewer, menuItem: true),
       if (asset.hasRemote && isOwner && asset.isFavorite)

mobile/lib/presentation/widgets/memory/memory_bottom_info.widget.dart

@@ -4,8 +4,9 @@ import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/domain/models/memory.model.dart';
-
-import 'package:immich_mobile/providers/asset_viewer/scroll_to_date_notifier.provider.dart';
+import 'package:immich_mobile/domain/models/timeline.model.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
+import 'package:immich_mobile/routing/router.dart';
 
 class DriftMemoryBottomInfo extends StatelessWidget {
   final DriftMemory memory;
@@ -44,18 +45,22 @@ class DriftMemoryBottomInfo extends StatelessWidget {
             ),
           ],
         ),
-        MaterialButton(
-          minWidth: 0,
-          onPressed: () {
-            context.maybePop();
-            scrollToDateNotifierProvider.scrollToDate(fileCreatedDate);
-          },
-          shape: const CircleBorder(),
-          color: Colors.white.withValues(alpha: 0.2),
-          elevation: 0,
-          child: const Icon(
-            Icons.open_in_new,
-            color: Colors.white,
+        Tooltip(
+          message: 'view_in_timeline'.tr(),
+          child: MaterialButton(
+            minWidth: 0,
+            onPressed: () {
+              context.maybePop();
+              context.navigateTo(const TabShellRoute(children: [MainTimelineRoute()]));
+              EventStream.shared.emit(ScrollToDateEvent(fileCreatedDate));
+            },
+            shape: const CircleBorder(),
+            color: Colors.white.withValues(alpha: 0.2),
+            elevation: 0,
+            child: const Icon(
+              Icons.open_in_new,
+              color: Colors.white,
+            ),
           ),
         ),
       ]),

mobile/lib/presentation/widgets/timeline/timeline.widget.dart

@@ -97,21 +97,73 @@ class _SliverTimeline extends ConsumerStatefulWidget {
 
 class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
   final _scrollController = ScrollController();
-  StreamSubscription? _reloadSubscription;
+  StreamSubscription? _eventSubscription;
 
   @override
   void initState() {
     super.initState();
-    _reloadSubscription = EventStream.shared.listen<TimelineReloadEvent>((_) => setState(() {}));
+    _eventSubscription = EventStream.shared.listen(_onEvent);
+  }
+
+  void _onEvent(Event event) {
+    switch (event) {
+      case ScrollToTopEvent():
+        _scrollController.animateTo(
+          0,
+          duration: const Duration(milliseconds: 250),
+          curve: Curves.easeInOut,
+        );
+      case ScrollToDateEvent scrollToDateEvent:
+        _scrollToDate(scrollToDateEvent.date);
+      case TimelineReloadEvent():
+        setState(() {});
+      default:
+        break;
+    }
   }
 
   @override
   void dispose() {
     _scrollController.dispose();
-    _reloadSubscription?.cancel();
+    _eventSubscription?.cancel();
     super.dispose();
   }
 
+  void _scrollToDate(DateTime date) {
+    final asyncSegments = ref.read(timelineSegmentProvider);
+    asyncSegments.whenData((segments) {
+      // Find the segment that contains assets from the target date
+      final targetSegment = segments.firstWhereOrNull((segment) {
+        if (segment.bucket is TimeBucket) {
+          final segmentDate = (segment.bucket as TimeBucket).date;
+          // Check if the segment date matches the target date (year, month, day)
+          return segmentDate.year == date.year && segmentDate.month == date.month && segmentDate.day == date.day;
+        }
+        return false;
+      });
+
+      // If exact date not found, try to find the closest month
+      final fallbackSegment = targetSegment ??
+          segments.firstWhereOrNull((segment) {
+            if (segment.bucket is TimeBucket) {
+              final segmentDate = (segment.bucket as TimeBucket).date;
+              return segmentDate.year == date.year && segmentDate.month == date.month;
+            }
+            return false;
+          });
+
+      if (fallbackSegment != null) {
+        // Scroll to the segment with a small offset to show the header
+        final targetOffset = fallbackSegment.startOffset - 50;
+        _scrollController.animateTo(
+          targetOffset.clamp(0.0, _scrollController.position.maxScrollExtent),
+          duration: const Duration(milliseconds: 500),
+          curve: Curves.easeInOut,
+        );
+      }
+    });
+  }
+
   @override
   Widget build(BuildContext _) {
     final asyncSegments = ref.watch(timelineSegmentProvider);

mobile/lib/providers/routes.provider.dart

@@ -2,3 +2,4 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 final inLockedViewProvider = StateProvider<bool>((ref) => false);
 final currentRouteNameProvider = StateProvider<String?>((ref) => null);
+final previousRouteNameProvider = StateProvider<String?>((ref) => null);

mobile/lib/routing/app_navigation_observer.dart

@@ -26,9 +26,10 @@ class AppNavigationObserver extends AutoRouterObserver {
   void didPush(Route route, Route? previousRoute) {
     _handleLockedViewState(route, previousRoute);
     _handleDriftLockedFolderState(route, previousRoute);
-    Future(
-      () => ref.read(currentRouteNameProvider.notifier).state = route.settings.name,
-    );
+    Future(() {
+      ref.read(currentRouteNameProvider.notifier).state = route.settings.name;
+      ref.read(previousRouteNameProvider.notifier).state = previousRoute?.settings.name;
+    });
   }
 
   _handleLockedViewState(Route route, Route? previousRoute) {

web/src/lib/modals/AlbumPickerModal.svelte

@@ -28,7 +28,7 @@
 
   onMount(async () => {
     albums = await getAllAlbums({ shared: shared || undefined });
-    recentAlbums = albums.sort((a, b) => (new Date(a.createdAt) > new Date(b.createdAt) ? -1 : 1)).slice(0, 3);
+    recentAlbums = albums.sort((a, b) => (new Date(a.updatedAt) > new Date(b.updatedAt) ? -1 : 1)).slice(0, 3);
     loading = false;
   });