Merge branch 'main' of https://github.com/immich-app/immich into fix/library-map-loading-flash

Co-authored-by: Daniel Dietzler <mail@ddietzler.dev>

docs/docs/install/synology.md

@@ -7,7 +7,7 @@ sidebar_position: 85
 :::note
 This is a community contribution and not officially supported by the Immich team, but included here for convenience.
 
-Community support can be found in the dedicated channel on the [Discord Server](https://discord.immich.app/).
+Community support should be directed to Synology-specific support platforms.
 :::
 
 Immich can easily be installed on a Synology NAS using Container Manager within DSM. If you have not installed Container Manager already, you can install it in the Packages Center. Refer to the [Container Manager docs](https://kb.synology.com/en-us/DSM/help/ContainerManager/docker_desc?version=7) for more information on using Container Manager.

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -586,7 +586,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
+			shellScript = "/bin/bash \"$SRCROOT/scripts/xcode_flutter_build.sh\"\n";
 		};
 		BAEA01ACA3F5C9CD3D732370 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;

mobile/ios/scripts/xcode_flutter_build.sh

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+# Makes Flutter's builds through the Xcode GUI properly display errors and warnings
+# in the Issue navigator
+#
+# Flutter's `xcode_backend.dart` runs `flutter assemble` with `allowFail: true`,
+# which intentionally does not prefix output with `error:`. Unsure why they do this,
+# but this script rebuilds the expected output so Xcode can parse and display the errors
+
+set -o pipefail
+
+# The Immich mobile root (containing the Dart `lib` directory). This is used to make
+# absolute paths for Xcode linking
+app_root="${FLUTTER_APPLICATION_PATH:-$SRCROOT/..}"
+
+/bin/sh "$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh" build 2>&1 \
+  | awk -v app_root="$app_root" '
+    # Match Dart CFE diagnostics: <path>.dart:<line>:<col>: <Kind>: <message>
+    # Written for macOS/POSIX/BSD awk
+    {
+      # Always pass the original line through to preserve the original build log
+      print
+
+      if ($0 ~ /^.*\.dart:[0-9]+:[0-9]+: (Error|Warning|Context|Info):/) {
+        # Locate the ": Kind:" separator to split location from message.
+        rest = $0
+        if      (match(rest, /: Error:/))   { kind = "Error";   keyword = "error"   }
+        else if (match(rest, /: Warning:/)) { kind = "Warning"; keyword = "warning" }
+        else if (match(rest, /: Context:/)) { kind = "Context"; keyword = "note"    }
+        else if (match(rest, /: Info:/))    { kind = "Info";    keyword = "note"    }
+
+        # location = everything before ": Kind:" (e.g. "lib/foo.dart:12:5")
+        location = substr(rest, 1, RSTART - 1)
+        # message = everything after ": Kind:" (leading space preserved)
+        message = substr(rest, RSTART + length(": " kind ":"))
+
+        # Make the path absolute so Xcode links to it
+        if (location !~ /^\//)
+          location = app_root "/" location
+
+        printf "%s: %s:%s\n", location, keyword, message
+      }
+    }
+  '
+
+exit "${PIPESTATUS[0]}"

mobile/lib/domain/models/config/app_config.dart

@@ -129,7 +129,6 @@ class AppConfig {
             .themeDynamic => theme.dynamicTheme,
             .themeColorfulInterface => theme.colorfulInterface,
             .imagePreferRemote => image.preferRemote,
-            .imageLoadPreview => image.loadPreview,
             .imageLoadOriginal => image.loadOriginal,
             .viewerLoopVideo => viewer.loopVideo,
             .viewerLoadOriginalVideo => viewer.loadOriginalVideo,
@@ -182,7 +181,6 @@ class AppConfig {
       .themeDynamic => copyWith(theme: theme.copyWith(dynamicTheme: value as bool)),
       .themeColorfulInterface => copyWith(theme: theme.copyWith(colorfulInterface: value as bool)),
       .imagePreferRemote => copyWith(image: image.copyWith(preferRemote: value as bool)),
-      .imageLoadPreview => copyWith(image: image.copyWith(loadPreview: value as bool)),
       .imageLoadOriginal => copyWith(image: image.copyWith(loadOriginal: value as bool)),
       .viewerLoopVideo => copyWith(viewer: viewer.copyWith(loopVideo: value as bool)),
       .viewerLoadOriginalVideo => copyWith(viewer: viewer.copyWith(loadOriginalVideo: value as bool)),

mobile/lib/domain/models/config/image_config.dart

@@ -1,28 +1,20 @@
 class ImageConfig {
   final bool preferRemote;
-  final bool loadPreview;
   final bool loadOriginal;
 
-  const ImageConfig({this.preferRemote = false, this.loadPreview = true, this.loadOriginal = false});
+  const ImageConfig({this.preferRemote = false, this.loadOriginal = false});
 
-  ImageConfig copyWith({bool? preferRemote, bool? loadPreview, bool? loadOriginal}) => ImageConfig(
-    preferRemote: preferRemote ?? this.preferRemote,
-    loadPreview: loadPreview ?? this.loadPreview,
-    loadOriginal: loadOriginal ?? this.loadOriginal,
-  );
+  ImageConfig copyWith({bool? preferRemote, bool? loadOriginal}) =>
+      ImageConfig(preferRemote: preferRemote ?? this.preferRemote, loadOriginal: loadOriginal ?? this.loadOriginal);
 
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is ImageConfig &&
-          other.preferRemote == preferRemote &&
-          other.loadPreview == loadPreview &&
-          other.loadOriginal == loadOriginal);
+      (other is ImageConfig && other.preferRemote == preferRemote && other.loadOriginal == loadOriginal);
 
   @override
-  int get hashCode => Object.hash(preferRemote, loadPreview, loadOriginal);
+  int get hashCode => Object.hash(preferRemote, loadOriginal);
 
   @override
-  String toString() =>
-      'ImageConfig(preferRemoteImage: $preferRemote, loadPreview: $loadPreview, loadOriginal: $loadOriginal)';
+  String toString() => 'ImageConfig(preferRemoteImage: $preferRemote, loadOriginal: $loadOriginal)';
 }

mobile/lib/domain/models/settings_key.dart

@@ -17,7 +17,6 @@ enum SettingsKey<T> {
 
   // Image
   imagePreferRemote<bool>(),
-  imageLoadPreview<bool>(),
   imageLoadOriginal<bool>(),
 
   // Viewer

mobile/lib/domain/services/timeline.service.dart

@@ -85,8 +85,12 @@ class TimelineFactory {
   TimelineService fromAssetsWithBuckets(List<BaseAsset> assets, TimelineOrigin type) =>
       TimelineService(_timelineRepository.fromAssetsWithBuckets(assets, type));
 
-  TimelineService map(List<String> userIds, TimelineMapOptions options) =>
-      TimelineService(_timelineRepository.map(userIds, options, groupBy));
+  /// Creates a TimelineService for serving geographical map queries, such assets within bounded locations
+  TimelineService geographicMap(
+    List<String> userIds,
+    TimelineMapOptions Function() currentOptions,
+    Stream<TimelineMapOptions> optionsStream,
+  ) => TimelineService(_timelineRepository.geographicMap(userIds, currentOptions, optionsStream, groupBy));
 }
 
 class TimelineService {

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

@@ -508,9 +508,21 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     return query.map((row) => row.toDto()).get();
   }
 
-  TimelineQuery map(List<String> userIds, TimelineMapOptions options, GroupAssetsBy groupBy) => (
-    bucketSource: () => _watchMapBucket(userIds, options, groupBy: groupBy),
-    assetSource: (offset, count) => _getMapBucketAssets(userIds, options, offset: offset, count: count),
+  /// Creates a geographic map query that can dynamically filter on changing [TimelineMapOptions]
+  /// (most notably the active map bounds)
+  TimelineQuery geographicMap(
+    List<String> userIds,
+    TimelineMapOptions Function() currentOptions,
+    Stream<TimelineMapOptions> optionsStream,
+    GroupAssetsBy groupBy,
+  ) => (
+    bucketSource: () => Stream.value(currentOptions())
+        .followedBy(optionsStream)
+        .switchMap(
+          // Any error would kill the stream for all options; make sure the stream stays alive
+          (options) => _watchMapBucket(userIds, options, groupBy: groupBy).handleError((_) {}),
+        ),
+    assetSource: (offset, count) => _getMapBucketAssets(userIds, currentOptions(), offset: offset, count: count),
     origin: TimelineOrigin.map,
   );
 

mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart

@@ -7,7 +7,6 @@ import 'package:fluttertoast/fluttertoast.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/settings_key.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
@@ -129,12 +128,6 @@ class ShareActionButton extends ConsumerWidget {
       return;
     }
 
-    await ref.read(settingsProvider).write(SettingsKey.shareFileType, fileType);
-
-    if (!context.mounted) {
-      return;
-    }
-
     await _share(context, ref, fileType);
   }
 

mobile/lib/presentation/widgets/album/album_selector.widget.dart

@@ -745,10 +745,15 @@ class AddToAlbumHeader extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     Future<void> onCreateAlbum() async {
+      final albumName = await showDialog<String?>(context: context, builder: (context) => const NewAlbumNameModal());
+      if (albumName == null) {
+        return;
+      }
+
       final selectedAssets = ref.read(multiSelectProvider).selectedAssets;
       final newAlbum = await ref
           .read(remoteAlbumProvider.notifier)
-          .createAlbumWithAssets(title: "Untitled Album", assets: selectedAssets);
+          .createAlbumWithAssets(title: albumName, assets: selectedAssets);
 
       if (newAlbum == null) {
         ImmichToast.show(context: context, toastType: ToastType.error, msg: 'errors.failed_to_create_album'.tr());

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

@@ -91,7 +91,7 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
         }
       case AppLifecycleState.paused:
         _shouldPlayOnForeground = await _controller?.isPlaying() ?? true;
-        if (_shouldPlayOnForeground) {
+        if (_shouldPlayOnForeground && mounted) {
           await _notifier.pause();
         }
       default:
@@ -268,10 +268,13 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
       return;
     }
 
-    await _notifier.load(source);
+    // Grab refs to prevent reading after dispose
     final loopVideo = ref.read(appConfigProvider).viewer.loopVideo;
-    await _notifier.setLoop(!widget.asset.isMotionPhoto && loopVideo);
-    await _notifier.setVolume(1);
+    final localNotifier = _notifier;
+
+    await localNotifier.load(source);
+    await localNotifier.setLoop(!widget.asset.isMotionPhoto && loopVideo);
+    await localNotifier.setVolume(1);
   }
 
   void _initController(NativeVideoPlayerController nc) {

mobile/lib/presentation/widgets/bottom_sheet/map_bottom_sheet.widget.dart

@@ -35,7 +35,6 @@ class _ScopedMapTimeline extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    // TODO: this causes the timeline to switch to flicker to "loading" state and back. This is both janky and inefficient.
     return ProviderScope(
       overrides: [
         timelineServiceProvider.overrideWith((ref) {
@@ -44,13 +43,16 @@ class _ScopedMapTimeline extends StatelessWidget {
             throw Exception('User must be logged in to access archive');
           }
 
-          final users = ref.watch(mapStateProvider).withPartners
-              ? ref.watch(timelineUsersProvider).valueOrNull ?? [user.id]
-              : [user.id];
+          final withPartners = ref.watch(mapStateProvider.select((s) => s.withPartners));
+          final users = withPartners ? ref.watch(timelineUsersProvider).valueOrNull ?? [user.id] : [user.id];
 
           final timelineService = ref
               .watch(timelineFactoryProvider)
-              .map(users, ref.watch(mapStateProvider).toOptions());
+              .geographicMap(
+                users,
+                () => ref.read(mapStateProvider).toOptions(),
+                ref.read(mapStateProvider.notifier).optionsStream,
+              );
           ref.onDispose(timelineService.dispose);
           return timelineService;
         }),

mobile/lib/presentation/widgets/images/image_provider.dart

@@ -45,6 +45,7 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvide
 
     completer.operation.valueOrCancellation().whenComplete(() {
       cachedStream.removeListener(listener);
+      cachedOperation = null;
     });
     cachedOperation = completer.operation;
     return null;
@@ -94,9 +95,6 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvide
       isFinished = isFinal;
       return codec;
     } catch (e) {
-      if (isCancelled) {
-        return null;
-      }
       if (isFinal) {
         isFinished = true;
         PaintingBinding.instance.imageCache.evict(this);
@@ -108,33 +106,18 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvide
     }
   }
 
-  Stream<ImageInfo> initialImageStream({required bool isFinal}) async* {
+  Stream<ImageInfo> initialImageStream() async* {
     final cachedOperation = this.cachedOperation;
-    if (isCancelled) {
-      return;
-    }
     if (cachedOperation == null) {
-      // image resolved synchronously
-      isFinished = isFinal;
       return;
     }
 
     try {
       final cachedImage = await cachedOperation.valueOrCancellation();
-      if (isCancelled || cachedImage == null) {
-        return;
+      if (cachedImage != null && !isCancelled) {
+        yield cachedImage;
       }
-      isFinished = isFinal;
-      yield cachedImage;
     } catch (e, stack) {
-      if (isCancelled) {
-        return;
-      }
-      if (isFinal) {
-        isFinished = true;
-        PaintingBinding.instance.imageCache.evict(this);
-        rethrow;
-      }
       _log.severe('Error loading initial image', e, stack);
     } finally {
       this.cachedOperation = null;

mobile/lib/presentation/widgets/images/local_image_provider.dart

@@ -98,55 +98,51 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProv
   }
 
   Stream<ImageInfo> _codec(LocalFullImageProvider key, ImageDecoderCallback decode) async* {
-    final loadOriginal = SettingsRepository.instance.appConfig.image.loadOriginal;
-    final loadPreview = SettingsRepository.instance.appConfig.image.loadPreview;
-    yield* initialImageStream(isFinal: !loadOriginal && !loadPreview);
+    yield* initialImageStream();
 
     if (isCancelled) {
       return;
     }
 
-    if (loadPreview) {
-      final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
-      final previewRequest = request = LocalImageRequest(
-        localId: key.id,
-        size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
-        assetType: key.assetType,
-      );
-      yield* loadRequest(previewRequest, decode, isFinal: !loadOriginal);
-
-      if (isCancelled) {
-        return;
-      }
-    }
+    final loadOriginal = SettingsRepository.instance.appConfig.image.loadOriginal;
+    final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
+    var request = this.request = LocalImageRequest(
+      localId: key.id,
+      size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
+      assetType: key.assetType,
+    );
+    yield* loadRequest(request, decode, isFinal: !loadOriginal);
 
     if (!loadOriginal) {
       return;
     }
 
-    final originalRequest = request = LocalImageRequest(localId: key.id, assetType: key.assetType, size: Size.zero);
-    yield* loadRequest(originalRequest, decode, isFinal: true);
+    if (isCancelled) {
+      return;
+    }
+
+    request = this.request = LocalImageRequest(localId: key.id, assetType: key.assetType, size: Size.zero);
+
+    yield* loadRequest(request, decode, isFinal: true);
   }
 
   Stream<Object> _animatedCodec(LocalFullImageProvider key, ImageDecoderCallback decode) async* {
-    yield* initialImageStream(isFinal: false);
+    yield* initialImageStream();
 
     if (isCancelled) {
       return;
     }
 
-    if (SettingsRepository.instance.appConfig.image.loadPreview) {
-      final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
-      final previewRequest = request = LocalImageRequest(
-        localId: key.id,
-        size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
-        assetType: key.assetType,
-      );
-      yield* loadRequest(previewRequest, decode, isFinal: false);
+    final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
+    final previewRequest = request = LocalImageRequest(
+      localId: key.id,
+      size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
+      assetType: key.assetType,
+    );
+    yield* loadRequest(previewRequest, decode, isFinal: false);
 
-      if (isCancelled) {
-        return;
-      }
+    if (isCancelled) {
+      return;
     }
 
     // always try original for animated, since previews don't support animation

mobile/lib/presentation/widgets/images/remote_image_provider.dart

@@ -108,35 +108,31 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
   }
 
   Stream<ImageInfo> _codec(RemoteFullImageProvider key, ImageDecoderCallback decode) async* {
-    final isImage = assetType == AssetType.image;
-    final loadOriginal = isImage && SettingsRepository.instance.appConfig.image.loadOriginal;
-    final loadPreview = isImage && SettingsRepository.instance.appConfig.image.loadPreview;
-    yield* initialImageStream(isFinal: !loadOriginal && !loadPreview);
+    yield* initialImageStream();
 
     if (isCancelled) {
       return;
     }
 
-    if (loadPreview) {
-      final previewRequest = request = RemoteImageRequest(
-        uri: getThumbnailUrlForRemoteId(
-          key.assetId,
-          type: AssetMediaSize.preview,
-          thumbhash: key.thumbhash,
-          edited: key.edited,
-        ),
-      );
-      yield* loadRequest(previewRequest, decode, isFinal: !loadOriginal);
-
-      if (isCancelled) {
-        return;
-      }
-    }
+    final previewRequest = request = RemoteImageRequest(
+      uri: getThumbnailUrlForRemoteId(
+        key.assetId,
+        type: AssetMediaSize.preview,
+        thumbhash: key.thumbhash,
+        edited: key.edited,
+      ),
+    );
+    final loadOriginal = assetType == AssetType.image && SettingsRepository.instance.appConfig.image.loadOriginal;
+    yield* loadRequest(previewRequest, decode, isFinal: !loadOriginal);
 
     if (!loadOriginal) {
       return;
     }
 
+    if (isCancelled) {
+      return;
+    }
+
     final originalRequest = request = RemoteImageRequest(
       uri: getOriginalUrlForRemoteId(key.assetId, edited: key.edited),
     );
@@ -144,26 +140,24 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
   }
 
   Stream<Object> _animatedCodec(RemoteFullImageProvider key, ImageDecoderCallback decode) async* {
-    yield* initialImageStream(isFinal: false);
+    yield* initialImageStream();
 
     if (isCancelled) {
       return;
     }
 
-    if (SettingsRepository.instance.appConfig.image.loadPreview) {
-      final previewRequest = request = RemoteImageRequest(
-        uri: getThumbnailUrlForRemoteId(
-          key.assetId,
-          type: AssetMediaSize.preview,
-          thumbhash: key.thumbhash,
-          edited: key.edited,
-        ),
-      );
-      yield* loadRequest(previewRequest, decode, isFinal: false);
+    final previewRequest = request = RemoteImageRequest(
+      uri: getThumbnailUrlForRemoteId(
+        key.assetId,
+        type: AssetMediaSize.preview,
+        thumbhash: key.thumbhash,
+        edited: key.edited,
+      ),
+    );
+    yield* loadRequest(previewRequest, decode, isFinal: false);
 
-      if (isCancelled) {
-        return;
-      }
+    if (isCancelled) {
+      return;
     }
 
     // always try original for animated, since previews don't support animation

mobile/lib/presentation/widgets/map/map.state.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
@@ -63,11 +65,16 @@ class MapState {
 class MapStateNotifier extends Notifier<MapState> {
   MapStateNotifier();
 
+  final StreamController<TimelineMapOptions> _optionsController = StreamController.broadcast();
+
+  Stream<TimelineMapOptions> get optionsStream => _optionsController.stream;
+
   bool setBounds(LatLngBounds bounds) {
     if (state.bounds == bounds) {
       return false;
     }
     state = state.copyWith(bounds: bounds);
+    _optionsController.add(state.toOptions());
     return true;
   }
 
@@ -82,12 +89,14 @@ class MapStateNotifier extends Notifier<MapState> {
   void switchFavoriteOnly(bool isFavoriteOnly) {
     ref.read(settingsProvider).write(.mapShowFavoriteOnly, isFavoriteOnly);
     state = state.copyWith(onlyFavorites: isFavoriteOnly);
+    _optionsController.add(state.toOptions());
     EventStream.shared.emit(const MapMarkerReloadEvent());
   }
 
   void switchIncludeArchived(bool isIncludeArchived) {
     ref.read(settingsProvider).write(.mapIncludeArchived, isIncludeArchived);
     state = state.copyWith(includeArchived: isIncludeArchived);
+    _optionsController.add(state.toOptions());
     EventStream.shared.emit(const MapMarkerReloadEvent());
   }
 
@@ -100,11 +109,13 @@ class MapStateNotifier extends Notifier<MapState> {
   void setRelativeTime(int relativeDays) {
     ref.read(settingsProvider).write(.mapRelativeDate, relativeDays);
     state = state.copyWith(relativeDays: relativeDays);
+    _optionsController.add(state.toOptions());
     EventStream.shared.emit(const MapMarkerReloadEvent());
   }
 
   @override
   MapState build() {
+    ref.onDispose(_optionsController.close);
     final mapConfig = ref.read(appConfigProvider.select((config) => config.map));
     return MapState(
       themeMode: mapConfig.themeMode,

mobile/lib/utils/migration.dart

@@ -11,17 +11,20 @@ import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/settings_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
+import 'package:immich_mobile/domain/services/feature_message.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 
 const int targetVersion = 26;
 
 Future<void> migrateDatabaseIfNeeded(Drift drift) async {
-  final int version = Store.get(StoreKey.version, targetVersion);
+  final int? storedVersion = Store.tryGet(StoreKey.version);
+  final version = storedVersion ?? targetVersion;
 
   if (version < 25) {
     await _migrateTo25();
@@ -31,6 +34,10 @@ Future<void> migrateDatabaseIfNeeded(Drift drift) async {
     await _migrateTo26(drift);
   }
 
+  if (storedVersion == null) {
+    await FeatureMessageService(SettingsRepository.instance).markSeen();
+  }
+
   await Store.put(StoreKey.version, targetVersion);
   return;
 }

mobile/lib/widgets/settings/asset_viewer_settings/image_viewer_quality_setting.dart

@@ -12,11 +12,7 @@ class ImageViewerQualitySetting extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final isPreview = useState(ref.read(appConfigProvider).image.loadPreview);
     final isOriginal = useState(ref.read(appConfigProvider).image.loadOriginal);
-    useValueChanged<bool, void>(isPreview.value, (_, __) {
-      ref.read(settingsProvider).write(.imageLoadPreview, isPreview.value);
-    });
     useValueChanged<bool, void>(isOriginal.value, (_, __) {
       ref.read(settingsProvider).write(.imageLoadOriginal, isOriginal.value);
     });
@@ -29,12 +25,6 @@ class ImageViewerQualitySetting extends HookConsumerWidget {
           icon: Icons.image_outlined,
           subtitle: "setting_image_viewer_help".t(context: context),
         ),
-        SettingsSwitchListTile(
-          valueNotifier: isPreview,
-          title: "setting_image_viewer_preview_title".t(context: context),
-          subtitle: "setting_image_viewer_preview_subtitle".t(context: context),
-          onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
-        ),
         SettingsSwitchListTile(
           valueNotifier: isOriginal,
           title: "setting_image_viewer_original_title".t(context: context),

mobile/openapi/.openapi-generator/VERSION

@@ -1 +1 @@
-7.22.0
+7.23.0

mobile/openapi/README.md

@@ -4,7 +4,7 @@ Immich API
 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: 3.0.3
-- Generator version: 7.22.0
+- Generator version: 7.23.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen
 
 ## Requirements

mobile/openapi/lib/api_client.dart

@@ -97,9 +97,9 @@ class ApiClient {
       if (nullableHeaderParams != null) {
         request.headers.addAll(nullableHeaderParams);
       }
-      if (msgBody is String) {
+      if (msgBody is String && msgBody.isNotEmpty) {
         request.body = msgBody;
-      } else if (msgBody is List<int>) {
+      } else if (msgBody is List<int> && msgBody.isNotEmpty) {
         request.bodyBytes = msgBody;
       } else if (msgBody is Map<String, String>) {
         request.bodyFields = msgBody;

mobile/openapi/lib/model/time_bucket_asset_response_dto.dart

@@ -35,16 +35,16 @@ class TimeBucketAssetResponseDto {
   });
 
   /// Array of city names extracted from EXIF GPS data
-  Optional<List<String>?> city;
+  Optional<List<String?>?> city;
 
   /// Array of country names extracted from EXIF GPS data
-  Optional<List<String>?> country;
+  Optional<List<String?>?> country;
 
   /// Array of UTC timestamps when each asset was originally uploaded to Immich
   List<String> createdAt;
 
   /// Array of video/gif durations in milliseconds (null for static images)
-  List<int> duration;
+  List<int?> duration;
 
   /// Array of file creation timestamps in UTC
   List<String> fileCreatedAt;
@@ -62,22 +62,22 @@ class TimeBucketAssetResponseDto {
   List<bool> isTrashed;
 
   /// Array of latitude coordinates extracted from EXIF GPS data
-  Optional<List<num>?> latitude;
+  Optional<List<num?>?> latitude;
 
   /// Array of live photo video asset IDs (null for non-live photos)
-  List<String> livePhotoVideoId;
+  List<String?> livePhotoVideoId;
 
   /// Array of UTC offset hours at the time each photo was taken. Positive values are east of UTC, negative values are west of UTC. Values may be fractional (e.g., 5.5 for +05:30, -9.75 for -09:45). Applying this offset to 'fileCreatedAt' will give you the time the photo was taken from the photographer's perspective.
   List<num> localOffsetHours;
 
   /// Array of longitude coordinates extracted from EXIF GPS data
-  Optional<List<num>?> longitude;
+  Optional<List<num?>?> longitude;
 
   /// Array of owner IDs for each asset
   List<String> ownerId;
 
   /// Array of projection types for 360° content (e.g., \"EQUIRECTANGULAR\", \"CUBEFACE\", \"CYLINDRICAL\")
-  List<String> projectionType;
+  List<String?> projectionType;
 
   /// Array of aspect ratios (width/height) for each asset
   List<num> ratio;
@@ -86,7 +86,7 @@ class TimeBucketAssetResponseDto {
   Optional<List<List<String>?>?> stack;
 
   /// Array of BlurHash strings for generating asset previews (base64 encoded)
-  List<String> thumbhash;
+  List<String?> thumbhash;
 
   /// Array of visibility statuses for each asset (e.g., ARCHIVE, TIMELINE, HIDDEN, LOCKED)
   List<AssetVisibility> visibility;

mobile/test/unit/presentation/action_buttons/share_action_button_test.dart

@@ -0,0 +1,117 @@
+import 'dart:async';
+
+import 'package:drift/drift.dart';
+import 'package:drift/native.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.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/settings_key.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
+import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+
+import '../../factories/remote_asset_factory.dart';
+import '../presentation_context.dart';
+
+class _RecordingActionNotifier extends ActionNotifier {
+  final List<ShareAssetType> sharedFileTypes = [];
+
+  @override
+  void build() {}
+
+  @override
+  Future<ActionResult> shareAssets(
+    ActionSource source,
+    BuildContext context, {
+    ShareAssetType fileType = ShareAssetType.original,
+    Completer<void>? cancelCompleter,
+    void Function(double progress)? onAssetDownloadProgress,
+  }) async {
+    sharedFileTypes.add(fileType);
+    return const ActionResult(count: 1, success: true);
+  }
+}
+
+class _FakeAssetViewerNotifier extends AssetViewerStateNotifier {
+  final BaseAsset asset;
+
+  _FakeAssetViewerNotifier(this.asset);
+
+  @override
+  AssetViewerState build() => AssetViewerState(currentAsset: asset);
+}
+
+void main() {
+  late PresentationContext context;
+  late _RecordingActionNotifier actionNotifier;
+
+  setUpAll(() async {
+    final db = Drift(DatabaseConnection(NativeDatabase.memory(), closeStreamsSynchronously: true));
+    await SettingsRepository.ensureInitialized(db);
+  });
+
+  setUp(() async {
+    context = await PresentationContext.create();
+    actionNotifier = _RecordingActionNotifier();
+    await SettingsRepository.instance.clear([SettingsKey.shareFileType]);
+  });
+
+  tearDown(() {
+    context.dispose();
+  });
+
+  Future<void> pumpShareButton(WidgetTester tester) async {
+    final asset = RemoteAssetFactory.create(ownerId: context.currentUser.id);
+    await tester.pumpTestWidget(
+      context,
+      const ShareActionButton(source: ActionSource.viewer),
+      overrides: [
+        actionProvider.overrideWith(() => actionNotifier),
+        assetViewerProvider.overrideWith(() => _FakeAssetViewerNotifier(asset)),
+      ],
+    );
+  }
+
+  Future<void> longPressAndPickPreview(WidgetTester tester) async {
+    await tester.longPress(find.byType(BaseActionButton));
+    await tester.pumpAndSettle();
+    await tester.tap(find.byIcon(Icons.photo_size_select_large_rounded));
+    await tester.pumpAndSettle();
+  }
+
+  group('ShareActionButton', () {
+    testWidgets('single press shares with the configured default quality', (tester) async {
+      await pumpShareButton(tester);
+
+      await tester.tap(find.byType(BaseActionButton));
+      await tester.pumpAndSettle();
+
+      expect(actionNotifier.sharedFileTypes, [ShareAssetType.original]);
+    });
+
+    testWidgets('long press shares with the quality picked in the dialog', (tester) async {
+      await pumpShareButton(tester);
+
+      await longPressAndPickPreview(tester);
+
+      expect(actionNotifier.sharedFileTypes, [ShareAssetType.preview]);
+    });
+
+    testWidgets('quality picked on long press is a one-time choice and does not change the default', (tester) async {
+      await pumpShareButton(tester);
+
+      await longPressAndPickPreview(tester);
+      expect(actionNotifier.sharedFileTypes, [ShareAssetType.preview]);
+
+      await tester.tap(find.byType(BaseActionButton));
+      await tester.pumpAndSettle();
+
+      expect(actionNotifier.sharedFileTypes, [ShareAssetType.preview, ShareAssetType.original]);
+      expect(SettingsRepository.instance.appConfig.share.fileType, ShareAssetType.original);
+    });
+  });
+}

open-api/bin/generate-dart-sdk.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-OPENAPI_GENERATOR_VERSION=v7.22.0
+OPENAPI_GENERATOR_VERSION=v7.23.0
 
 set -euo pipefail
 
@@ -23,7 +23,6 @@ patch --no-backup-if-mismatch -u ../mobile/openapi/lib/api_client.dart <./patch/
 patch --no-backup-if-mismatch -u ../mobile/openapi/lib/api.dart <./patch/api.dart.patch
 patch --no-backup-if-mismatch -u ../mobile/openapi/pubspec.yaml <./patch/pubspec_immich_mobile.yaml.patch
 patch --no-backup-if-mismatch -u ../mobile/openapi/lib/model/asset_edit_action_item_dto.dart <./patch/asset_edit_action_item_dto.dart.patch
-patch --no-backup-if-mismatch -u ../mobile/openapi/lib/model/time_bucket_asset_response_dto.dart <./patch/time_bucket_asset_response_dto.dart.patch
 # Don't include analysis_options.yaml for the generated openapi files
 # so that language servers can properly exclude the mobile/openapi directory
 rm ../mobile/openapi/analysis_options.yaml

open-api/openapitools.json

@@ -2,6 +2,6 @@
   "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "spaces": 2,
   "generator-cli": {
-    "version": "7.22.0"
+    "version": "7.23.0"
   }
 }

open-api/patch/api_client.dart.patch

@@ -1,96 +1,30 @@
 @@ -13,7 +13,7 @@
  class ApiClient {
    ApiClient({this.basePath = '/api', this.authentication,});
- 
+
 -  final String basePath;
 +  String basePath;
    final Authentication? authentication;
- 
+
    var _client = Client();
-@@ -44,8 +44,9 @@
-     Object? body,
-     Map<String, String> headerParams,
-     Map<String, String> formParams,
--    String? contentType,
--  ) async {
-+    String? contentType, {
-+    Future<void>? abortTrigger,
-+  }) async {
-     await authentication?.applyToParams(queryParams, headerParams);
- 
-     headerParams.addAll(_defaultHeaderMap);
-@@ -63,7 +64,7 @@
-         body is MultipartFile && (contentType == null ||
-         !contentType.toLowerCase().startsWith('multipart/form-data'))
-       ) {
--        final request = StreamedRequest(method, uri);
-+        final request = AbortableStreamedRequest(method, uri, abortTrigger: abortTrigger);
-         request.headers.addAll(headerParams);
-         request.contentLength = body.length;
-         body.finalize().listen(
-@@ -78,7 +79,7 @@
-       }
- 
-       if (body is MultipartRequest) {
--        final request = MultipartRequest(method, uri);
-+        final request = AbortableMultipartRequest(method, uri, abortTrigger: abortTrigger);
-         request.fields.addAll(body.fields);
-         request.files.addAll(body.files);
-         request.headers.addAll(body.headers);
-@@ -92,14 +93,19 @@
-         : await serializeAsync(body);
-       final nullableHeaderParams = headerParams.isEmpty ? null : headerParams;
- 
--      switch(method) {
--        case 'POST': return await _client.post(uri, headers: nullableHeaderParams, body: msgBody,);
--        case 'PUT': return await _client.put(uri, headers: nullableHeaderParams, body: msgBody,);
--        case 'DELETE': return await _client.delete(uri, headers: nullableHeaderParams, body: msgBody,);
--        case 'PATCH': return await _client.patch(uri, headers: nullableHeaderParams, body: msgBody,);
--        case 'HEAD': return await _client.head(uri, headers: nullableHeaderParams,);
--        case 'GET': return await _client.get(uri, headers: nullableHeaderParams,);
-+      final request = AbortableRequest(method, uri, abortTrigger: abortTrigger);
-+      if (nullableHeaderParams != null) {
-+        request.headers.addAll(nullableHeaderParams);
-       }
-+      if (msgBody is String) {
-+        request.body = msgBody;
-+      } else if (msgBody is List<int>) {
-+        request.bodyBytes = msgBody;
-+      } else if (msgBody is Map<String, String>) {
-+        request.bodyFields = msgBody;
-+      }
-+      final response = await _client.send(request);
-+      return Response.fromStream(response);
-     } on SocketException catch (error, trace) {
-       throw ApiException.withInner(
-         HttpStatus.badRequest,
-@@ -136,26 +146,21 @@
-         trace,
-       );
-     }
--
--    throw ApiException(
--      HttpStatus.badRequest,
--      'Invalid HTTP operation: $method $path',
--    );
+@@ -143,19 +143,19 @@
+     );
    }
- 
+
 -  Future<dynamic> deserializeAsync(String value, String targetType, {bool growable = false,}) async =>
 +  Future<dynamic> deserializeAsync(String value, String targetType, {bool growable = false,}) =>
      // ignore: deprecated_member_use_from_same_package
      deserialize(value, targetType, growable: growable);
- 
+
    @Deprecated('Scheduled for removal in OpenAPI Generator 6.x. Use deserializeAsync() instead.')
 -  dynamic deserialize(String value, String targetType, {bool growable = false,}) {
 +  Future<dynamic> deserialize(String value, String targetType, {bool growable = false,}) async {
      // Remove all spaces. Necessary for regular expressions as well.
      targetType = targetType.replaceAll(' ', ''); // ignore: parameter_assignments
- 
+
      // If the expected target type is String, nothing to do...
      return targetType == 'String'
        ? value
 -      : fromJson(json.decode(value), targetType, growable: growable);
 +      : fromJson(await compute((String j) => json.decode(j), value), targetType, growable: growable);
    }
- 
-   // ignore: deprecated_member_use_from_same_package

open-api/patch/time_bucket_asset_response_dto.dart.patch

@@ -1,9 +0,0 @@
-@@ -83,7 +83,7 @@
-   List<num> ratio;
- 
-   /// Array of stack information as [stackId, assetCount] tuples (null for non-stacked assets)
--  Optional<List<List<String>>?> stack;
-+  Optional<List<List<String>?>?> stack;
- 
-   /// Array of BlurHash strings for generating asset previews (base64 encoded)
-   List<String> thumbhash;

open-api/templates/mobile/api.mustache.patch

@@ -1,11 +1,8 @@
 --- api.mustache
 +++ api.mustache.modified
-@@ -49,9 +49,9 @@
-   ///
-     {{/-last}}
+@@ -51,7 +51,7 @@
    {{/allParams}}
--  Future<Response> {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}}? {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async {
-+  Future<Response> {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}}, {{/required}}{{/allParams}}{ {{#allParams}}{{^required}}{{{dataType}}}? {{{paramName}}}, {{/required}}{{/allParams}}Future<void>? abortTrigger, }) async {
+   Future<Response> {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}}? {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async {
      // ignore: prefer_const_declarations
 -    final path = r'{{{path}}}'{{#pathParams}}
 +    final apiPath = r'{{{path}}}'{{#pathParams}}
@@ -21,7 +18,7 @@
      {{#formParams}}
      {{^isFile}}
      if ({{{paramName}}} != null) {
-@@ -121,13 +121,14 @@
+@@ -121,7 +121,7 @@
      {{/isMultipart}}
  
      return apiClient.invokeAPI(
@@ -30,21 +27,3 @@
        '{{{httpMethod}}}',
        queryParams,
        postBody,
-       headerParams,
-       formParams,
-       contentTypes.isEmpty ? null : contentTypes.first,
-+      abortTrigger: abortTrigger,
-     );
-   }
- 
-@@ -161,8 +162,8 @@
-   ///
-     {{/-last}}
-   {{/allParams}}
--  Future<{{#returnType}}{{{.}}}?{{/returnType}}{{^returnType}}void{{/returnType}}> {{{nickname}}}({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}}? {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async {
--    final response = await {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}} {{#allParams}}{{^required}}{{{paramName}}}: {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} {{/hasOptionalParams}});
-+  Future<{{#returnType}}{{{.}}}?{{/returnType}}{{^returnType}}void{{/returnType}}> {{{nickname}}}({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}}, {{/required}}{{/allParams}}{ {{#allParams}}{{^required}}{{{dataType}}}? {{{paramName}}}, {{/required}}{{/allParams}}Future<void>? abortTrigger, }) async {
-+    final response = await {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{paramName}}}, {{/required}}{{/allParams}}{{#allParams}}{{^required}}{{{paramName}}}: {{{paramName}}}, {{/required}}{{/allParams}}abortTrigger: abortTrigger,);
-     if (response.statusCode >= HttpStatus.badRequest) {
-       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-     }

open-api/templates/mobile/serialization/native/native_class.mustache.patch

@@ -26,155 +26,3 @@
        return {{{classname}}}(
    {{#vars}}
      {{#isDateTime}}
-@@ -195,48 +181,98 @@
-         {{#complexType}}
-           {{#isArray}}
-             {{#items.isArray}}
-+              {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] is List
-+          ? (json[r'{{{baseName}}}'] as List).map((e) =>
-+              {{#items.complexType}}
-+              e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.complexType}}>[]{{/items.isNullable}} : {{items.complexType}}.listFromJson(e){{#uniqueItems}}.toSet(){{/uniqueItems}}
-+              {{/items.complexType}}
-+              {{^items.complexType}}
-+              e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (e as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false)
-+              {{/items.complexType}}
-+            ).toList()
-+          :  {{#isNullable}}null{{/isNullable}}{{^isNullable}}const []{{/isNullable}}) : const Optional.absent(),
-+              {{/vendorExtensions.x-is-optional}}
-+              {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: json[r'{{{baseName}}}'] is List
-           ? (json[r'{{{baseName}}}'] as List).map((e) =>
-               {{#items.complexType}}
--              {{items.complexType}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}}
-+              e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.complexType}}>[]{{/items.isNullable}} : {{items.complexType}}.listFromJson(e){{#uniqueItems}}.toSet(){{/uniqueItems}}
-               {{/items.complexType}}
-               {{^items.complexType}}
--              e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const  <{{items.items.dataType}}>[]{{/items.isNullable}} : (e as List).cast<{{items.items.dataType}}>()
-+              e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (e as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false)
-               {{/items.complexType}}
-             ).toList()
-           :  {{#isNullable}}null{{/isNullable}}{{^isNullable}}const []{{/isNullable}},
-+              {{/vendorExtensions.x-is-optional}}
-             {{/items.isArray}}
-             {{^items.isArray}}
-+              {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{{complexType}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}}) : const Optional.absent(),
-+              {{/vendorExtensions.x-is-optional}}
-+              {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: {{{complexType}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}},
-+              {{/vendorExtensions.x-is-optional}}
-             {{/items.isArray}}
-           {{/isArray}}
-           {{^isArray}}
-             {{#isMap}}
-               {{#items.isArray}}
-+                {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] == null ? null
-+                  {{#items.complexType}}
-+            : {{items.complexType}}.mapListFromJson(json[r'{{{baseName}}}'])) : const Optional.absent(),
-+                  {{/items.complexType}}
-+                  {{^items.complexType}}
-+            : (json[r'{{{baseName}}}'] as Map<String, dynamic>).map((k, v) => MapEntry(k, v == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (v as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false)))) : const Optional.absent(),
-+                  {{/items.complexType}}
-+                {{/vendorExtensions.x-is-optional}}
-+                {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: json[r'{{{baseName}}}'] == null
-           ? {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}
--                {{#items.complexType}}
-+                  {{#items.complexType}}
-             : {{items.complexType}}.mapListFromJson(json[r'{{{baseName}}}']),
--                {{/items.complexType}}
--                {{^items.complexType}}
--            : (json[r'{{{baseName}}}'] as Map<String, dynamic>).map((k, v) => MapEntry(k, v == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}>[]{{/items.isNullable}} : (v as List).cast<{{items.items.dataType}}>())),
--                {{/items.complexType}}
-+                  {{/items.complexType}}
-+                  {{^items.complexType}}
-+            : (json[r'{{{baseName}}}'] as Map<String, dynamic>).map((k, v) => MapEntry(k, v == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (v as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false))),
-+                  {{/items.complexType}}
-+                {{/vendorExtensions.x-is-optional}}
-               {{/items.isArray}}
-               {{^items.isArray}}
-                 {{#items.isMap}}
-                   {{#items.complexType}}
-+                    {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{items.complexType}}.mapFromJson(json[r'{{{baseName}}}'])) : const Optional.absent(),
-+                    {{/vendorExtensions.x-is-optional}}
-+                    {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: {{items.complexType}}.mapFromJson(json[r'{{{baseName}}}']),
-+                    {{/vendorExtensions.x-is-optional}}
-                   {{/items.complexType}}
-                   {{^items.complexType}}
-+                    {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapCastOfType<String, dynamic>(json, r'{{{baseName}}}')) : const Optional.absent(),
-+                    {{/vendorExtensions.x-is-optional}}
-+                    {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: mapCastOfType<String, dynamic>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
-+                    {{/vendorExtensions.x-is-optional}}
-                   {{/items.complexType}}
-                 {{/items.isMap}}
-                 {{^items.isMap}}
-                   {{#items.complexType}}
-+                    {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{{items.complexType}}}.mapFromJson(json[r'{{{baseName}}}'])) : const Optional.absent(),
-+                    {{/vendorExtensions.x-is-optional}}
-+                    {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: {{{items.complexType}}}.mapFromJson(json[r'{{{baseName}}}']),
-+                    {{/vendorExtensions.x-is-optional}}
-                   {{/items.complexType}}
-                   {{^items.complexType}}
-+                    {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapCastOfType<String, {{items.dataType}}>(json, r'{{{baseName}}}')) : const Optional.absent(),
-+                    {{/vendorExtensions.x-is-optional}}
-+                    {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: mapCastOfType<String, {{items.dataType}}>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
-+                    {{/vendorExtensions.x-is-optional}}
-                   {{/items.complexType}}
-                 {{/items.isMap}}
-               {{/items.isArray}}
-@@ -259,23 +295,45 @@
-         {{^complexType}}
-           {{#isArray}}
-             {{#isEnum}}
-+              {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{{items.datatypeWithEnum}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}}) : const Optional.absent(),
-+              {{/vendorExtensions.x-is-optional}}
-+              {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: {{{items.datatypeWithEnum}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}},
-+              {{/vendorExtensions.x-is-optional}}
-             {{/isEnum}}
-             {{^isEnum}}
-+              {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] is Iterable
-+            ? (json[r'{{{baseName}}}'] as Iterable).cast<{{{items.datatype}}}>().{{#uniqueItems}}toSet(){{/uniqueItems}}{{^uniqueItems}}toList(growable: false){{/uniqueItems}}
-+            : {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}) : const Optional.absent(),
-+              {{/vendorExtensions.x-is-optional}}
-+              {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: json[r'{{{baseName}}}'] is Iterable
-             ? (json[r'{{{baseName}}}'] as Iterable).cast<{{{items.datatype}}}>().{{#uniqueItems}}toSet(){{/uniqueItems}}{{^uniqueItems}}toList(growable: false){{/uniqueItems}}
-             : {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}},
-+              {{/vendorExtensions.x-is-optional}}
-             {{/isEnum}}
-           {{/isArray}}
-           {{^isArray}}
-             {{#isMap}}
-+              {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapCastOfType<String, {{{items.datatype}}}>(json, r'{{{baseName}}}')) : const Optional.absent(),
-+              {{/vendorExtensions.x-is-optional}}
-+              {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: mapCastOfType<String, {{{items.datatype}}}>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
-+              {{/vendorExtensions.x-is-optional}}
-             {{/isMap}}
-             {{^isMap}}
-               {{#isNumber}}
-+                {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] == null ? null : num.parse('${json[r'{{{baseName}}}']}')) : const Optional.absent(),
-+                {{/vendorExtensions.x-is-optional}}
-+                {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: {{#isNullable}}json[r'{{{baseName}}}'] == null
-             ? {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}
-             : {{/isNullable}}{{{datatypeWithEnum}}}.parse('${json[r'{{{baseName}}}']}'),
-+                {{/vendorExtensions.x-is-optional}}
-               {{/isNumber}}
-               {{^isNumber}}
-                 {{#vendorExtensions.x-original-is-integer}}

packages/plugin-core/manifest.json

@@ -103,6 +103,12 @@
             "default": false,
             "title": "Case sensitive",
             "description": "Whether matching should be case-sensitive"
+          },
+          "usePath": {
+            "type": "boolean",
+            "default": false,
+            "title": "Use path",
+            "description": "Match the full path on the server instead of the original filename"
           }
         },
         "required": ["pattern"]

packages/plugin-core/src/index.ts

@@ -54,11 +54,11 @@ const methods = wrapper<Manifest>({
   },
 
   assetFileFilter: ({ data, config }) => {
-    const { pattern, matchType = 'contains', caseSensitive = false } = config;
+    const { pattern, matchType = 'contains', caseSensitive = false, usePath = false } = config;
 
     const { asset } = data;
 
-    const fileName = asset.originalFileName || '';
+    const fileName = usePath ? asset.originalPath : asset.originalFileName;
     const searchName = caseSensitive ? fileName : fileName.toLowerCase();
     const searchPattern = caseSensitive ? pattern : pattern.toLowerCase();
 

server/src/queries/workflow.repository.sql

@@ -25,6 +25,8 @@ select
           inner join "plugin" on "plugin"."id" = "plugin_method"."pluginId"
         where
           "workflow"."id" = "workflow_step"."workflowId"
+        order by
+          "workflow_step"."order" asc
       ) as agg
   ) as "steps"
 from
@@ -57,6 +59,8 @@ select
           inner join "plugin" on "plugin"."id" = "plugin_method"."pluginId"
         where
           "workflow"."id" = "workflow_step"."workflowId"
+        order by
+          "workflow_step"."order" asc
       ) as agg
   ) as "steps"
 from

server/src/repositories/workflow.repository.ts

@@ -39,7 +39,8 @@ export class WorkflowRepository {
               'plugin_method.name as methodName',
               'workflow_step.config',
               'workflow_step.enabled',
-            ]),
+            ])
+            .orderBy('workflow_step.order', 'asc'),
         ).as('steps'),
       ]);
   }

web/src/lib/components/shared-components/context-menu/ContextMenu.svelte

@@ -64,7 +64,7 @@
 <div
   bind:this={menuScrollView}
   class={[
-    'fixed z-1 w-max max-w-75 min-w-50 immich-scrollbar rounded-lg bg-slate-100 shadow-lg duration-250 ease-in-out',
+    'fixed z-70 w-max max-w-75 min-w-50 immich-scrollbar rounded-lg bg-slate-100 shadow-lg duration-250 ease-in-out',
     position.needScrollBar ? 'overflow-auto' : 'overflow-hidden',
   ]}
   style:left="{position.left}px"

web/src/lib/utils/file-uploader.ts

@@ -63,6 +63,8 @@ export const openFilePicker = async (options: FilePickerParam = {}) => {
       fileSelector.addEventListener(
         'change',
         (e: Event) => {
+          fileSelector.remove();
+
           const target = e.target as HTMLInputElement;
           if (!target.files) {
             return;
@@ -74,6 +76,11 @@ export const openFilePicker = async (options: FilePickerParam = {}) => {
         { passive: true },
       );
 
+      fileSelector.addEventListener('cancel', () => fileSelector.remove(), { passive: true });
+
+      // Safari requires the file selector to be mounted
+      fileSelector.hidden = true;
+      document.body.append(fileSelector);
       fileSelector.click();
     } catch (error) {
       console.log('Error selecting file', error);

web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import { afterNavigate, goto, invalidateAll } from '$app/navigation';
   import ActionMenuItem from '$lib/components/ActionMenuItem.svelte';
+  import OnEvents from '$lib/components/OnEvents.svelte';
   import UserPageLayout, { headerId } from '$lib/components/layouts/UserPageLayout.svelte';
   import ButtonContextMenu from '$lib/components/shared-components/context-menu/ButtonContextMenu.svelte';
   import GalleryViewer from '$lib/components/shared-components/gallery-viewer/GalleryViewer.svelte';
@@ -92,6 +93,8 @@
     </Sidebar>
   {/snippet}
 
+  <OnEvents onAssetsDelete={invalidateAll} />
+
   <Breadcrumbs node={data.tree} icon={mdiFolderHome} title={$t('folders')} getLink={getLinkForPath} />
 
   <section class="mt-2 h-[calc(100%-(--spacing(25)))] immich-scrollbar overflow-auto">