Merge branch 'main' of https://github.com/immich-app/immich into chore/originals-in-asset-files

wip
Merge branch 'main' of https://github.com/immich-app/immich into feat/sidecar-asset-files
2026-05-18 03:10:24 +03:00 · 2025-12-04 11:30:35 +01:00 · 2025-12-02 19:46:59 +01:00 · 2025-11-28 01:22:36 +01:00 · 2025-11-28 00:30:42 +01:00 · 2025-10-31 01:00:09 +01:00
143 changed files with 1908 additions and 11272 deletions
@@ -4,6 +4,6 @@
    "format:fix": "prettier --write ."
  },
  "devDependencies": {
-    "prettier": "^3.7.4"
+    "prettier": "^3.5.3"
  }
 }
@@ -222,7 +222,6 @@ jobs:
        uses: ruby/setup-ruby@v1
        with:
          ruby-version: '3.3'
-          bundler-cache: true
          working-directory: ./mobile/ios

      - name: Install CocoaPods dependencies
@@ -230,6 +229,13 @@ jobs:
        run: |
          pod install

+      - name: Install Fastlane
+        working-directory: ./mobile/ios
+        run: |
+          gem install bundler
+          bundle config set --local path 'vendor/bundle'
+          bundle install
+
      - name: Create API Key
        env:
          API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}
@@ -105,7 +105,7 @@ jobs:

      - name: Generate docker image tags
        id: metadata
-        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
+        uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
        with:
          flavor: |
            latest=false
@@ -35,7 +35,7 @@ jobs:
    needs: [get_body, should_run]
    if: ${{ needs.should_run.outputs.should_run == 'true' }}
    container:
-      image: ghcr.io/immich-app/mdq:main@sha256:237cdae7783609c96f18037a513d38088713cf4a2e493a3aa136d0c45490749a
+      image: ghcr.io/immich-app/mdq:main@sha256:73a05fc805dfd3bd29bebc08442aedfec5c419c5ad3421ec73edc5647233891a
    outputs:
      checked: ${{ steps.get_checkbox.outputs.checked }}
    steps:
@@ -57,7 +57,7 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
+        uses: github/codeql-action/init@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
        with:
          languages: ${{ matrix.language }}
          # If you wish to specify custom queries, you can do so here or in a config file.
@@ -70,7 +70,7 @@ jobs:
      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
      # If this step fails, then you should remove it and run the build manually (see below)
      - name: Autobuild
-        uses: github/codeql-action/autobuild@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
+        uses: github/codeql-action/autobuild@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4

      # ℹ️ Command-line programs to run using the OS shell.
      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -83,6 +83,6 @@ jobs:
      #   ./location_of_script_within_repo/buildscript.sh

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
+        uses: github/codeql-action/analyze@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
        with:
          category: '/language:${{matrix.language}}'
@@ -572,7 +572,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}
      - name: Install uv
        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        # TODO: add caching when supported (https://github.com/actions/setup-python/pull/818)
        # with:
        #   python-version: 3.11
@@ -31,7 +31,7 @@
    "eslint-plugin-unicorn": "^62.0.0",
    "globals": "^16.0.0",
    "mock-fs": "^5.2.0",
-    "prettier": "^3.7.4",
+    "prettier": "^3.2.5",
    "prettier-plugin-organize-imports": "^4.0.0",
    "typescript": "^5.3.3",
    "typescript-eslint": "^8.28.0",
@@ -58,6 +58,10 @@ services:
      IMMICH_THIRD_PARTY_BUG_FEATURE_URL: https://github.com/immich-app/immich/issues
      IMMICH_THIRD_PARTY_DOCUMENTATION_URL: https://docs.immich.app
      IMMICH_THIRD_PARTY_SUPPORT_URL: https://docs.immich.app/community-guides
+    ulimits:
+      nofile:
+        soft: 1048576
+        hard: 1048576
    ports:
      - 9230:9230
      - 9231:9231
@@ -96,6 +100,10 @@ services:
      - app-node_modules:/usr/src/app/node_modules
      - sveltekit:/usr/src/app/web/.svelte-kit
      - coverage:/usr/src/app/web/coverage
+    ulimits:
+      nofile:
+        soft: 1048576
+        hard: 1048576
    restart: unless-stopped
    depends_on:
      immich-server:
@@ -41,7 +41,7 @@ By default, Immich will keep the last 14 database dumps and create a new dump ev

 #### Trigger Dump

-You are able to trigger a database dump in the [admin job status page](http://my.immich.app/admin/queues).
+You are able to trigger a database dump in the [admin job status page](http://my.immich.app/admin/jobs-status).
 Visit the page, open the "Create job" modal from the top right, select "Create Database Dump" and click "Confirm".
 A job will run and trigger a dump, you can verify this worked correctly by checking the logs or the `backups/` folder.
 This dumps will count towards the last `X` dumps that will be kept based on your settings.
@@ -21,9 +21,6 @@ server {
    # allow large file uploads
    client_max_body_size 50000M;

-    # disable buffering uploads to prevent OOM on reverse proxy server and make uploads twice as fast (no pause)
-    proxy_request_buffering off;
-
    # Set headers
    proxy_set_header Host              $host;
    proxy_set_header X-Real-IP         $remote_addr;
@@ -32,6 +29,8 @@ server {

    # enable websockets: http://nginx.org/en/docs/http/websocket.html
    proxy_http_version 1.1;
+    proxy_set_header   Upgrade    $http_upgrade;
+    proxy_set_header   Connection "upgrade";
    proxy_redirect     off;

    # set timeout
@@ -41,8 +40,6 @@ server {

    location / {
        proxy_pass http://<backend_url>:2283;
-        proxy_set_header   Upgrade    $http_upgrade;
-        proxy_set_header   Connection "upgrade";
    }

    # useful when using Let's Encrypt http-01 challenge
@@ -48,6 +48,7 @@ You can access the web from `http://your-machine-ip:3000` or `http://localhost:3
 **Notes:**

 - The "web" development container runs with uid 1000. If that uid does not have read/write permissions on the mounted volumes, you may encounter errors
+- In case of rootless docker setup, you need to use root within the container, otherwise you will encounter read/write permission related errors, see comments in `docker/docker-compose.dev.yml`.

 #### Connect web to a remote backend

@@ -1222,4 +1222,4 @@ Feel free to make a feature request if there's a model you want to use that we d
 [huggingface-clip]: https://huggingface.co/collections/immich-app/clip-654eaefb077425890874cd07
 [huggingface-multilingual-clip]: https://huggingface.co/collections/immich-app/multilingual-clip-654eb08c2382f591eeb8c2a7
 [smart-search-settings]: https://my.immich.app/admin/system-settings?isOpen=machine-learning+smart-search
-[job-status-page]: https://my.immich.app/admin/queues
+[job-status-page]: https://my.immich.app/admin/jobs-status
@@ -53,7 +53,7 @@ Version mismatches between both hosts may cause bugs and instability, so remembe

 Adding a new URL to the settings is recommended over replacing the existing URL. This is because it will allow machine learning tasks to be processed successfully when the remote server is down by falling back to the local machine learning container. If you do not want machine learning tasks to be processed locally when the remote server is not available, you can instead replace the existing URL and only provide the remote container's URL. If doing this, you can remove the `immich-machine-learning` section of the local `docker-compose.yml` file to save resources, as this service will never be used.

-Do note that this will mean that Smart Search and Face Detection jobs will fail to be processed when the remote instance is not available. This in turn means that tasks dependent on these features—Duplicate Detection and Facial Recognition—will not run for affected assets. If this occurs, you must manually click the _Missing_ button next to Smart Search and Face Detection in the [Job Status](http://my.immich.app/admin/queues) page for the jobs to be retried.
+Do note that this will mean that Smart Search and Face Detection jobs will fail to be processed when the remote instance is not available. This in turn means that tasks dependent on these features—Duplicate Detection and Facial Recognition—will not run for affected assets. If this occurs, you must manually click the _Missing_ button next to Smart Search and Face Detection in the [Job Status](http://my.immich.app/admin/jobs-status) page for the jobs to be retried.

 ## Load balancing

@@ -38,7 +38,7 @@
    "@docusaurus/module-type-aliases": "~3.9.0",
    "@docusaurus/tsconfig": "^3.7.0",
    "@docusaurus/types": "^3.7.0",
-    "prettier": "^3.7.4",
+    "prettier": "^3.2.4",
    "typescript": "^5.1.6"
  },
  "browserslist": {
@@ -36,14 +36,14 @@
    "eslint-config-prettier": "^10.1.8",
    "eslint-plugin-prettier": "^5.1.3",
    "eslint-plugin-unicorn": "^62.0.0",
-    "exiftool-vendored": "^34.0.0",
+    "exiftool-vendored": "^33.0.0",
    "globals": "^16.0.0",
    "jose": "^5.6.3",
    "luxon": "^3.4.4",
    "oidc-provider": "^9.0.0",
    "pg": "^8.11.3",
    "pngjs": "^7.0.0",
-    "prettier": "^3.7.4",
+    "prettier": "^3.2.5",
    "prettier-plugin-organize-imports": "^4.0.0",
    "sharp": "^0.34.5",
    "socket.io-client": "^4.7.4",
@@ -1,6 +1,5 @@
 import { AssetMediaResponseDto, LoginResponseDto } from '@immich/sdk';
 import { readFile, writeFile } from 'node:fs/promises';
-import path from 'node:path';
 import { app, tempDir, utils } from 'src/utils';
 import request from 'supertest';
 import { beforeAll, describe, expect, it } from 'vitest';
@@ -44,11 +43,13 @@ describe('/download', () => {

      await writeFile(`${tempDir}/archive.zip`, body);
      await utils.unzip(`${tempDir}/archive.zip`, `${tempDir}/archive`);
-      const files = [{ id: asset1.id }, { id: asset2.id }];
-      for (const { id } of files) {
+      const files = [
+        { filename: 'example.png', id: asset1.id },
+        { filename: 'example+1.png', id: asset2.id },
+      ];
+      for (const { id, filename } of files) {
+        const bytes = await readFile(`${tempDir}/archive/${filename}`);
        const asset = await utils.getAssetInfo(admin.accessToken, id);
-        const bytes = await readFile(`${tempDir}/archive/${path.basename(asset.originalPath)}`);
-
        expect(utils.sha1(bytes)).toBe(asset.checksum);
      }
    });
@@ -7,7 +7,6 @@
  "action_common_update": "Update",
  "actions": "Actions",
  "active": "Active",
-  "active_count": "Active: {count}",
  "activity": "Activity",
  "activity_changed": "Activity is {enabled, select, true {enabled} other {disabled}}",
  "add": "Add",
@@ -78,6 +77,7 @@
    "exclusion_pattern_description": "Exclusion patterns lets you ignore files and folders when scanning your library. This is useful if you have folders that contain files you don't want to import, such as RAW files.",
    "export_config_as_json_description": "Download the current system config as a JSON file",
    "external_libraries_page_description": "Admin external library page",
+    "external_library_management": "External Library Management",
    "face_detection": "Face detection",
    "face_detection_description": "Detect the faces in assets using machine learning. For videos, only the thumbnail is considered. \"Refresh\" (re-)processes all assets. \"Reset\" additionally clears all current face data. \"Missing\" queues assets that haven't been processed yet. Detected faces will be queued for Facial Recognition after Face Detection is complete, grouping them into existing or new people.",
    "facial_recognition_job_description": "Group detected faces into people. This step runs after Face Detection is complete. \"Reset\" (re-)clusters all faces. \"Missing\" queues faces that don't have a person assigned.",
@@ -111,9 +111,10 @@
    "job_not_concurrency_safe": "This job is not concurrency-safe.",
    "job_settings": "Job Settings",
    "job_settings_description": "Manage job concurrency",
+    "job_status": "Job Status",
    "jobs_delayed": "{jobCount, plural, other {# delayed}}",
    "jobs_failed": "{jobCount, plural, other {# failed}}",
-    "jobs_over_time": "Jobs over time",
+    "jobs_page_description": "Admin jobs page",
    "library_created": "Created library: {library}",
    "library_deleted": "Library deleted",
    "library_details": "Library details",
@@ -276,14 +277,10 @@
    "password_settings_description": "Manage password login settings",
    "paths_validated_successfully": "All paths validated successfully",
    "person_cleanup_job": "Person cleanup",
-    "queue_details": "Queue Details",
-    "queues": "Job Queues",
-    "queues_page_description": "Admin job queues page",
    "quota_size_gib": "Quota Size (GiB)",
    "refreshing_all_libraries": "Refreshing all libraries",
    "registration": "Admin Registration",
    "registration_description": "Since you are the first user on the system, you will be assigned as the Admin and are responsible for administrative tasks, and additional users will be created by you.",
-    "remove_failed_jobs": "Remove failed jobs",
    "require_password_change_on_login": "Require user to change password on first login",
    "reset_settings_to_default": "Reset settings to default",
    "reset_settings_to_recent_saved": "Reset settings to the recent saved settings",
@@ -1105,7 +1102,6 @@
  "external_network_sheet_info": "When not on the preferred Wi-Fi network, the app will connect to the server through the first of the below URLs it can reach, starting from top to bottom",
  "face_unassigned": "Unassigned",
  "failed": "Failed",
-  "failed_count": "Failed: {count}",
  "failed_to_authenticate": "Failed to authenticate",
  "failed_to_load_assets": "Failed to load assets",
  "failed_to_load_folder": "Failed to load folder",
@@ -2213,7 +2209,6 @@
  "viewer_unstack": "Un-Stack",
  "visibility_changed": "Visibility changed for {count, plural, one {# person} other {# people}}",
  "waiting": "Waiting",
-  "waiting_count": "Waiting: {count}",
  "warning": "Warning",
  "week": "Week",
  "welcome": "Welcome",
@@ -3,7 +3,7 @@ experimental_monorepo_root = true
 [tools]
 node = "24.11.1"
 flutter = "3.35.7"
-pnpm = "10.24.0"
+pnpm = "10.22.0"
 terragrunt = "0.93.10"
 opentofu = "1.10.7"
 java = "25.0.1"
@@ -89,10 +89,7 @@ data class PlatformAsset (
  val height: Long? = null,
  val durationInSeconds: Long,
  val orientation: Long,
-  val isFavorite: Boolean,
-  val adjustmentTime: Long? = null,
-  val latitude: Double? = null,
-  val longitude: Double? = null
+  val isFavorite: Boolean
 )
 {
  companion object {
@@ -107,10 +104,7 @@ data class PlatformAsset (
      val durationInSeconds = pigeonVar_list[7] as Long
      val orientation = pigeonVar_list[8] as Long
      val isFavorite = pigeonVar_list[9] as Boolean
-      val adjustmentTime = pigeonVar_list[10] as Long?
-      val latitude = pigeonVar_list[11] as Double?
-      val longitude = pigeonVar_list[12] as Double?
-      return PlatformAsset(id, name, type, createdAt, updatedAt, width, height, durationInSeconds, orientation, isFavorite, adjustmentTime, latitude, longitude)
+      return PlatformAsset(id, name, type, createdAt, updatedAt, width, height, durationInSeconds, orientation, isFavorite)
    }
  }
  fun toList(): List<Any?> {
@@ -125,9 +119,6 @@ data class PlatformAsset (
      durationInSeconds,
      orientation,
      isFavorite,
-      adjustmentTime,
-      latitude,
-      longitude,
    )
  }
  override fun equals(other: Any?): Boolean {
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.ContentUris
 import android.content.Context
 import android.database.Cursor
+import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
 import android.util.Base64
@@ -140,9 +140,6 @@ struct PlatformAsset: Hashable {
  var durationInSeconds: Int64
  var orientation: Int64
  var isFavorite: Bool
-  var adjustmentTime: Int64? = nil
-  var latitude: Double? = nil
-  var longitude: Double? = nil


  // swift-format-ignore: AlwaysUseLowerCamelCase
@@ -157,9 +154,6 @@ struct PlatformAsset: Hashable {
    let durationInSeconds = pigeonVar_list[7] as! Int64
    let orientation = pigeonVar_list[8] as! Int64
    let isFavorite = pigeonVar_list[9] as! Bool
-    let adjustmentTime: Int64? = nilOrValue(pigeonVar_list[10])
-    let latitude: Double? = nilOrValue(pigeonVar_list[11])
-    let longitude: Double? = nilOrValue(pigeonVar_list[12])

    return PlatformAsset(
      id: id,
@@ -171,10 +165,7 @@ struct PlatformAsset: Hashable {
      height: height,
      durationInSeconds: durationInSeconds,
      orientation: orientation,
-      isFavorite: isFavorite,
-      adjustmentTime: adjustmentTime,
-      latitude: latitude,
-      longitude: longitude
+      isFavorite: isFavorite
    )
  }
  func toList() -> [Any?] {
@@ -189,9 +180,6 @@ struct PlatformAsset: Hashable {
      durationInSeconds,
      orientation,
      isFavorite,
-      adjustmentTime,
-      latitude,
-      longitude,
    ]
  }
  static func == (lhs: PlatformAsset, rhs: PlatformAsset) -> Bool {
@@ -12,10 +12,7 @@ extension PHAsset {
      height: Int64(pixelHeight),
      durationInSeconds: Int64(duration),
      orientation: 0,
-      isFavorite: isFavorite,
-      adjustmentTime: adjustmentTimestamp,
-      latitude: location?.coordinate.latitude,
-      longitude: location?.coordinate.longitude
+      isFavorite: isFavorite
    )
  }

@@ -26,13 +23,6 @@ extension PHAsset {
  var filename: String? {
    return value(forKey: "filename") as? String
  }
-  
-  var adjustmentTimestamp: Int64? {
-    if let date = value(forKey: "adjustmentTimestamp") as? Date {
-      return Int64(date.timeIntervalSince1970)
-    }
-    return nil
-  }

  // This method is expected to be slow as it goes through the asset resources to fetch the originalFilename
  var originalFilename: String? {
@@ -5,10 +5,6 @@ class LocalAsset extends BaseAsset {
  final String? remoteAssetId;
  final int orientation;

-  final DateTime? adjustmentTime;
-  final double? latitude;
-  final double? longitude;
-
  const LocalAsset({
    required this.id,
    String? remoteId,
@@ -23,9 +19,6 @@ class LocalAsset extends BaseAsset {
    super.isFavorite = false,
    super.livePhotoVideoId,
    this.orientation = 0,
-    this.adjustmentTime,
-    this.latitude,
-    this.longitude,
  }) : remoteAssetId = remoteId;

  @override
@@ -40,8 +33,6 @@ class LocalAsset extends BaseAsset {
  @override
  String get heroTag => '${id}_${remoteId ?? checksum}';

-  bool get hasCoordinates => latitude != null && longitude != null && latitude != 0 && longitude != 0;
-
  @override
  String toString() {
    return '''LocalAsset {
@@ -56,9 +47,6 @@ class LocalAsset extends BaseAsset {
   remoteId: ${remoteId ?? "<NA>"}
   isFavorite: $isFavorite,
  orientation: $orientation,
-  adjustmentTime: $adjustmentTime,
-  latitude: ${latitude ?? "<NA>"},
-  longitude: ${longitude ?? "<NA>"},
 }''';
  }

@@ -67,23 +55,11 @@ class LocalAsset extends BaseAsset {
  bool operator ==(Object other) {
    if (other is! LocalAsset) return false;
    if (identical(this, other)) return true;
-    return super == other &&
-        id == other.id &&
-        orientation == other.orientation &&
-        adjustmentTime == other.adjustmentTime &&
-        latitude == other.latitude &&
-        longitude == other.longitude;
+    return super == other && id == other.id && orientation == other.orientation;
  }

  @override
-  int get hashCode =>
-      super.hashCode ^
-      id.hashCode ^
-      remoteId.hashCode ^
-      orientation.hashCode ^
-      adjustmentTime.hashCode ^
-      latitude.hashCode ^
-      longitude.hashCode;
+  int get hashCode => super.hashCode ^ id.hashCode ^ remoteId.hashCode ^ orientation.hashCode;

  LocalAsset copyWith({
    String? id,
@@ -98,9 +74,6 @@ class LocalAsset extends BaseAsset {
    int? durationInSeconds,
    bool? isFavorite,
    int? orientation,
-    DateTime? adjustmentTime,
-    double? latitude,
-    double? longitude,
  }) {
    return LocalAsset(
      id: id ?? this.id,
@@ -115,9 +88,6 @@ class LocalAsset extends BaseAsset {
      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
      isFavorite: isFavorite ?? this.isFavorite,
      orientation: orientation ?? this.orientation,
-      adjustmentTime: adjustmentTime ?? this.adjustmentTime,
-      latitude: latitude ?? this.latitude,
-      longitude: longitude ?? this.longitude,
    );
  }
 }
@@ -37,7 +37,7 @@ class ExifInfo {

  String get fNumber => f == null ? "" : f!.toStringAsFixed(1);

-  String get focalLength => mm == null ? "" : mm!.toStringAsFixed(3);
+  String get focalLength => mm == null ? "" : mm!.toStringAsFixed(1);

  const ExifInfo({
    this.assetId,
@@ -286,23 +286,11 @@ class LocalSyncService {
  }

  bool _assetsEqual(LocalAsset a, LocalAsset b) {
-    if (CurrentPlatform.isAndroid) {
-      return a.updatedAt.isAtSameMomentAs(b.updatedAt) &&
-          a.createdAt.isAtSameMomentAs(b.createdAt) &&
-          a.width == b.width &&
-          a.height == b.height &&
-          a.durationInSeconds == b.durationInSeconds;
-    }
-
-    final firstAdjustment = a.adjustmentTime?.millisecondsSinceEpoch ?? 0;
-    final secondAdjustment = b.adjustmentTime?.millisecondsSinceEpoch ?? 0;
-    return firstAdjustment == secondAdjustment &&
+    return a.updatedAt.isAtSameMomentAs(b.updatedAt) &&
        a.createdAt.isAtSameMomentAs(b.createdAt) &&
        a.width == b.width &&
        a.height == b.height &&
-        a.durationInSeconds == b.durationInSeconds &&
-        a.latitude == b.latitude &&
-        a.longitude == b.longitude;
+        a.durationInSeconds == b.durationInSeconds;
  }

  bool _albumsEqual(LocalAlbum a, LocalAlbum b) {
@@ -388,8 +376,5 @@ extension PlatformToLocalAsset on PlatformAsset {
    durationInSeconds: durationInSeconds,
    isFavorite: isFavorite,
    orientation: orientation,
-    adjustmentTime: tryFromSecondsSinceEpoch(adjustmentTime, isUtc: true),
-    latitude: latitude,
-    longitude: longitude,
  );
 }
@@ -166,6 +166,5 @@ extension RemoteExifEntityDataDomainEx on RemoteExifEntityData {
    mm: focalLength?.toDouble(),
    lens: lens,
    isFlipped: ExifDtoConverter.isOrientationFlipped(orientation),
-    exposureSeconds: ExifDtoConverter.exposureTimeToSeconds(exposureTime),
  );
 }
@@ -16,12 +16,6 @@ class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {

  IntColumn get orientation => integer().withDefault(const Constant(0))();

-  DateTimeColumn get adjustmentTime => dateTime().nullable()();
-
-  RealColumn get latitude => real().nullable()();
-
-  RealColumn get longitude => real().nullable()();
-
  @override
  Set<Column> get primaryKey => {id};
 }
@@ -40,8 +34,5 @@ extension LocalAssetEntityDataDomainExtension on LocalAssetEntityData {
    width: width,
    remoteId: remoteId,
    orientation: orientation,
-    adjustmentTime: adjustmentTime,
-    latitude: latitude,
-    longitude: longitude,
  );
 }
@@ -21,9 +21,6 @@ typedef $$LocalAssetEntityTableCreateCompanionBuilder =
      i0.Value<String?> checksum,
      i0.Value<bool> isFavorite,
      i0.Value<int> orientation,
-      i0.Value<DateTime?> adjustmentTime,
-      i0.Value<double?> latitude,
-      i0.Value<double?> longitude,
    });
 typedef $$LocalAssetEntityTableUpdateCompanionBuilder =
    i1.LocalAssetEntityCompanion Function({
@@ -38,9 +35,6 @@ typedef $$LocalAssetEntityTableUpdateCompanionBuilder =
      i0.Value<String?> checksum,
      i0.Value<bool> isFavorite,
      i0.Value<int> orientation,
-      i0.Value<DateTime?> adjustmentTime,
-      i0.Value<double?> latitude,
-      i0.Value<double?> longitude,
    });

 class $$LocalAssetEntityTableFilterComposer
@@ -107,21 +101,6 @@ class $$LocalAssetEntityTableFilterComposer
    column: $table.orientation,
    builder: (column) => i0.ColumnFilters(column),
  );
-
-  i0.ColumnFilters<DateTime> get adjustmentTime => $composableBuilder(
-    column: $table.adjustmentTime,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
-  i0.ColumnFilters<double> get latitude => $composableBuilder(
-    column: $table.latitude,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
-  i0.ColumnFilters<double> get longitude => $composableBuilder(
-    column: $table.longitude,
-    builder: (column) => i0.ColumnFilters(column),
-  );
 }

 class $$LocalAssetEntityTableOrderingComposer
@@ -187,21 +166,6 @@ class $$LocalAssetEntityTableOrderingComposer
    column: $table.orientation,
    builder: (column) => i0.ColumnOrderings(column),
  );
-
-  i0.ColumnOrderings<DateTime> get adjustmentTime => $composableBuilder(
-    column: $table.adjustmentTime,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<double> get latitude => $composableBuilder(
-    column: $table.latitude,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<double> get longitude => $composableBuilder(
-    column: $table.longitude,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
 }

 class $$LocalAssetEntityTableAnnotationComposer
@@ -251,17 +215,6 @@ class $$LocalAssetEntityTableAnnotationComposer
    column: $table.orientation,
    builder: (column) => column,
  );
-
-  i0.GeneratedColumn<DateTime> get adjustmentTime => $composableBuilder(
-    column: $table.adjustmentTime,
-    builder: (column) => column,
-  );
-
-  i0.GeneratedColumn<double> get latitude =>
-      $composableBuilder(column: $table.latitude, builder: (column) => column);
-
-  i0.GeneratedColumn<double> get longitude =>
-      $composableBuilder(column: $table.longitude, builder: (column) => column);
 }

 class $$LocalAssetEntityTableTableManager
@@ -315,9 +268,6 @@ class $$LocalAssetEntityTableTableManager
                i0.Value<String?> checksum = const i0.Value.absent(),
                i0.Value<bool> isFavorite = const i0.Value.absent(),
                i0.Value<int> orientation = const i0.Value.absent(),
-                i0.Value<DateTime?> adjustmentTime = const i0.Value.absent(),
-                i0.Value<double?> latitude = const i0.Value.absent(),
-                i0.Value<double?> longitude = const i0.Value.absent(),
              }) => i1.LocalAssetEntityCompanion(
                name: name,
                type: type,
@@ -330,9 +280,6 @@ class $$LocalAssetEntityTableTableManager
                checksum: checksum,
                isFavorite: isFavorite,
                orientation: orientation,
-                adjustmentTime: adjustmentTime,
-                latitude: latitude,
-                longitude: longitude,
              ),
          createCompanionCallback:
              ({
@@ -347,9 +294,6 @@ class $$LocalAssetEntityTableTableManager
                i0.Value<String?> checksum = const i0.Value.absent(),
                i0.Value<bool> isFavorite = const i0.Value.absent(),
                i0.Value<int> orientation = const i0.Value.absent(),
-                i0.Value<DateTime?> adjustmentTime = const i0.Value.absent(),
-                i0.Value<double?> latitude = const i0.Value.absent(),
-                i0.Value<double?> longitude = const i0.Value.absent(),
              }) => i1.LocalAssetEntityCompanion.insert(
                name: name,
                type: type,
@@ -362,9 +306,6 @@ class $$LocalAssetEntityTableTableManager
                checksum: checksum,
                isFavorite: isFavorite,
                orientation: orientation,
-                adjustmentTime: adjustmentTime,
-                latitude: latitude,
-                longitude: longitude,
              ),
          withReferenceMapper: (p0) => p0
              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
@@ -532,39 +473,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
    requiredDuringInsert: false,
    defaultValue: const i4.Constant(0),
  );
-  static const i0.VerificationMeta _adjustmentTimeMeta =
-      const i0.VerificationMeta('adjustmentTime');
-  @override
-  late final i0.GeneratedColumn<DateTime> adjustmentTime =
-      i0.GeneratedColumn<DateTime>(
-        'adjustment_time',
-        aliasedName,
-        true,
-        type: i0.DriftSqlType.dateTime,
-        requiredDuringInsert: false,
-      );
-  static const i0.VerificationMeta _latitudeMeta = const i0.VerificationMeta(
-    'latitude',
-  );
-  @override
-  late final i0.GeneratedColumn<double> latitude = i0.GeneratedColumn<double>(
-    'latitude',
-    aliasedName,
-    true,
-    type: i0.DriftSqlType.double,
-    requiredDuringInsert: false,
-  );
-  static const i0.VerificationMeta _longitudeMeta = const i0.VerificationMeta(
-    'longitude',
-  );
-  @override
-  late final i0.GeneratedColumn<double> longitude = i0.GeneratedColumn<double>(
-    'longitude',
-    aliasedName,
-    true,
-    type: i0.DriftSqlType.double,
-    requiredDuringInsert: false,
-  );
  @override
  List<i0.GeneratedColumn> get $columns => [
    name,
@@ -578,9 +486,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
    checksum,
    isFavorite,
    orientation,
-    adjustmentTime,
-    latitude,
-    longitude,
  ];
  @override
  String get aliasedName => _alias ?? actualTableName;
@@ -661,27 +566,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
        ),
      );
    }
-    if (data.containsKey('adjustment_time')) {
-      context.handle(
-        _adjustmentTimeMeta,
-        adjustmentTime.isAcceptableOrUnknown(
-          data['adjustment_time']!,
-          _adjustmentTimeMeta,
-        ),
-      );
-    }
-    if (data.containsKey('latitude')) {
-      context.handle(
-        _latitudeMeta,
-        latitude.isAcceptableOrUnknown(data['latitude']!, _latitudeMeta),
-      );
-    }
-    if (data.containsKey('longitude')) {
-      context.handle(
-        _longitudeMeta,
-        longitude.isAcceptableOrUnknown(data['longitude']!, _longitudeMeta),
-      );
-    }
    return context;
  }

@@ -740,18 +624,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
        i0.DriftSqlType.int,
        data['${effectivePrefix}orientation'],
      )!,
-      adjustmentTime: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.dateTime,
-        data['${effectivePrefix}adjustment_time'],
-      ),
-      latitude: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.double,
-        data['${effectivePrefix}latitude'],
-      ),
-      longitude: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.double,
-        data['${effectivePrefix}longitude'],
-      ),
    );
  }

@@ -781,9 +653,6 @@ class LocalAssetEntityData extends i0.DataClass
  final String? checksum;
  final bool isFavorite;
  final int orientation;
-  final DateTime? adjustmentTime;
-  final double? latitude;
-  final double? longitude;
  const LocalAssetEntityData({
    required this.name,
    required this.type,
@@ -796,9 +665,6 @@ class LocalAssetEntityData extends i0.DataClass
    this.checksum,
    required this.isFavorite,
    required this.orientation,
-    this.adjustmentTime,
-    this.latitude,
-    this.longitude,
  });
  @override
  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
@@ -826,15 +692,6 @@ class LocalAssetEntityData extends i0.DataClass
    }
    map['is_favorite'] = i0.Variable<bool>(isFavorite);
    map['orientation'] = i0.Variable<int>(orientation);
-    if (!nullToAbsent || adjustmentTime != null) {
-      map['adjustment_time'] = i0.Variable<DateTime>(adjustmentTime);
-    }
-    if (!nullToAbsent || latitude != null) {
-      map['latitude'] = i0.Variable<double>(latitude);
-    }
-    if (!nullToAbsent || longitude != null) {
-      map['longitude'] = i0.Variable<double>(longitude);
-    }
    return map;
  }

@@ -857,9 +714,6 @@ class LocalAssetEntityData extends i0.DataClass
      checksum: serializer.fromJson<String?>(json['checksum']),
      isFavorite: serializer.fromJson<bool>(json['isFavorite']),
      orientation: serializer.fromJson<int>(json['orientation']),
-      adjustmentTime: serializer.fromJson<DateTime?>(json['adjustmentTime']),
-      latitude: serializer.fromJson<double?>(json['latitude']),
-      longitude: serializer.fromJson<double?>(json['longitude']),
    );
  }
  @override
@@ -879,9 +733,6 @@ class LocalAssetEntityData extends i0.DataClass
      'checksum': serializer.toJson<String?>(checksum),
      'isFavorite': serializer.toJson<bool>(isFavorite),
      'orientation': serializer.toJson<int>(orientation),
-      'adjustmentTime': serializer.toJson<DateTime?>(adjustmentTime),
-      'latitude': serializer.toJson<double?>(latitude),
-      'longitude': serializer.toJson<double?>(longitude),
    };
  }

@@ -897,9 +748,6 @@ class LocalAssetEntityData extends i0.DataClass
    i0.Value<String?> checksum = const i0.Value.absent(),
    bool? isFavorite,
    int? orientation,
-    i0.Value<DateTime?> adjustmentTime = const i0.Value.absent(),
-    i0.Value<double?> latitude = const i0.Value.absent(),
-    i0.Value<double?> longitude = const i0.Value.absent(),
  }) => i1.LocalAssetEntityData(
    name: name ?? this.name,
    type: type ?? this.type,
@@ -914,11 +762,6 @@ class LocalAssetEntityData extends i0.DataClass
    checksum: checksum.present ? checksum.value : this.checksum,
    isFavorite: isFavorite ?? this.isFavorite,
    orientation: orientation ?? this.orientation,
-    adjustmentTime: adjustmentTime.present
-        ? adjustmentTime.value
-        : this.adjustmentTime,
-    latitude: latitude.present ? latitude.value : this.latitude,
-    longitude: longitude.present ? longitude.value : this.longitude,
  );
  LocalAssetEntityData copyWithCompanion(i1.LocalAssetEntityCompanion data) {
    return LocalAssetEntityData(
@@ -939,11 +782,6 @@ class LocalAssetEntityData extends i0.DataClass
      orientation: data.orientation.present
          ? data.orientation.value
          : this.orientation,
-      adjustmentTime: data.adjustmentTime.present
-          ? data.adjustmentTime.value
-          : this.adjustmentTime,
-      latitude: data.latitude.present ? data.latitude.value : this.latitude,
-      longitude: data.longitude.present ? data.longitude.value : this.longitude,
    );
  }

@@ -960,10 +798,7 @@ class LocalAssetEntityData extends i0.DataClass
          ..write('id: $id, ')
          ..write('checksum: $checksum, ')
          ..write('isFavorite: $isFavorite, ')
-          ..write('orientation: $orientation, ')
-          ..write('adjustmentTime: $adjustmentTime, ')
-          ..write('latitude: $latitude, ')
-          ..write('longitude: $longitude')
+          ..write('orientation: $orientation')
          ..write(')'))
        .toString();
  }
@@ -981,9 +816,6 @@ class LocalAssetEntityData extends i0.DataClass
    checksum,
    isFavorite,
    orientation,
-    adjustmentTime,
-    latitude,
-    longitude,
  );
  @override
  bool operator ==(Object other) =>
@@ -999,10 +831,7 @@ class LocalAssetEntityData extends i0.DataClass
          other.id == this.id &&
          other.checksum == this.checksum &&
          other.isFavorite == this.isFavorite &&
-          other.orientation == this.orientation &&
-          other.adjustmentTime == this.adjustmentTime &&
-          other.latitude == this.latitude &&
-          other.longitude == this.longitude);
+          other.orientation == this.orientation);
 }

 class LocalAssetEntityCompanion
@@ -1018,9 +847,6 @@ class LocalAssetEntityCompanion
  final i0.Value<String?> checksum;
  final i0.Value<bool> isFavorite;
  final i0.Value<int> orientation;
-  final i0.Value<DateTime?> adjustmentTime;
-  final i0.Value<double?> latitude;
-  final i0.Value<double?> longitude;
  const LocalAssetEntityCompanion({
    this.name = const i0.Value.absent(),
    this.type = const i0.Value.absent(),
@@ -1033,9 +859,6 @@ class LocalAssetEntityCompanion
    this.checksum = const i0.Value.absent(),
    this.isFavorite = const i0.Value.absent(),
    this.orientation = const i0.Value.absent(),
-    this.adjustmentTime = const i0.Value.absent(),
-    this.latitude = const i0.Value.absent(),
-    this.longitude = const i0.Value.absent(),
  });
  LocalAssetEntityCompanion.insert({
    required String name,
@@ -1049,9 +872,6 @@ class LocalAssetEntityCompanion
    this.checksum = const i0.Value.absent(),
    this.isFavorite = const i0.Value.absent(),
    this.orientation = const i0.Value.absent(),
-    this.adjustmentTime = const i0.Value.absent(),
-    this.latitude = const i0.Value.absent(),
-    this.longitude = const i0.Value.absent(),
  }) : name = i0.Value(name),
       type = i0.Value(type),
       id = i0.Value(id);
@@ -1067,9 +887,6 @@ class LocalAssetEntityCompanion
    i0.Expression<String>? checksum,
    i0.Expression<bool>? isFavorite,
    i0.Expression<int>? orientation,
-    i0.Expression<DateTime>? adjustmentTime,
-    i0.Expression<double>? latitude,
-    i0.Expression<double>? longitude,
  }) {
    return i0.RawValuesInsertable({
      if (name != null) 'name': name,
@@ -1083,9 +900,6 @@ class LocalAssetEntityCompanion
      if (checksum != null) 'checksum': checksum,
      if (isFavorite != null) 'is_favorite': isFavorite,
      if (orientation != null) 'orientation': orientation,
-      if (adjustmentTime != null) 'adjustment_time': adjustmentTime,
-      if (latitude != null) 'latitude': latitude,
-      if (longitude != null) 'longitude': longitude,
    });
  }

@@ -1101,9 +915,6 @@ class LocalAssetEntityCompanion
    i0.Value<String?>? checksum,
    i0.Value<bool>? isFavorite,
    i0.Value<int>? orientation,
-    i0.Value<DateTime?>? adjustmentTime,
-    i0.Value<double?>? latitude,
-    i0.Value<double?>? longitude,
  }) {
    return i1.LocalAssetEntityCompanion(
      name: name ?? this.name,
@@ -1117,9 +928,6 @@ class LocalAssetEntityCompanion
      checksum: checksum ?? this.checksum,
      isFavorite: isFavorite ?? this.isFavorite,
      orientation: orientation ?? this.orientation,
-      adjustmentTime: adjustmentTime ?? this.adjustmentTime,
-      latitude: latitude ?? this.latitude,
-      longitude: longitude ?? this.longitude,
    );
  }

@@ -1161,15 +969,6 @@ class LocalAssetEntityCompanion
    if (orientation.present) {
      map['orientation'] = i0.Variable<int>(orientation.value);
    }
-    if (adjustmentTime.present) {
-      map['adjustment_time'] = i0.Variable<DateTime>(adjustmentTime.value);
-    }
-    if (latitude.present) {
-      map['latitude'] = i0.Variable<double>(latitude.value);
-    }
-    if (longitude.present) {
-      map['longitude'] = i0.Variable<double>(longitude.value);
-    }
    return map;
  }

@@ -1186,10 +985,7 @@ class LocalAssetEntityCompanion
          ..write('id: $id, ')
          ..write('checksum: $checksum, ')
          ..write('isFavorite: $isFavorite, ')
-          ..write('orientation: $orientation, ')
-          ..write('adjustmentTime: $adjustmentTime, ')
-          ..write('latitude: $latitude, ')
-          ..write('longitude: $longitude')
+          ..write('orientation: $orientation')
          ..write(')'))
        .toString();
  }
@@ -10,6 +10,7 @@ import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.dart';
@@ -20,7 +21,6 @@ import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.d
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/stack.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.steps.dart';
@@ -95,7 +95,7 @@ class Drift extends $Drift implements IDatabaseRepository {
  }

  @override
-  int get schemaVersion => 14;
+  int get schemaVersion => 13;

  @override
  MigrationStrategy get migration => MigrationStrategy(
@@ -185,11 +185,6 @@ class Drift extends $Drift implements IDatabaseRepository {
            await m.createIndex(v13.idxTrashedLocalAssetChecksum);
            await m.createIndex(v13.idxTrashedLocalAssetAlbum);
          },
-          from13To14: (m, v14) async {
-            await m.addColumn(v14.localAssetEntity, v14.localAssetEntity.adjustmentTime);
-            await m.addColumn(v14.localAssetEntity, v14.localAssetEntity.latitude);
-            await m.addColumn(v14.localAssetEntity, v14.localAssetEntity.longitude);
-          },
        ),
      );

@@ -5485,462 +5485,6 @@ i1.GeneratedColumn<String> _column_95(String aliasedName) =>
      false,
      type: i1.DriftSqlType.string,
    );
-
-final class Schema14 extends i0.VersionedSchema {
-  Schema14({required super.database}) : super(version: 14);
-  @override
-  late final List<i1.DatabaseSchemaEntity> entities = [
-    userEntity,
-    remoteAssetEntity,
-    stackEntity,
-    localAssetEntity,
-    remoteAlbumEntity,
-    localAlbumEntity,
-    localAlbumAssetEntity,
-    idxLocalAssetChecksum,
-    idxRemoteAssetOwnerChecksum,
-    uQRemoteAssetsOwnerChecksum,
-    uQRemoteAssetsOwnerLibraryChecksum,
-    idxRemoteAssetChecksum,
-    authUserEntity,
-    userMetadataEntity,
-    partnerEntity,
-    remoteExifEntity,
-    remoteAlbumAssetEntity,
-    remoteAlbumUserEntity,
-    memoryEntity,
-    memoryAssetEntity,
-    personEntity,
-    assetFaceEntity,
-    storeEntity,
-    trashedLocalAssetEntity,
-    idxLatLng,
-    idxTrashedLocalAssetChecksum,
-    idxTrashedLocalAssetAlbum,
-  ];
-  late final Shape20 userEntity = Shape20(
-    source: i0.VersionedTable(
-      entityName: 'user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_3,
-        _column_84,
-        _column_85,
-        _column_91,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape17 remoteAssetEntity = Shape17(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_1,
-        _column_8,
-        _column_9,
-        _column_5,
-        _column_10,
-        _column_11,
-        _column_12,
-        _column_0,
-        _column_13,
-        _column_14,
-        _column_15,
-        _column_16,
-        _column_17,
-        _column_18,
-        _column_19,
-        _column_20,
-        _column_21,
-        _column_86,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape3 stackEntity = Shape3(
-    source: i0.VersionedTable(
-      entityName: 'stack_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_0, _column_9, _column_5, _column_15, _column_75],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape24 localAssetEntity = Shape24(
-    source: i0.VersionedTable(
-      entityName: 'local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_1,
-        _column_8,
-        _column_9,
-        _column_5,
-        _column_10,
-        _column_11,
-        _column_12,
-        _column_0,
-        _column_22,
-        _column_14,
-        _column_23,
-        _column_96,
-        _column_46,
-        _column_47,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape9 remoteAlbumEntity = Shape9(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_56,
-        _column_9,
-        _column_5,
-        _column_15,
-        _column_57,
-        _column_58,
-        _column_59,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape19 localAlbumEntity = Shape19(
-    source: i0.VersionedTable(
-      entityName: 'local_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_5,
-        _column_31,
-        _column_32,
-        _column_90,
-        _column_33,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape22 localAlbumAssetEntity = Shape22(
-    source: i0.VersionedTable(
-      entityName: 'local_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_34, _column_35, _column_33],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLocalAssetChecksum = i1.Index(
-    'idx_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
-  );
-  final i1.Index idxRemoteAssetOwnerChecksum = i1.Index(
-    'idx_remote_asset_owner_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
-  );
-  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
-    'UQ_remote_assets_owner_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
-  );
-  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
-    'UQ_remote_assets_owner_library_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
-  );
-  final i1.Index idxRemoteAssetChecksum = i1.Index(
-    'idx_remote_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
-  );
-  late final Shape21 authUserEntity = Shape21(
-    source: i0.VersionedTable(
-      entityName: 'auth_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_3,
-        _column_2,
-        _column_84,
-        _column_85,
-        _column_92,
-        _column_93,
-        _column_7,
-        _column_94,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape4 userMetadataEntity = Shape4(
-    source: i0.VersionedTable(
-      entityName: 'user_metadata_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
-      columns: [_column_25, _column_26, _column_27],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape5 partnerEntity = Shape5(
-    source: i0.VersionedTable(
-      entityName: 'partner_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
-      columns: [_column_28, _column_29, _column_30],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape8 remoteExifEntity = Shape8(
-    source: i0.VersionedTable(
-      entityName: 'remote_exif_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_36,
-        _column_37,
-        _column_38,
-        _column_39,
-        _column_40,
-        _column_41,
-        _column_11,
-        _column_10,
-        _column_42,
-        _column_43,
-        _column_44,
-        _column_45,
-        _column_46,
-        _column_47,
-        _column_48,
-        _column_49,
-        _column_50,
-        _column_51,
-        _column_52,
-        _column_53,
-        _column_54,
-        _column_55,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape7 remoteAlbumAssetEntity = Shape7(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_36, _column_60],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape10 remoteAlbumUserEntity = Shape10(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
-      columns: [_column_60, _column_25, _column_61],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape11 memoryEntity = Shape11(
-    source: i0.VersionedTable(
-      entityName: 'memory_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_9,
-        _column_5,
-        _column_18,
-        _column_15,
-        _column_8,
-        _column_62,
-        _column_63,
-        _column_64,
-        _column_65,
-        _column_66,
-        _column_67,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape12 memoryAssetEntity = Shape12(
-    source: i0.VersionedTable(
-      entityName: 'memory_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
-      columns: [_column_36, _column_68],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape14 personEntity = Shape14(
-    source: i0.VersionedTable(
-      entityName: 'person_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_9,
-        _column_5,
-        _column_15,
-        _column_1,
-        _column_69,
-        _column_71,
-        _column_72,
-        _column_73,
-        _column_74,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape15 assetFaceEntity = Shape15(
-    source: i0.VersionedTable(
-      entityName: 'asset_face_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_36,
-        _column_76,
-        _column_77,
-        _column_78,
-        _column_79,
-        _column_80,
-        _column_81,
-        _column_82,
-        _column_83,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape18 storeEntity = Shape18(
-    source: i0.VersionedTable(
-      entityName: 'store_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_87, _column_88, _column_89],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape23 trashedLocalAssetEntity = Shape23(
-    source: i0.VersionedTable(
-      entityName: 'trashed_local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id, album_id)'],
-      columns: [
-        _column_1,
-        _column_8,
-        _column_9,
-        _column_5,
-        _column_10,
-        _column_11,
-        _column_12,
-        _column_0,
-        _column_95,
-        _column_22,
-        _column_14,
-        _column_23,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLatLng = i1.Index(
-    'idx_lat_lng',
-    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
-  );
-  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
-    'idx_trashed_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
-  );
-  final i1.Index idxTrashedLocalAssetAlbum = i1.Index(
-    'idx_trashed_local_asset_album',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
-  );
-}
-
-class Shape24 extends i0.VersionedTable {
-  Shape24({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get name =>
-      columnsByName['name']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get type =>
-      columnsByName['type']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<DateTime> get createdAt =>
-      columnsByName['created_at']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<DateTime> get updatedAt =>
-      columnsByName['updated_at']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<int> get width =>
-      columnsByName['width']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<int> get height =>
-      columnsByName['height']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<int> get durationInSeconds =>
-      columnsByName['duration_in_seconds']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<String> get id =>
-      columnsByName['id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get checksum =>
-      columnsByName['checksum']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<bool> get isFavorite =>
-      columnsByName['is_favorite']! as i1.GeneratedColumn<bool>;
-  i1.GeneratedColumn<int> get orientation =>
-      columnsByName['orientation']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<DateTime> get adjustmentTime =>
-      columnsByName['adjustment_time']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<double> get latitude =>
-      columnsByName['latitude']! as i1.GeneratedColumn<double>;
-  i1.GeneratedColumn<double> get longitude =>
-      columnsByName['longitude']! as i1.GeneratedColumn<double>;
-}
-
-i1.GeneratedColumn<DateTime> _column_96(String aliasedName) =>
-    i1.GeneratedColumn<DateTime>(
-      'adjustment_time',
-      aliasedName,
-      true,
-      type: i1.DriftSqlType.dateTime,
-    );
 i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
  required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -5954,7 +5498,6 @@ i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema11 schema) from10To11,
  required Future<void> Function(i1.Migrator m, Schema12 schema) from11To12,
  required Future<void> Function(i1.Migrator m, Schema13 schema) from12To13,
-  required Future<void> Function(i1.Migrator m, Schema14 schema) from13To14,
 }) {
  return (currentVersion, database) async {
    switch (currentVersion) {
@@ -6018,11 +5561,6 @@ i0.MigrationStepWithVersion migrationSteps({
        final migrator = i1.Migrator(database, schema);
        await from12To13(migrator, schema);
        return 13;
-      case 13:
-        final schema = Schema14(database: database);
-        final migrator = i1.Migrator(database, schema);
-        await from13To14(migrator, schema);
-        return 14;
      default:
        throw ArgumentError.value('Unknown migration from $currentVersion');
    }
@@ -6042,7 +5580,6 @@ i1.OnUpgrade stepByStep({
  required Future<void> Function(i1.Migrator m, Schema11 schema) from10To11,
  required Future<void> Function(i1.Migrator m, Schema12 schema) from11To12,
  required Future<void> Function(i1.Migrator m, Schema13 schema) from12To13,
-  required Future<void> Function(i1.Migrator m, Schema14 schema) from13To14,
 }) => i0.VersionedSchema.stepByStepHelper(
  step: migrationSteps(
    from1To2: from1To2,
@@ -6057,6 +5594,5 @@ i1.OnUpgrade stepByStep({
    from10To11: from10To11,
    from11To12: from11To12,
    from12To13: from12To13,
-    from13To14: from13To14,
  ),
 );
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -246,56 +244,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
    return query.map((row) => row.readTable(_db.localAssetEntity).toDto()).get();
  }

-  Future<void> Function(Iterable<LocalAsset>) get _upsertAssets =>
-      CurrentPlatform.isIOS ? _upsertAssetsDarwin : _upsertAssetsAndroid;
-
-  Future<void> _upsertAssetsDarwin(Iterable<LocalAsset> localAssets) async {
-    if (localAssets.isEmpty) {
-      return Future.value();
-    }
-
-    // Reset checksum if asset changed
-    await _db.batch((batch) async {
-      for (final asset in localAssets) {
-        final companion = LocalAssetEntityCompanion(
-          checksum: const Value(null),
-          adjustmentTime: Value(asset.adjustmentTime),
-        );
-        batch.update(
-          _db.localAssetEntity,
-          companion,
-          where: (row) => row.id.equals(asset.id) & row.adjustmentTime.isNotExp(Variable(asset.adjustmentTime)),
-        );
-      }
-    });
-
-    return _db.batch((batch) async {
-      for (final asset in localAssets) {
-        final companion = LocalAssetEntityCompanion.insert(
-          name: asset.name,
-          type: asset.type,
-          createdAt: Value(asset.createdAt),
-          updatedAt: Value(asset.updatedAt),
-          width: Value(asset.width),
-          height: Value(asset.height),
-          durationInSeconds: Value(asset.durationInSeconds),
-          id: asset.id,
-          orientation: Value(asset.orientation),
-          isFavorite: Value(asset.isFavorite),
-          latitude: Value(asset.latitude),
-          longitude: Value(asset.longitude),
-          adjustmentTime: Value(asset.adjustmentTime),
-        );
-        batch.insert<$LocalAssetEntityTable, LocalAssetEntityData>(
-          _db.localAssetEntity,
-          companion.copyWith(checksum: const Value(null)),
-          onConflict: DoUpdate((old) => companion),
-        );
-      }
-    });
-  }
-
-  Future<void> _upsertAssetsAndroid(Iterable<LocalAsset> localAssets) async {
+  Future<void> _upsertAssets(Iterable<LocalAsset> localAssets) {
    if (localAssets.isEmpty) {
      return Future.value();
    }
@@ -311,7 +260,6 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
          height: Value(asset.height),
          durationInSeconds: Value(asset.durationInSeconds),
          id: asset.id,
-          checksum: const Value(null),
          orientation: Value(asset.orientation),
          isFavorite: Value(asset.isFavorite),
        );
@@ -22,7 +22,7 @@ abstract final class ExifDtoConverter {
      f: dto.fNumber?.toDouble(),
      mm: dto.focalLength?.toDouble(),
      iso: dto.iso?.toInt(),
-      exposureSeconds: exposureTimeToSeconds(dto.exposureTime),
+      exposureSeconds: _exposureTimeToSeconds(dto.exposureTime),
    );
  }

@@ -36,15 +36,15 @@ abstract final class ExifDtoConverter {
    return isRotated90CW || isRotated270CW;
  }

-  static double? exposureTimeToSeconds(String? second) {
-    if (second == null) {
+  static double? _exposureTimeToSeconds(String? s) {
+    if (s == null) {
      return null;
    }
-    double? value = double.tryParse(second);
+    double? value = double.tryParse(s);
    if (value != null) {
      return value;
    }
-    final parts = second.split("/");
+    final parts = s.split("/");
    if (parts.length == 2) {
      final numerator = double.tryParse(parts.firstOrNull ?? "-");
      final denominator = double.tryParse(parts.lastOrNull ?? "-");
@@ -49,7 +49,7 @@ class MapLocationPickerPage extends HookConsumerWidget {

      var currentLatLng = LatLng(currentLocation.latitude, currentLocation.longitude);
      selectedLatLng.value = currentLatLng;
-      await controller.value?.animateCamera(CameraUpdate.newLatLngZoom(currentLatLng, 12));
+      await controller.value?.animateCamera(CameraUpdate.newLatLng(currentLatLng));
    }

    return MapThemeOverride(
@@ -66,10 +66,7 @@ class MapLocationPickerPage extends HookConsumerWidget {
                borderRadius: BorderRadius.only(bottomLeft: Radius.circular(40), bottomRight: Radius.circular(40)),
              ),
              child: MapLibreMap(
-                initialCameraPosition: CameraPosition(
-                  target: initialLatLng,
-                  zoom: (initialLatLng.latitude == 0 && initialLatLng.longitude == 0) ? 1 : 12,
-                ),
+                initialCameraPosition: CameraPosition(target: initialLatLng, zoom: 12),
                styleString: style,
                onMapCreated: (mapController) => controller.value = mapController,
                onStyleLoadedCallback: onStyleLoaded,
@@ -41,9 +41,6 @@ class PlatformAsset {
    required this.durationInSeconds,
    required this.orientation,
    required this.isFavorite,
-    this.adjustmentTime,
-    this.latitude,
-    this.longitude,
  });

  String id;
@@ -66,28 +63,8 @@ class PlatformAsset {

  bool isFavorite;

-  int? adjustmentTime;
-
-  double? latitude;
-
-  double? longitude;
-
  List<Object?> _toList() {
-    return <Object?>[
-      id,
-      name,
-      type,
-      createdAt,
-      updatedAt,
-      width,
-      height,
-      durationInSeconds,
-      orientation,
-      isFavorite,
-      adjustmentTime,
-      latitude,
-      longitude,
-    ];
+    return <Object?>[id, name, type, createdAt, updatedAt, width, height, durationInSeconds, orientation, isFavorite];
  }

  Object encode() {
@@ -107,9 +84,6 @@ class PlatformAsset {
      durationInSeconds: result[7]! as int,
      orientation: result[8]! as int,
      isFavorite: result[9]! as bool,
-      adjustmentTime: result[10] as int?,
-      latitude: result[11] as double?,
-      longitude: result[12] as double?,
    );
  }

@@ -37,7 +37,7 @@ class DriftActivitiesPage extends HookConsumerWidget {
      child: Scaffold(
        appBar: AppBar(
          title: Text(album.name),
-          actions: [const LikeActivityActionButton(iconOnly: true)],
+          actions: [const LikeActivityActionButton(menuItem: true)],
          actionsPadding: const EdgeInsets.only(right: 8),
        ),
        body: activities.widgetWhen(
@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
-import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';

@RoutePage()
@@ -130,15 +129,6 @@ class _AssetPropertiesSectionState extends ConsumerState<_AssetPropertiesSection
    properties.insert(4, _PropertyItem(label: 'Orientation', value: asset.orientation.toString()));
    final albums = await ref.read(assetServiceProvider).getSourceAlbums(asset.id);
    properties.add(_PropertyItem(label: 'Album', value: albums.map((a) => a.name).join(', ')));
-    if (CurrentPlatform.isIOS) {
-      properties.add(_PropertyItem(label: 'Adjustment Time', value: asset.adjustmentTime?.toString()));
-    }
-    properties.add(
-      _PropertyItem(
-        label: 'GPS Coordinates',
-        value: asset.hasCoordinates ? '${asset.latitude}, ${asset.longitude}' : null,
-      ),
-    );
  }

  Future<void> _addRemoteAssetProperties(RemoteAsset asset) async {
@@ -27,19 +27,8 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
  bool isAlbumTitleTextFieldFocus = false;
  Set<BaseAsset> selectedAssets = {};

-  @override
-  void initState() {
-    super.initState();
-    albumTitleController.addListener(_onTitleChanged);
-  }
-
-  void _onTitleChanged() {
-    setState(() {});
-  }
-
  @override
  void dispose() {
-    albumTitleController.removeListener(_onTitleChanged);
    albumTitleController.dispose();
    albumDescriptionController.dispose();
    albumTitleTextFieldFocusNode.dispose();
@@ -21,36 +21,12 @@ import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_shee

 enum AddToMenuItem { album, archive, unarchive, lockedFolder }

-class AddActionButton extends ConsumerStatefulWidget {
-  const AddActionButton({super.key, this.originalTheme});
+class AddActionButton extends ConsumerWidget {
+  const AddActionButton({super.key});

-  final ThemeData? originalTheme;
-
-  @override
-  ConsumerState<AddActionButton> createState() => _AddActionButtonState();
-}
-
-class _AddActionButtonState extends ConsumerState<AddActionButton> {
-  void _handleMenuSelection(AddToMenuItem selected) {
-    switch (selected) {
-      case AddToMenuItem.album:
-        _openAlbumSelector();
-        break;
-      case AddToMenuItem.archive:
-        performArchiveAction(context, ref, source: ActionSource.viewer);
-        break;
-      case AddToMenuItem.unarchive:
-        performUnArchiveAction(context, ref, source: ActionSource.viewer);
-        break;
-      case AddToMenuItem.lockedFolder:
-        performMoveToLockFolderAction(context, ref, source: ActionSource.viewer);
-        break;
-    }
-  }
-
-  List<Widget> _buildMenuChildren() {
+  Future<void> _showAddOptions(BuildContext context, WidgetRef ref) async {
    final asset = ref.read(currentAssetNotifier);
-    if (asset == null) return [];
+    if (asset == null) return;

    final user = ref.read(currentUserProvider);
    final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
@@ -59,57 +35,93 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
    final hasRemote = asset is RemoteAsset;
    final showArchive = isOwner && !isInLockedView && hasRemote && !isArchived;
    final showUnarchive = isOwner && !isInLockedView && hasRemote && isArchived;
+    final menuItemHeight = 30.0;

-    return [
-      Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-        child: Text("add_to_bottom_bar".tr(), style: context.textTheme.labelMedium),
+    final List<PopupMenuEntry<AddToMenuItem>> items = [
+      PopupMenuItem(
+        enabled: false,
+        textStyle: context.textTheme.labelMedium,
+        height: 40,
+        child: Text("add_to_bottom_bar".tr()),
      ),
-      BaseActionButton(
-        iconData: Icons.photo_album_outlined,
-        label: "album".tr(),
-        menuItem: true,
-        onPressed: () => _handleMenuSelection(AddToMenuItem.album),
+      PopupMenuItem(
+        height: menuItemHeight,
+        value: AddToMenuItem.album,
+        child: ListTile(leading: const Icon(Icons.photo_album_outlined), title: Text("album".tr())),
      ),
-
+      const PopupMenuDivider(),
+      PopupMenuItem(enabled: false, textStyle: context.textTheme.labelMedium, height: 40, child: Text("move_to".tr())),
      if (isOwner) ...[
-        const Divider(),
-        Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-          child: Text("move_to".tr(), style: context.textTheme.labelMedium),
-        ),
        if (showArchive)
-          BaseActionButton(
-            iconData: Icons.archive_outlined,
-            label: "archive".tr(),
-            menuItem: true,
-            onPressed: () => _handleMenuSelection(AddToMenuItem.archive),
+          PopupMenuItem(
+            height: menuItemHeight,
+            value: AddToMenuItem.archive,
+            child: ListTile(leading: const Icon(Icons.archive_outlined), title: Text("archive".tr())),
          ),
        if (showUnarchive)
-          BaseActionButton(
-            iconData: Icons.unarchive_outlined,
-            label: "unarchive".tr(),
-            menuItem: true,
-            onPressed: () => _handleMenuSelection(AddToMenuItem.unarchive),
+          PopupMenuItem(
+            height: menuItemHeight,
+            value: AddToMenuItem.unarchive,
+            child: ListTile(leading: const Icon(Icons.unarchive_outlined), title: Text("unarchive".tr())),
          ),
-        BaseActionButton(
-          iconData: Icons.lock_outline,
-          label: "locked_folder".tr(),
-          menuItem: true,
-          onPressed: () => _handleMenuSelection(AddToMenuItem.lockedFolder),
+        PopupMenuItem(
+          height: menuItemHeight,
+          value: AddToMenuItem.lockedFolder,
+          child: ListTile(leading: const Icon(Icons.lock_outline), title: Text("locked_folder".tr())),
        ),
      ],
    ];
+
+    final AddToMenuItem? selected = await showMenu<AddToMenuItem>(
+      context: context,
+      color: context.themeData.scaffoldBackgroundColor,
+      position: _menuPosition(context),
+      items: items,
+      popUpAnimationStyle: AnimationStyle.noAnimation,
+    );
+
+    if (selected == null) {
+      return;
+    }
+
+    switch (selected) {
+      case AddToMenuItem.album:
+        _openAlbumSelector(context, ref);
+        break;
+      case AddToMenuItem.archive:
+        await performArchiveAction(context, ref, source: ActionSource.viewer);
+        break;
+      case AddToMenuItem.unarchive:
+        await performUnArchiveAction(context, ref, source: ActionSource.viewer);
+        break;
+      case AddToMenuItem.lockedFolder:
+        await performMoveToLockFolderAction(context, ref, source: ActionSource.viewer);
+        break;
+    }
  }

-  void _openAlbumSelector() {
+  RelativeRect _menuPosition(BuildContext context) {
+    final renderObject = context.findRenderObject();
+    if (renderObject is! RenderBox) {
+      return RelativeRect.fill;
+    }
+
+    final size = renderObject.size;
+    final position = renderObject.localToGlobal(Offset.zero);
+
+    return RelativeRect.fromLTRB(position.dx, position.dy - size.height - 200, position.dx + size.width, position.dy);
+  }
+
+  void _openAlbumSelector(BuildContext context, WidgetRef ref) {
    final currentAsset = ref.read(currentAssetNotifier);
    if (currentAsset == null) {
      ImmichToast.show(context: context, msg: "Cannot load asset information.", toastType: ToastType.error);
      return;
    }

-    final List<Widget> slivers = [AlbumSelector(onAlbumSelected: (album) => _addCurrentAssetToAlbum(album))];
+    final List<Widget> slivers = [
+      AlbumSelector(onAlbumSelected: (album) => _addCurrentAssetToAlbum(context, ref, album)),
+    ];

    showModalBottomSheet(
      context: context,
@@ -129,7 +141,7 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
    );
  }

-  Future<void> _addCurrentAssetToAlbum(RemoteAlbum album) async {
+  Future<void> _addCurrentAssetToAlbum(BuildContext context, WidgetRef ref, RemoteAlbum album) async {
    final latest = ref.read(currentAssetNotifier);

    if (latest == null) {
@@ -162,36 +174,17 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
  }

  @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
    final asset = ref.watch(currentAssetNotifier);
    if (asset == null) {
      return const SizedBox.shrink();
    }
-
-    final themeData = widget.originalTheme ?? context.themeData;
-
-    return MenuAnchor(
-      consumeOutsideTap: true,
-      style: MenuStyle(
-        backgroundColor: WidgetStatePropertyAll(themeData.scaffoldBackgroundColor),
-        elevation: const WidgetStatePropertyAll(4),
-        shape: const WidgetStatePropertyAll(
-          RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12))),
-        ),
-      ),
-      menuChildren: widget.originalTheme != null
-          ? [
-              Theme(
-                data: widget.originalTheme!,
-                child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: _buildMenuChildren()),
-              ),
-            ]
-          : _buildMenuChildren(),
-      builder: (context, controller, child) {
+    return Builder(
+      builder: (buttonContext) {
        return BaseActionButton(
          iconData: Icons.add,
          label: "add_to_bottom_bar".tr(),
-          onPressed: () => controller.isOpen ? controller.close() : controller.open(),
+          onPressed: () => _showAddOptions(buttonContext, ref),
        );
      },
    );
@@ -11,7 +11,6 @@ class BaseActionButton extends StatelessWidget {
    this.onLongPressed,
    this.maxWidth = 90.0,
    this.minWidth,
-    this.iconOnly = false,
    this.menuItem = false,
  });

@@ -20,11 +19,6 @@ class BaseActionButton extends StatelessWidget {
  final Color? iconColor;
  final double maxWidth;
  final double? minWidth;
-
-  /// When true, renders only an IconButton without text label
-  final bool iconOnly;
-
-  /// When true, renders as a MenuItemButton for use in MenuAnchor menus
  final bool menuItem;
  final void Function()? onPressed;
  final void Function()? onLongPressed;
@@ -37,26 +31,13 @@ class BaseActionButton extends StatelessWidget {
    final iconColor = this.iconColor ?? iconTheme.color ?? context.themeData.iconTheme.color;
    final textColor = context.themeData.textTheme.labelLarge?.color;

-    if (iconOnly) {
+    if (menuItem) {
      return IconButton(
        onPressed: onPressed,
        icon: Icon(iconData, size: iconSize, color: iconColor),
      );
    }

-    if (menuItem) {
-      final theme = context.themeData;
-      final effectiveStyle = theme.textTheme.labelLarge;
-      final effectiveIconColor = iconColor ?? theme.iconTheme.color ?? theme.colorScheme.onSurfaceVariant;
-
-      return MenuItemButton(
-        style: MenuItemButton.styleFrom(padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12)),
-        leadingIcon: Icon(iconData, color: effectiveIconColor, size: 20),
-        onPressed: onPressed,
-        child: Text(label, style: effectiveStyle),
-      );
-    }
-
    return ConstrainedBox(
      constraints: BoxConstraints(maxWidth: maxWidth),
      child: MaterialButton(
@@ -7,9 +7,8 @@ import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/widgets/asset_viewer/cast_dialog.dart';

 class CastActionButton extends ConsumerWidget {
-  const CastActionButton({super.key, this.iconOnly = true, this.menuItem = false});
+  const CastActionButton({super.key, this.menuItem = true});

-  final bool iconOnly;
  final bool menuItem;

  @override
@@ -23,7 +22,6 @@ class CastActionButton extends ConsumerWidget {
      onPressed: () {
        showDialog(context: context, builder: (context) => const CastDialog());
      },
-      iconOnly: iconOnly,
      menuItem: menuItem,
    );
  }
@@ -10,9 +10,8 @@ import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';

 class DownloadActionButton extends ConsumerWidget {
  final ActionSource source;
-  final bool iconOnly;
  final bool menuItem;
-  const DownloadActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const DownloadActionButton({super.key, required this.source, this.menuItem = false});

  void _onTap(BuildContext context, WidgetRef ref, BackgroundSyncManager backgroundSyncManager) async {
    if (!context.mounted) {
@@ -39,7 +38,6 @@ class DownloadActionButton extends ConsumerWidget {
      iconData: Icons.download,
      maxWidth: 95,
      label: "download".t(context: context),
-      iconOnly: iconOnly,
      menuItem: menuItem,
      onPressed: () => _onTap(context, ref, backgroundManager),
    );
@@ -10,10 +10,9 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';

 class FavoriteActionButton extends ConsumerWidget {
  final ActionSource source;
-  final bool iconOnly;
  final bool menuItem;

-  const FavoriteActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const FavoriteActionButton({super.key, required this.source, this.menuItem = false});

  void _onTap(BuildContext context, WidgetRef ref) async {
    if (!context.mounted) {
@@ -45,7 +44,6 @@ class FavoriteActionButton extends ConsumerWidget {
    return BaseActionButton(
      iconData: Icons.favorite_border_rounded,
      label: "favorite".t(context: context),
-      iconOnly: iconOnly,
      menuItem: menuItem,
      onPressed: () => _onTap(context, ref),
    );
@@ -12,9 +12,8 @@ import 'package:immich_mobile/providers/infrastructure/current_album.provider.da
 import 'package:immich_mobile/providers/user.provider.dart';

 class LikeActivityActionButton extends ConsumerWidget {
-  const LikeActivityActionButton({super.key, this.iconOnly = false, this.menuItem = false});
+  const LikeActivityActionButton({super.key, this.menuItem = false});

-  final bool iconOnly;
  final bool menuItem;

  @override
@@ -50,7 +49,6 @@ class LikeActivityActionButton extends ConsumerWidget {
          iconData: liked != null ? Icons.favorite : Icons.favorite_border,
          label: "like".t(context: context),
          onPressed: () => onTap(liked),
-          iconOnly: iconOnly,
          menuItem: menuItem,
        );
      },
@@ -59,7 +57,6 @@ class LikeActivityActionButton extends ConsumerWidget {
      loading: () => BaseActionButton(
        iconData: Icons.favorite_border,
        label: "like".t(context: context),
-        iconOnly: iconOnly,
        menuItem: menuItem,
      ),
      error: (error, stack) => Text('error_saving_image'.tr(args: [error.toString()])),
@@ -5,9 +5,8 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_bu
 import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';

 class MotionPhotoActionButton extends ConsumerWidget {
-  const MotionPhotoActionButton({super.key, this.iconOnly = true, this.menuItem = false});
+  const MotionPhotoActionButton({super.key, this.menuItem = true});

-  final bool iconOnly;
  final bool menuItem;

  @override
@@ -18,7 +17,6 @@ class MotionPhotoActionButton extends ConsumerWidget {
      iconData: isPlaying ? Icons.motion_photos_pause_outlined : Icons.play_circle_outline_rounded,
      label: "play_motion_photo".t(context: context),
      onPressed: ref.read(isPlayingMotionVideoProvider.notifier).toggle,
-      iconOnly: iconOnly,
      menuItem: menuItem,
    );
  }
@@ -10,10 +10,9 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';

 class UnFavoriteActionButton extends ConsumerWidget {
  final ActionSource source;
-  final bool iconOnly;
  final bool menuItem;

-  const UnFavoriteActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const UnFavoriteActionButton({super.key, required this.source, this.menuItem = false});

  void _onTap(BuildContext context, WidgetRef ref) async {
    if (!context.mounted) {
@@ -46,7 +45,6 @@ class UnFavoriteActionButton extends ConsumerWidget {
      iconData: Icons.favorite_rounded,
      label: "unfavorite".t(context: context),
      onPressed: () => _onTap(context, ref),
-      iconOnly: iconOnly,
      menuItem: menuItem,
    );
  }
@@ -38,13 +38,11 @@ class ViewerBottomBar extends ConsumerWidget {
      opacity = 0;
    }

-    final originalTheme = context.themeData;
-
    final actions = <Widget>[
      const ShareActionButton(source: ActionSource.viewer),
      if (asset.isLocalOnly) const UploadActionButton(source: ActionSource.viewer),
      if (asset.type == AssetType.image) const EditImageActionButton(),
-      if (asset.hasRemote) AddActionButton(originalTheme: originalTheme),
+      if (asset.hasRemote) const AddActionButton(),

      if (isOwner) ...[
        asset.isLocalOnly
@@ -251,8 +251,8 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
                color: context.textTheme.labelLarge?.color,
              ),
              subtitle: _getFileInfo(asset, exifInfo),
-              subtitleStyle: context.textTheme.labelMedium?.copyWith(
-                color: context.textTheme.labelMedium?.color?.withAlpha(200),
+              subtitleStyle: context.textTheme.bodyMedium?.copyWith(
+                color: context.textTheme.bodyMedium?.color?.withAlpha(155),
              ),
            );
          },
@@ -268,8 +268,8 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
            color: context.textTheme.labelLarge?.color,
          ),
          subtitle: _getFileInfo(asset, exifInfo),
-          subtitleStyle: context.textTheme.labelMedium?.copyWith(
-            color: context.textTheme.labelMedium?.color?.withAlpha(200),
+          subtitleStyle: context.textTheme.bodyMedium?.copyWith(
+            color: context.textTheme.bodyMedium?.color?.withAlpha(155),
          ),
        );
      }
@@ -280,7 +280,7 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
        // Asset Date and Time
        SheetTile(
          title: _getDateTime(context, asset, exifInfo),
-          titleStyle: context.textTheme.labelLarge,
+          titleStyle: context.textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w600),
          trailing: asset.hasRemote && isOwner ? const Icon(Icons.edit, size: 18) : null,
          onTap: asset.hasRemote && isOwner ? () async => await _editDateTime(context, ref) : null,
        ),
@@ -289,7 +289,7 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
        const SheetLocationDetails(),
        // Details header
        SheetTile(
-          title: 'details'.t(context: context).toUpperCase(),
+          title: 'exif_bottom_sheet_details'.t(context: context),
          titleStyle: context.textTheme.labelMedium?.copyWith(
            color: context.textTheme.labelMedium?.color?.withAlpha(200),
            fontWeight: FontWeight.w600,
@@ -298,33 +298,29 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
        // File info
        buildFileInfoTile(),
        // Camera info
-        if (cameraTitle != null) ...[
-          const SizedBox(height: 16),
+        if (cameraTitle != null)
          SheetTile(
            title: cameraTitle,
            titleStyle: context.textTheme.labelLarge,
            leading: Icon(Icons.camera_alt_outlined, size: 24, color: context.textTheme.labelLarge?.color),
            subtitle: _getCameraInfoSubtitle(exifInfo),
-            subtitleStyle: context.textTheme.labelMedium?.copyWith(
-              color: context.textTheme.labelMedium?.color?.withAlpha(200),
+            subtitleStyle: context.textTheme.bodyMedium?.copyWith(
+              color: context.textTheme.bodyMedium?.color?.withAlpha(155),
            ),
          ),
-        ],
        // Lens info
-        if (lensTitle != null) ...[
-          const SizedBox(height: 16),
+        if (lensTitle != null)
          SheetTile(
            title: lensTitle,
            titleStyle: context.textTheme.labelLarge,
            leading: Icon(Icons.camera_outlined, size: 24, color: context.textTheme.labelLarge?.color),
            subtitle: _getLensInfoSubtitle(exifInfo),
-            subtitleStyle: context.textTheme.labelMedium?.copyWith(
-              color: context.textTheme.labelMedium?.color?.withAlpha(200),
+            subtitleStyle: context.textTheme.bodyMedium?.copyWith(
+              color: context.textTheme.bodyMedium?.color?.withAlpha(155),
            ),
          ),
-        ],
        // Appears in (Albums)
-        Padding(padding: const EdgeInsets.only(top: 16.0), child: _buildAppearsInList(ref, context)),
+        _buildAppearsInList(ref, context),
        // padding at the bottom to avoid cut-off
        const SizedBox(height: 100),
      ],
@@ -78,7 +78,7 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
          SheetTile(
-            title: 'location'.t(context: context).toUpperCase(),
+            title: 'exif_bottom_sheet_location'.t(context: context),
            titleStyle: context.textTheme.labelMedium?.copyWith(
              color: context.textTheme.labelMedium?.color?.withAlpha(200),
              fontWeight: FontWeight.w600,
@@ -102,7 +102,7 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
                  Text(
                    coordinates,
                    style: context.textTheme.labelMedium?.copyWith(
-                      color: context.textTheme.labelMedium?.color?.withAlpha(200),
+                      color: context.textTheme.labelMedium?.color?.withAlpha(150),
                    ),
                  ),
                ],
@@ -46,7 +46,7 @@ class SheetTile extends ConsumerWidget {
    } else {
      titleWidget = Container(
        width: double.infinity,
-        padding: const EdgeInsets.only(left: 15, right: 15),
+        padding: const EdgeInsets.only(left: 15),
        child: Text(title, style: titleStyle),
      );
    }
@@ -14,7 +14,6 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_actio
 import 'package:immich_mobile/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
-import 'package:immich_mobile/presentation/widgets/asset_viewer/viewer_kebab_menu.widget.dart';
 import 'package:immich_mobile/providers/activity.provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
@@ -66,8 +65,8 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
    final isCasting = ref.watch(castProvider.select((c) => c.isCasting));

    final actions = <Widget>[
-      if (asset.isRemoteOnly) const DownloadActionButton(source: ActionSource.viewer, iconOnly: true),
-      if (isCasting || (asset.hasRemote)) const CastActionButton(iconOnly: true),
+      if (asset.isRemoteOnly) const DownloadActionButton(source: ActionSource.viewer, menuItem: true),
+      if (isCasting || (asset.hasRemote)) const CastActionButton(menuItem: true),
      if (album != null && album.isActivityEnabled && album.isShared)
        IconButton(
          icon: const Icon(Icons.chat_outlined),
@@ -86,16 +85,16 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
          tooltip: 'view_in_timeline'.t(context: context),
        ),
      if (asset.hasRemote && isOwner && !asset.isFavorite)
-        const FavoriteActionButton(source: ActionSource.viewer, iconOnly: true),
+        const FavoriteActionButton(source: ActionSource.viewer, menuItem: true),
      if (asset.hasRemote && isOwner && asset.isFavorite)
-        const UnFavoriteActionButton(source: ActionSource.viewer, iconOnly: true),
-      if (asset.isMotionPhoto) const MotionPhotoActionButton(iconOnly: true),
-      const ViewerKebabMenu(),
+        const UnFavoriteActionButton(source: ActionSource.viewer, menuItem: true),
+      if (asset.isMotionPhoto) const MotionPhotoActionButton(menuItem: true),
+      const _KebabMenu(),
    ];

    final lockedViewActions = <Widget>[
-      if (isCasting || (asset.hasRemote)) const CastActionButton(iconOnly: true),
-      const ViewerKebabMenu(),
+      if (isCasting || (asset.hasRemote)) const CastActionButton(menuItem: true),
+      const _KebabMenu(),
    ];

    return IgnorePointer(
@@ -123,6 +122,20 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
  Size get preferredSize => const Size.fromHeight(60.0);
 }

+class _KebabMenu extends ConsumerWidget {
+  const _KebabMenu();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return IconButton(
+      onPressed: () {
+        EventStream.shared.emit(const ViewerOpenBottomSheetEvent());
+      },
+      icon: const Icon(Icons.more_vert_rounded),
+    );
+  }
+}
+
 class _AppBarBackButton extends ConsumerWidget {
  const _AppBarBackButton();

@@ -1,47 +0,0 @@
-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/events.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/base_action_button.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
-
-class ViewerKebabMenu extends ConsumerWidget {
-  const ViewerKebabMenu({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final asset = ref.watch(currentAssetNotifier);
-    if (asset == null) {
-      return const SizedBox.shrink();
-    }
-
-    final menuChildren = <Widget>[
-      BaseActionButton(
-        label: 'about'.tr(),
-        iconData: Icons.info_outline,
-        menuItem: true,
-        onPressed: () => EventStream.shared.emit(const ViewerOpenBottomSheetEvent()),
-      ),
-    ];
-
-    return MenuAnchor(
-      consumeOutsideTap: true,
-      style: MenuStyle(
-        backgroundColor: WidgetStatePropertyAll(context.themeData.scaffoldBackgroundColor),
-        elevation: const WidgetStatePropertyAll(4),
-        shape: const WidgetStatePropertyAll(
-          RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12))),
-        ),
-      ),
-      menuChildren: menuChildren,
-      builder: (context, controller, child) {
-        return IconButton(
-          icon: const Icon(Icons.more_vert_rounded),
-          onPressed: () => controller.isOpen ? controller.close() : controller.open(),
-        );
-      },
-    );
-  }
-}
@@ -4,7 +4,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/models/backup/backup_state.model.dart';
 import 'package:immich_mobile/providers/album/album.provider.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
@@ -151,7 +150,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
    try {
      bool syncSuccess = false;
      await Future.wait([
-        _safeRun(backgroundManager.syncLocal(full: CurrentPlatform.isAndroid ? true : false), "syncLocal"),
+        _safeRun(backgroundManager.syncLocal(), "syncLocal"),
        _safeRun(backgroundManager.syncRemote().then((success) => syncSuccess = success), "syncRemote"),
      ]);
      if (syncSuccess) {
@@ -167,7 +167,7 @@ class AppRouter extends RootStackRouter {
    AutoRoute(page: LoginRoute.page, guards: [_duplicateGuard]),
    AutoRoute(page: ChangePasswordRoute.page),
    AutoRoute(page: SearchRoute.page, guards: [_authGuard, _duplicateGuard], maintainState: false),
-    AutoRoute(
+    CustomRoute(
      page: TabControllerRoute.page,
      guards: [_authGuard, _duplicateGuard],
      children: [
@@ -176,8 +176,9 @@ class AppRouter extends RootStackRouter {
        AutoRoute(page: LibraryRoute.page, guards: [_authGuard, _duplicateGuard]),
        AutoRoute(page: AlbumsRoute.page, guards: [_authGuard, _duplicateGuard]),
      ],
+      transitionsBuilder: TransitionsBuilders.fadeIn,
    ),
-    AutoRoute(
+    CustomRoute(
      page: TabShellRoute.page,
      guards: [_authGuard, _duplicateGuard],
      children: [
@@ -186,6 +187,7 @@ class AppRouter extends RootStackRouter {
        AutoRoute(page: DriftLibraryRoute.page, guards: [_authGuard, _duplicateGuard]),
        AutoRoute(page: DriftAlbumsRoute.page, guards: [_authGuard, _duplicateGuard]),
      ],
+      transitionsBuilder: TransitionsBuilders.fadeIn,
    ),
    CustomRoute(
      page: GalleryViewerRoute.page,
@@ -81,7 +81,7 @@ Future<void> migrateDatabaseIfNeeded(Isar db, Drift drift) async {
  }

  if (version < 19 && Store.isBetaTimelineEnabled) {
-    if (!await _populateLocalAssetTime(drift)) {
+    if (!await _populateUpdatedAtTime(drift)) {
      return;
    }
  }
@@ -229,7 +229,7 @@ Future<void> _migrateDeviceAsset(Isar db) async {
  });
 }

-Future<bool> _populateLocalAssetTime(Drift db) async {
+Future<bool> _populateUpdatedAtTime(Drift db) async {
  try {
    final nativeApi = NativeSyncApi();
    final albums = await nativeApi.getAlbums();
@@ -240,9 +240,6 @@ Future<bool> _populateLocalAssetTime(Drift db) async {
          batch.update(
            db.localAssetEntity,
            LocalAssetEntityCompanion(
-              longitude: Value(asset.longitude),
-              latitude: Value(asset.latitude),
-              adjustmentTime: Value(tryFromSecondsSinceEpoch(asset.adjustmentTime, isUtc: true)),
              updatedAt: Value(tryFromSecondsSinceEpoch(asset.updatedAt, isUtc: true) ?? DateTime.timestamp()),
            ),
            where: (t) => t.id.equals(asset.id),
@@ -253,7 +250,7 @@ Future<bool> _populateLocalAssetTime(Drift db) async {

    return true;
  } catch (error) {
-    dPrint(() => "[MIGRATION] Error while populating asset time: $error");
+    dPrint(() => "[MIGRATION] Error while populating updatedAt time: $error");
    return false;
  }
 }
@@ -14,7 +14,7 @@ class WorkflowActionItemDto {
  /// Returns a new [WorkflowActionItemDto] instance.
  WorkflowActionItemDto({
    this.actionConfig,
-    required this.pluginActionId,
+    required this.actionId,
  });

  ///
@@ -25,21 +25,21 @@ class WorkflowActionItemDto {
  ///
  Object? actionConfig;

-  String pluginActionId;
+  String actionId;

  @override
  bool operator ==(Object other) => identical(this, other) || other is WorkflowActionItemDto &&
    other.actionConfig == actionConfig &&
-    other.pluginActionId == pluginActionId;
+    other.actionId == actionId;

  @override
  int get hashCode =>
    // ignore: unnecessary_parenthesis
    (actionConfig == null ? 0 : actionConfig!.hashCode) +
-    (pluginActionId.hashCode);
+    (actionId.hashCode);

  @override
-  String toString() => 'WorkflowActionItemDto[actionConfig=$actionConfig, pluginActionId=$pluginActionId]';
+  String toString() => 'WorkflowActionItemDto[actionConfig=$actionConfig, actionId=$actionId]';

  Map<String, dynamic> toJson() {
    final json = <String, dynamic>{};
@@ -48,7 +48,7 @@ class WorkflowActionItemDto {
    } else {
    //  json[r'actionConfig'] = null;
    }
-      json[r'pluginActionId'] = this.pluginActionId;
+      json[r'actionId'] = this.actionId;
    return json;
  }

@@ -62,7 +62,7 @@ class WorkflowActionItemDto {

      return WorkflowActionItemDto(
        actionConfig: mapValueOfType<Object>(json, r'actionConfig'),
-        pluginActionId: mapValueOfType<String>(json, r'pluginActionId')!,
+        actionId: mapValueOfType<String>(json, r'actionId')!,
      );
    }
    return null;
@@ -110,7 +110,7 @@ class WorkflowActionItemDto {

  /// The list of required keys that must be present in a JSON.
  static const requiredKeys = <String>{
-    'pluginActionId',
+    'actionId',
  };
 }

@@ -14,41 +14,41 @@ class WorkflowActionResponseDto {
  /// Returns a new [WorkflowActionResponseDto] instance.
  WorkflowActionResponseDto({
    required this.actionConfig,
+    required this.actionId,
    required this.id,
    required this.order,
-    required this.pluginActionId,
    required this.workflowId,
  });

  Object? actionConfig;

+  String actionId;
+
  String id;

  num order;

-  String pluginActionId;
-
  String workflowId;

  @override
  bool operator ==(Object other) => identical(this, other) || other is WorkflowActionResponseDto &&
    other.actionConfig == actionConfig &&
+    other.actionId == actionId &&
    other.id == id &&
    other.order == order &&
-    other.pluginActionId == pluginActionId &&
    other.workflowId == workflowId;

  @override
  int get hashCode =>
    // ignore: unnecessary_parenthesis
    (actionConfig == null ? 0 : actionConfig!.hashCode) +
+    (actionId.hashCode) +
    (id.hashCode) +
    (order.hashCode) +
-    (pluginActionId.hashCode) +
    (workflowId.hashCode);

  @override
-  String toString() => 'WorkflowActionResponseDto[actionConfig=$actionConfig, id=$id, order=$order, pluginActionId=$pluginActionId, workflowId=$workflowId]';
+  String toString() => 'WorkflowActionResponseDto[actionConfig=$actionConfig, actionId=$actionId, id=$id, order=$order, workflowId=$workflowId]';

  Map<String, dynamic> toJson() {
    final json = <String, dynamic>{};
@@ -57,9 +57,9 @@ class WorkflowActionResponseDto {
    } else {
    //  json[r'actionConfig'] = null;
    }
+      json[r'actionId'] = this.actionId;
      json[r'id'] = this.id;
      json[r'order'] = this.order;
-      json[r'pluginActionId'] = this.pluginActionId;
      json[r'workflowId'] = this.workflowId;
    return json;
  }
@@ -74,9 +74,9 @@ class WorkflowActionResponseDto {

      return WorkflowActionResponseDto(
        actionConfig: mapValueOfType<Object>(json, r'actionConfig'),
+        actionId: mapValueOfType<String>(json, r'actionId')!,
        id: mapValueOfType<String>(json, r'id')!,
        order: num.parse('${json[r'order']}'),
-        pluginActionId: mapValueOfType<String>(json, r'pluginActionId')!,
        workflowId: mapValueOfType<String>(json, r'workflowId')!,
      );
    }
@@ -126,9 +126,9 @@ class WorkflowActionResponseDto {
  /// The list of required keys that must be present in a JSON.
  static const requiredKeys = <String>{
    'actionConfig',
+    'actionId',
    'id',
    'order',
-    'pluginActionId',
    'workflowId',
  };
 }
@@ -14,7 +14,7 @@ class WorkflowFilterItemDto {
  /// Returns a new [WorkflowFilterItemDto] instance.
  WorkflowFilterItemDto({
    this.filterConfig,
-    required this.pluginFilterId,
+    required this.filterId,
  });

  ///
@@ -25,21 +25,21 @@ class WorkflowFilterItemDto {
  ///
  Object? filterConfig;

-  String pluginFilterId;
+  String filterId;

  @override
  bool operator ==(Object other) => identical(this, other) || other is WorkflowFilterItemDto &&
    other.filterConfig == filterConfig &&
-    other.pluginFilterId == pluginFilterId;
+    other.filterId == filterId;

  @override
  int get hashCode =>
    // ignore: unnecessary_parenthesis
    (filterConfig == null ? 0 : filterConfig!.hashCode) +
-    (pluginFilterId.hashCode);
+    (filterId.hashCode);

  @override
-  String toString() => 'WorkflowFilterItemDto[filterConfig=$filterConfig, pluginFilterId=$pluginFilterId]';
+  String toString() => 'WorkflowFilterItemDto[filterConfig=$filterConfig, filterId=$filterId]';

  Map<String, dynamic> toJson() {
    final json = <String, dynamic>{};
@@ -48,7 +48,7 @@ class WorkflowFilterItemDto {
    } else {
    //  json[r'filterConfig'] = null;
    }
-      json[r'pluginFilterId'] = this.pluginFilterId;
+      json[r'filterId'] = this.filterId;
    return json;
  }

@@ -62,7 +62,7 @@ class WorkflowFilterItemDto {

      return WorkflowFilterItemDto(
        filterConfig: mapValueOfType<Object>(json, r'filterConfig'),
-        pluginFilterId: mapValueOfType<String>(json, r'pluginFilterId')!,
+        filterId: mapValueOfType<String>(json, r'filterId')!,
      );
    }
    return null;
@@ -110,7 +110,7 @@ class WorkflowFilterItemDto {

  /// The list of required keys that must be present in a JSON.
  static const requiredKeys = <String>{
-    'pluginFilterId',
+    'filterId',
  };
 }

@@ -14,41 +14,41 @@ class WorkflowFilterResponseDto {
  /// Returns a new [WorkflowFilterResponseDto] instance.
  WorkflowFilterResponseDto({
    required this.filterConfig,
+    required this.filterId,
    required this.id,
    required this.order,
-    required this.pluginFilterId,
    required this.workflowId,
  });

  Object? filterConfig;

+  String filterId;
+
  String id;

  num order;

-  String pluginFilterId;
-
  String workflowId;

  @override
  bool operator ==(Object other) => identical(this, other) || other is WorkflowFilterResponseDto &&
    other.filterConfig == filterConfig &&
+    other.filterId == filterId &&
    other.id == id &&
    other.order == order &&
-    other.pluginFilterId == pluginFilterId &&
    other.workflowId == workflowId;

  @override
  int get hashCode =>
    // ignore: unnecessary_parenthesis
    (filterConfig == null ? 0 : filterConfig!.hashCode) +
+    (filterId.hashCode) +
    (id.hashCode) +
    (order.hashCode) +
-    (pluginFilterId.hashCode) +
    (workflowId.hashCode);

  @override
-  String toString() => 'WorkflowFilterResponseDto[filterConfig=$filterConfig, id=$id, order=$order, pluginFilterId=$pluginFilterId, workflowId=$workflowId]';
+  String toString() => 'WorkflowFilterResponseDto[filterConfig=$filterConfig, filterId=$filterId, id=$id, order=$order, workflowId=$workflowId]';

  Map<String, dynamic> toJson() {
    final json = <String, dynamic>{};
@@ -57,9 +57,9 @@ class WorkflowFilterResponseDto {
    } else {
    //  json[r'filterConfig'] = null;
    }
+      json[r'filterId'] = this.filterId;
      json[r'id'] = this.id;
      json[r'order'] = this.order;
-      json[r'pluginFilterId'] = this.pluginFilterId;
      json[r'workflowId'] = this.workflowId;
    return json;
  }
@@ -74,9 +74,9 @@ class WorkflowFilterResponseDto {

      return WorkflowFilterResponseDto(
        filterConfig: mapValueOfType<Object>(json, r'filterConfig'),
+        filterId: mapValueOfType<String>(json, r'filterId')!,
        id: mapValueOfType<String>(json, r'id')!,
        order: num.parse('${json[r'order']}'),
-        pluginFilterId: mapValueOfType<String>(json, r'pluginFilterId')!,
        workflowId: mapValueOfType<String>(json, r'workflowId')!,
      );
    }
@@ -126,9 +126,9 @@ class WorkflowFilterResponseDto {
  /// The list of required keys that must be present in a JSON.
  static const requiredKeys = <String>{
    'filterConfig',
+    'filterId',
    'id',
    'order',
-    'pluginFilterId',
    'workflowId',
  };
 }
@@ -27,10 +27,6 @@ class PlatformAsset {
  final int orientation;
  final bool isFavorite;

-  final int? adjustmentTime;
-  final double? latitude;
-  final double? longitude;
-
  const PlatformAsset({
    required this.id,
    required this.name,
@@ -42,9 +38,6 @@ class PlatformAsset {
    this.durationInSeconds = 0,
    this.orientation = 0,
    this.isFavorite = false,
-    this.adjustmentTime,
-    this.latitude,
-    this.longitude,
  });
 }

@@ -16,7 +16,6 @@ import 'schema_v10.dart' as v10;
 import 'schema_v11.dart' as v11;
 import 'schema_v12.dart' as v12;
 import 'schema_v13.dart' as v13;
-import 'schema_v14.dart' as v14;

 class GeneratedHelper implements SchemaInstantiationHelper {
  @override
@@ -48,12 +47,10 @@ class GeneratedHelper implements SchemaInstantiationHelper {
        return v12.DatabaseAtV12(db);
      case 13:
        return v13.DatabaseAtV13(db);
-      case 14:
-        return v14.DatabaseAtV14(db);
      default:
        throw MissingSchemaException(version, versions);
    }
  }

-  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14];
+  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13];
 }
@@ -23162,13 +23162,13 @@
          "actionConfig": {
            "type": "object"
          },
-          "pluginActionId": {
+          "actionId": {
            "format": "uuid",
            "type": "string"
          }
        },
        "required": [
-          "pluginActionId"
+          "actionId"
        ],
        "type": "object"
      },
@@ -23178,24 +23178,24 @@
            "nullable": true,
            "type": "object"
          },
+          "actionId": {
+            "type": "string"
+          },
          "id": {
            "type": "string"
          },
          "order": {
            "type": "number"
          },
-          "pluginActionId": {
-            "type": "string"
-          },
          "workflowId": {
            "type": "string"
          }
        },
        "required": [
          "actionConfig",
+          "actionId",
          "id",
          "order",
-          "pluginActionId",
          "workflowId"
        ],
        "type": "object"
@@ -23244,13 +23244,13 @@
          "filterConfig": {
            "type": "object"
          },
-          "pluginFilterId": {
+          "filterId": {
            "format": "uuid",
            "type": "string"
          }
        },
        "required": [
-          "pluginFilterId"
+          "filterId"
        ],
        "type": "object"
      },
@@ -23260,24 +23260,24 @@
            "nullable": true,
            "type": "object"
          },
+          "filterId": {
+            "type": "string"
+          },
          "id": {
            "type": "string"
          },
          "order": {
            "type": "number"
          },
-          "pluginFilterId": {
-            "type": "string"
-          },
          "workflowId": {
            "type": "string"
          }
        },
        "required": [
          "filterConfig",
+          "filterId",
          "id",
          "order",
-          "pluginFilterId",
          "workflowId"
        ],
        "type": "object"
@@ -1729,16 +1729,16 @@ export type CreateProfileImageResponseDto = {
 };
 export type WorkflowActionResponseDto = {
    actionConfig: object | null;
+    actionId: string;
    id: string;
    order: number;
-    pluginActionId: string;
    workflowId: string;
 };
 export type WorkflowFilterResponseDto = {
    filterConfig: object | null;
+    filterId: string;
    id: string;
    order: number;
-    pluginFilterId: string;
    workflowId: string;
 };
 export type WorkflowResponseDto = {
@@ -1754,11 +1754,11 @@ export type WorkflowResponseDto = {
 };
 export type WorkflowActionItemDto = {
    actionConfig?: object;
-    pluginActionId: string;
+    actionId: string;
 };
 export type WorkflowFilterItemDto = {
    filterConfig?: object;
-    pluginFilterId: string;
+    filterId: string;
 };
 export type WorkflowCreateDto = {
    actions: WorkflowActionItemDto[];
@@ -3,7 +3,7 @@
  "version": "0.0.1",
  "description": "Monorepo for Immich",
  "private": true,
-  "packageManager": "pnpm@10.24.0+sha512.01ff8ae71b4419903b65c60fb2dc9d34cf8bb6e06d03bde112ef38f7a34d6904c424ba66bea5cdcf12890230bf39f9580473140ed9c946fef328b6e5238a345a",
+  "packageManager": "pnpm@10.22.0+sha512.bf049efe995b28f527fd2b41ae0474ce29186f7edcb3bf545087bd61fbbebb2bf75362d1307fda09c2d288e1e499787ac12d4fcb617a974718a6051f2eee741c",
  "engines": {
    "pnpm": ">=10.0.0"
  }
@@ -50,15 +50,13 @@ RUN --mount=type=cache,id=pnpm-cli,target=/buildcache/pnpm-store \

 FROM builder AS plugins

-ARG TARGETPLATFORM
-
 COPY --from=ghcr.io/jdx/mise:2025.11.3@sha256:ac26f5978c0e2783f3e68e58ce75eddb83e41b89bf8747c503bac2aa9baf22c5 /usr/local/bin/mise /usr/local/bin/mise

 WORKDIR /usr/src/app
 COPY ./plugins/mise.toml ./plugins/
 ENV MISE_TRUSTED_CONFIG_PATHS=/usr/src/app/plugins/mise.toml
 ENV MISE_DATA_DIR=/buildcache/mise
-RUN --mount=type=cache,id=mise-tools-${TARGETPLATFORM},target=/buildcache/mise \
+RUN --mount=type=cache,id=mise-tools,target=/buildcache/mise \
  mise install --cd plugins

 COPY ./plugins ./plugins/
@@ -68,7 +66,7 @@ RUN --mount=type=cache,id=pnpm-plugins,target=/buildcache/pnpm-store \
  --mount=type=bind,source=.pnpmfile.cjs,target=.pnpmfile.cjs \
  --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
  --mount=type=bind,source=pnpm-workspace.yaml,target=pnpm-workspace.yaml \
-  --mount=type=cache,id=mise-tools-${TARGETPLATFORM},target=/buildcache/mise \
+  --mount=type=cache,id=mise-tools,target=/buildcache/mise \
  cd plugins && mise run build

 FROM ghcr.io/immich-app/base-server-prod:202511261514@sha256:c04c1c38dd90e53455b180aedf93c3c63474c8d20ffe2c6d7a3a61a2181e6d29
@@ -45,14 +45,14 @@
    "@nestjs/websockets": "^11.0.4",
    "@opentelemetry/api": "^1.9.0",
    "@opentelemetry/context-async-hooks": "^2.0.0",
-    "@opentelemetry/exporter-prometheus": "^0.208.0",
-    "@opentelemetry/instrumentation-http": "^0.208.0",
-    "@opentelemetry/instrumentation-ioredis": "^0.56.0",
-    "@opentelemetry/instrumentation-nestjs-core": "^0.55.0",
-    "@opentelemetry/instrumentation-pg": "^0.61.0",
+    "@opentelemetry/exporter-prometheus": "^0.207.0",
+    "@opentelemetry/instrumentation-http": "^0.207.0",
+    "@opentelemetry/instrumentation-ioredis": "^0.55.0",
+    "@opentelemetry/instrumentation-nestjs-core": "^0.54.0",
+    "@opentelemetry/instrumentation-pg": "^0.60.0",
    "@opentelemetry/resources": "^2.0.1",
    "@opentelemetry/sdk-metrics": "^2.0.1",
-    "@opentelemetry/sdk-node": "^0.208.0",
+    "@opentelemetry/sdk-node": "^0.207.0",
    "@opentelemetry/semantic-conventions": "^1.34.0",
    "@react-email/components": "^0.5.0",
    "@react-email/render": "^1.1.2",
@@ -70,7 +70,7 @@
    "cookie": "^1.0.2",
    "cookie-parser": "^1.4.7",
    "cron": "4.3.3",
-    "exiftool-vendored": "^34.0.0",
+    "exiftool-vendored": "^33.0.0",
    "express": "^5.1.0",
    "fast-glob": "^3.3.2",
    "fluent-ffmpeg": "^2.1.2",
@@ -153,7 +153,7 @@
    "mock-fs": "^5.2.0",
    "node-gyp": "^12.0.0",
    "pngjs": "^7.0.0",
-    "prettier": "^3.7.4",
+    "prettier": "^3.0.2",
    "prettier-plugin-organize-imports": "^4.0.0",
    "sql-formatter": "^15.0.0",
    "supertest": "^7.1.0",
@@ -290,7 +290,7 @@ export class StorageCore {
  private savePath(pathType: PathType, id: string, newPath: string) {
    switch (pathType) {
      case AssetPathType.Original: {
-        return this.assetRepository.update({ id, originalPath: newPath });
+        return this.assetRepository.upsertFile({ assetId: id, type: AssetFileType.Original, path: newPath });
      }
      case AssetPathType.FullSize: {
        return this.assetRepository.upsertFile({ assetId: id, type: AssetFileType.FullSize, path: newPath });
@@ -120,7 +120,6 @@ export type Asset = {
  livePhotoVideoId: string | null;
  localDateTime: Date;
  originalFileName: string;
-  originalPath: string;
  ownerId: string;
  type: AssetType;
 };
@@ -301,14 +300,14 @@ export type Workflow = Selectable<WorkflowTable> & {

 export type WorkflowFilter = Selectable<WorkflowFilterTable> & {
  workflowId: string;
-  pluginFilterId: string;
+  filterId: string;
  filterConfig: FilterConfig | null;
  order: number;
 };

 export type WorkflowAction = Selectable<WorkflowActionTable> & {
  workflowId: string;
-  pluginActionId: string;
+  actionId: string;
  actionConfig: ActionConfig | null;
  order: number;
 };
@@ -337,7 +336,6 @@ export const columns = {
    'asset.livePhotoVideoId',
    'asset.localDateTime',
    'asset.originalFileName',
-    'asset.originalPath',
    'asset.ownerId',
    'asset.type',
  ],
@@ -121,7 +121,6 @@ export type MapAsset = {
  livePhotoVideoId: string | null;
  localDateTime: Date;
  originalFileName: string;
-  originalPath: string;
  owner?: User | null;
  ownerId: string;
  stack?: Stack | null;
@@ -7,7 +7,7 @@ import { Optional, ValidateBoolean, ValidateEnum } from 'src/validation';

 export class WorkflowFilterItemDto {
  @IsUUID()
-  pluginFilterId!: string;
+  filterId!: string;

  @IsObject()
  @Optional()
@@ -16,7 +16,7 @@ export class WorkflowFilterItemDto {

 export class WorkflowActionItemDto {
  @IsUUID()
-  pluginActionId!: string;
+  actionId!: string;

  @IsObject()
  @Optional()
@@ -86,7 +86,7 @@ export class WorkflowResponseDto {
 export class WorkflowFilterResponseDto {
  id!: string;
  workflowId!: string;
-  pluginFilterId!: string;
+  filterId!: string;
  filterConfig!: FilterConfig | null;
  order!: number;
 }
@@ -94,7 +94,7 @@ export class WorkflowFilterResponseDto {
 export class WorkflowActionResponseDto {
  id!: string;
  workflowId!: string;
-  pluginActionId!: string;
+  actionId!: string;
  actionConfig!: ActionConfig | null;
  order!: number;
 }
@@ -103,7 +103,7 @@ export function mapWorkflowFilter(filter: WorkflowFilter): WorkflowFilterRespons
  return {
    id: filter.id,
    workflowId: filter.workflowId,
-    pluginFilterId: filter.pluginFilterId,
+    filterId: filter.filterId,
    filterConfig: filter.filterConfig,
    order: filter.order,
  };
@@ -113,7 +113,7 @@ export function mapWorkflowAction(action: WorkflowAction): WorkflowActionRespons
  return {
    id: action.id,
    workflowId: action.workflowId,
-    pluginActionId: action.pluginActionId,
+    actionId: action.actionId,
    actionConfig: action.actionConfig,
    order: action.order,
  };
@@ -38,6 +38,7 @@ export enum AssetType {
 }

 export enum AssetFileType {
+  Original = 'original',
  /**
   * An full/large-size image extracted/converted from RAW photos
   */
@@ -369,7 +369,6 @@ select
  "asset"."livePhotoVideoId",
  "asset"."encodedVideoPath",
  "asset"."originalPath",
-  "asset"."isOffline",
  to_json("asset_exif") as "exifInfo",
  (
    select
@@ -17,6 +17,8 @@ import {
  withFacesAndPeople,
  withFilePath,
  withFiles,
+  withOriginals,
+  withSidecars,
 } from 'src/utils/database';

@Injectable()
@@ -39,8 +41,9 @@ export class AssetJobRepository {
    return this.db
      .selectFrom('asset')
      .where('asset.id', '=', asUuid(id))
-      .select(['id', 'originalPath'])
-      .select((eb) => withFiles(eb, AssetFileType.Sidecar))
+      .select('id')
+      .select(withSidecars)
+      .select(withOriginals)
      .select((eb) =>
        jsonArrayFrom(
          eb
@@ -59,8 +62,9 @@ export class AssetJobRepository {
    return this.db
      .selectFrom('asset')
      .where('asset.id', '=', asUuid(id))
-      .select(['id', 'originalPath'])
-      .select((eb) => withFiles(eb, AssetFileType.Sidecar))
+      .select('id')
+      .select(withSidecars)
+      .select(withOriginals)
      .limit(1)
      .executeTakeFirst();
  }
@@ -106,7 +110,6 @@ export class AssetJobRepository {
        'asset.id',
        'asset.visibility',
        'asset.originalFileName',
-        'asset.originalPath',
        'asset.ownerId',
        'asset.thumbhash',
        'asset.type',
@@ -123,7 +126,8 @@ export class AssetJobRepository {
      .selectFrom('asset')
      .select(columns.asset)
      .select(withFaces)
-      .select((eb) => withFiles(eb, AssetFileType.Sidecar))
+      .select(withOriginals)
+      .select(withSidecars)
      .where('asset.id', '=', id)
      .executeTakeFirst();
  }
@@ -208,14 +212,8 @@ export class AssetJobRepository {
  getForSyncAssets(ids: string[]) {
    return this.db
      .selectFrom('asset')
-      .select([
-        'asset.id',
-        'asset.isOffline',
-        'asset.libraryId',
-        'asset.originalPath',
-        'asset.status',
-        'asset.fileModifiedAt',
-      ])
+      .select(['asset.id', 'asset.isOffline', 'asset.libraryId', 'asset.status', 'asset.fileModifiedAt'])
+      .select(withOriginals)
      .where('asset.id', '=', anyUuid(ids))
      .execute();
  }
@@ -231,8 +229,6 @@ export class AssetJobRepository {
        'asset.ownerId',
        'asset.livePhotoVideoId',
        'asset.encodedVideoPath',
-        'asset.originalPath',
-        'asset.isOffline',
      ])
      .$call(withExif)
      .select(withFacesAndPeople)
@@ -275,7 +271,8 @@ export class AssetJobRepository {
  getForVideoConversion(id: string) {
    return this.db
      .selectFrom('asset')
-      .select(['asset.id', 'asset.ownerId', 'asset.originalPath', 'asset.encodedVideoPath'])
+      .select(['asset.id', 'asset.ownerId', 'asset.encodedVideoPath'])
+      .select(withOriginals)
      .where('asset.id', '=', id)
      .where('asset.type', '=', AssetType.Video)
      .executeTakeFirst();
@@ -306,15 +303,22 @@ export class AssetJobRepository {
        'asset.ownerId',
        'asset.type',
        'asset.checksum',
-        'asset.originalPath',
        'asset.isExternal',
        'asset.originalFileName',
        'asset.livePhotoVideoId',
        'asset.fileCreatedAt',
        'asset_exif.timeZone',
        'asset_exif.fileSizeInByte',
+        (eb) =>
+          eb
+            .selectFrom('asset_file')
+            .select('asset_file.path')
+            .whereRef('asset_file.assetId', '=', 'asset.id')
+            .where('asset_file.type', '=', AssetFileType.Sidecar)
+            .limit(1)
+            .as('sidecarPath'), // TODO: change to withSidecars
      ])
-      .select((eb) => withFiles(eb, AssetFileType.Sidecar))
+      .select(withOriginals)
      .where('asset.deletedAt', 'is', null);
  }

@@ -24,7 +24,9 @@ import {
  withFacesAndPeople,
  withFiles,
  withLibrary,
+  withOriginals,
  withOwner,
+  withSidecars,
  withSmartSearch,
  withTagId,
  withTags,
@@ -111,6 +113,8 @@ interface GetByIdsRelations {
  smartSearch?: boolean;
  stack?: { assets?: boolean };
  tags?: boolean;
+  originals?: boolean;
+  sidecars?: boolean;
 }

@Injectable()
@@ -251,8 +255,23 @@ export class AssetRepository {
    await this.db.deleteFrom('asset_metadata').where('assetId', '=', id).where('key', '=', key).execute();
  }

-  create(asset: Insertable<AssetTable>) {
-    return this.db.insertInto('asset').values(asset).returningAll().executeTakeFirstOrThrow();
+  create(asset: Insertable<AssetTable>, files?: Insertable<AssetFileTable>[]) {
+    return this.db.transaction().execute(async (trx) => {
+      const createdAsset = await trx.insertInto('asset').values(asset).returningAll().executeTakeFirstOrThrow();
+      if (files && files.length > 0) {
+        const values = files.map((f) => ({ ...f, assetId: createdAsset.id }));
+
+        await trx.insertInto('asset_file').values(values).returningAll().execute();
+      }
+
+      const assetWithFiles = await trx
+        .selectFrom('asset')
+        .selectAll('asset')
+        .select(withOriginals)
+        .where('asset.id', '=', asUuid(createdAsset.id))
+        .executeTakeFirstOrThrow();
+      return assetWithFiles;
+    });
  }

  createAll(assets: Insertable<AssetTable>[]) {
@@ -354,8 +373,10 @@ export class AssetRepository {
    return this.db
      .selectFrom('asset')
      .selectAll('asset')
-      .where('libraryId', '=', asUuid(libraryId))
-      .where('originalPath', '=', originalPath)
+      .innerJoin('asset_file', 'asset.id', 'asset_file.assetId')
+      .where('asset.libraryId', '=', asUuid(libraryId))
+      .where('asset_file.path', '=', originalPath)
+      .where('asset_file.type', '=', AssetFileType.Original)
      .limit(1)
      .executeTakeFirst();
  }
@@ -396,11 +417,10 @@ export class AssetRepository {
    return this.db.selectFrom('asset_file').select(['assetId', 'path']).limit(sql.lit(3)).execute();
  }

-  @GenerateSql({ params: [DummyValue.UUID] })
  getForCopy(id: string) {
    return this.db
      .selectFrom('asset')
-      .select(['id', 'stackId', 'originalPath', 'isFavorite'])
+      .select(['id', 'stackId', 'isFavorite'])
      .select(withFiles)
      .where('id', '=', asUuid(id))
      .limit(1)
@@ -408,7 +428,10 @@ export class AssetRepository {
  }

  @GenerateSql({ params: [DummyValue.UUID] })
-  getById(id: string, { exifInfo, faces, files, library, owner, smartSearch, stack, tags }: GetByIdsRelations = {}) {
+  getById(
+    id: string,
+    { exifInfo, faces, files, library, owner, smartSearch, stack, tags, sidecars, originals }: GetByIdsRelations = {},
+  ) {
    return this.db
      .selectFrom('asset')
      .selectAll('asset')
@@ -444,6 +467,8 @@ export class AssetRepository {
          ),
      )
      .$if(!!files, (qb) => qb.select(withFiles))
+      .$if(!!sidecars, (qb) => qb.select(withSidecars))
+      .$if(!!originals, (qb) => qb.select(withOriginals))
      .$if(!!tags, (qb) => qb.select(withTags))
      .limit(1)
      .executeTakeFirst();
@@ -487,6 +512,7 @@ export class AssetRepository {
    return this.db
      .selectFrom('asset')
      .selectAll('asset')
+      .select(withOriginals)
      .where('ownerId', '=', asUuid(ownerId))
      .where('checksum', '=', checksum)
      .$call((qb) => (libraryId ? qb.where('libraryId', '=', asUuid(libraryId)) : qb.where('libraryId', 'is', null)))
@@ -883,14 +909,22 @@ export class AssetRepository {
        isOffline: true,
        deletedAt: new Date(),
      })
-      .where('isOffline', '=', false)
-      .where('isExternal', '=', true)
-      .where('libraryId', '=', asUuid(libraryId))
+      .where('asset.isOffline', '=', false)
+      .where('asset.isExternal', '=', true)
+      .where('asset.libraryId', '=', asUuid(libraryId))
      .where((eb) =>
-        eb.or([
-          eb.not(eb.or(paths.map((path) => eb('originalPath', 'like', path)))),
-          eb.or(exclusions.map((path) => eb('originalPath', 'like', path))),
-        ]),
+        eb.exists(
+          eb
+            .selectFrom('asset_file')
+            .whereRef('asset_file.assetId', '=', 'asset.id')
+            .where('asset_file.type', '=', AssetFileType.Original)
+            .where((eb) =>
+              eb.or([
+                eb.not(eb.or(paths.map((path) => eb('asset_file.path', 'like', path)))),
+                eb.or(exclusions.map((path) => eb('asset_file.path', 'like', path))),
+              ]),
+            ),
+        ),
      )
      .executeTakeFirstOrThrow();
  }
@@ -905,10 +939,12 @@ export class AssetRepository {
          eb.exists(
            this.db
              .selectFrom('asset')
-              .select('originalPath')
-              .whereRef('asset.originalPath', '=', eb.ref('path'))
-              .where('libraryId', '=', asUuid(libraryId))
-              .where('isExternal', '=', true),
+              .innerJoin('asset_file', 'asset.id', 'asset_file.assetId')
+              .select('asset_file.path')
+              .whereRef('asset_file.path', '=', eb.ref('path'))
+              .where('asset_file.type', '=', AssetFileType.Original)
+              .where('asset.libraryId', '=', asUuid(libraryId))
+              .where('asset.isExternal', '=', true),
          ),
        ),
      )
@@ -24,8 +24,9 @@ export class OAuthRepository {
  }

  async authorize(config: OAuthConfig, redirectUrl: string, state?: string, codeChallenge?: string) {
-    const { buildAuthorizationUrl, randomState, randomPKCECodeVerifier, calculatePKCECodeChallenge } =
-      await import('openid-client');
+    const { buildAuthorizationUrl, randomState, randomPKCECodeVerifier, calculatePKCECodeChallenge } = await import(
+      'openid-client'
+    );
    const client = await this.getClient(config);
    state ??= randomState();

@@ -1,7 +1,7 @@
 import { Kysely } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
 import { DummyValue, GenerateSql } from 'src/decorators';
-import { AssetVisibility } from 'src/enum';
+import { AssetFileType, AssetVisibility } from 'src/enum';
 import { DB } from 'src/schema';
 import { asUuid, withExif } from 'src/utils/database';

@@ -12,14 +12,18 @@ export class ViewRepository {
  async getUniqueOriginalPaths(userId: string) {
    const results = await this.db
      .selectFrom('asset')
-      .select((eb) => eb.fn<string>('substring', ['asset.originalPath', eb.val('^(.*/)[^/]*$')]).as('directoryPath'))
+      .innerJoin('asset_file', 'asset.id', 'asset_file.assetId')
+      .select((eb) =>
+        eb.fn<string>('substring', [eb.ref('asset_file.path'), eb.val('^(.*/)[^/]*$')]).as('directoryPath'),
+      )
      .distinct()
-      .where('ownerId', '=', asUuid(userId))
-      .where('visibility', '=', AssetVisibility.Timeline)
-      .where('deletedAt', 'is', null)
-      .where('fileCreatedAt', 'is not', null)
-      .where('fileModifiedAt', 'is not', null)
-      .where('localDateTime', 'is not', null)
+      .where('asset.ownerId', '=', asUuid(userId))
+      .where('asset.visibility', '=', AssetVisibility.Timeline)
+      .where('asset.deletedAt', 'is', null)
+      .where('asset.fileCreatedAt', 'is not', null)
+      .where('asset.fileModifiedAt', 'is not', null)
+      .where('asset.localDateTime', 'is not', null)
+      .where((eb) => eb(eb.ref('asset_file.type'), '=', AssetFileType.Original))
      .orderBy('directoryPath', 'asc')
      .execute();

@@ -32,20 +36,22 @@ export class ViewRepository {

    return this.db
      .selectFrom('asset')
+      .innerJoin('asset_file', 'asset.id', 'asset_file.assetId')
      .selectAll('asset')
-      .$call(withExif)
-      .where('ownerId', '=', asUuid(userId))
-      .where('visibility', '=', AssetVisibility.Timeline)
-      .where('deletedAt', 'is', null)
-      .where('fileCreatedAt', 'is not', null)
-      .where('fileModifiedAt', 'is not', null)
-      .where('localDateTime', 'is not', null)
-      .where('originalPath', 'like', `%${normalizedPath}/%`)
-      .where('originalPath', 'not like', `%${normalizedPath}/%/%`)
+      .where('asset.ownerId', '=', asUuid(userId))
+      .where('asset.visibility', '=', AssetVisibility.Timeline)
+      .where('asset.deletedAt', 'is', null)
+      .where('asset.fileCreatedAt', 'is not', null)
+      .where('asset.fileModifiedAt', 'is not', null)
+      .where('asset.localDateTime', 'is not', null)
+      .where((eb) => eb(eb.ref('asset_file.type'), '=', AssetFileType.Original))
+      .where((eb) => eb(eb.ref('asset_file.path'), 'like', `%${normalizedPath}/%`))
+      .where((eb) => eb(eb.ref('asset_file.path'), 'not like', `%${normalizedPath}/%/%`))
      .orderBy(
-        (eb) => eb.fn('regexp_replace', ['asset.originalPath', eb.val('.*/(.+)'), eb.val(String.raw`\1`)]),
+        (eb) => eb.fn('regexp_replace', [eb.ref('asset_file.path'), eb.val('.*/(.+)'), eb.val(String.raw`\\1`)]),
        'asc',
      )
+      .$call(withExif)
      .execute();
  }
 }
@@ -0,0 +1,24 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`INSERT INTO asset_file ("assetId", path, type) 
+            SELECT 
+            id, "sidecarPath", 'sidecar'
+            FROM asset
+            WHERE "sidecarPath" IS NOT NULL;`.execute(db);
+
+  await sql`ALTER TABLE "asset" DROP COLUMN "sidecarPath";`.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await sql`ALTER TABLE "asset" ADD "sidecarPath" character varying;`.execute(db);
+
+  await sql`
+      UPDATE asset
+      SET "sidecarPath" = asset_file.path
+      FROM asset_file
+      WHERE asset.id = asset_file."assetId" AND asset_file.type = 'sidecar';
+    `.execute(db);
+
+  await sql`DELETE FROM asset_file WHERE type = 'sidecar';`.execute(db);
+}
@@ -1,27 +0,0 @@
-import { Kysely, sql } from 'kysely';
-
-export async function up(db: Kysely<any>): Promise<void> {
-  await sql`DROP INDEX "workflow_filter_filterId_idx";`.execute(db);
-  await sql`DROP INDEX "workflow_action_actionId_idx";`.execute(db);
-  await sql`ALTER TABLE "workflow_filter" DROP CONSTRAINT "workflow_filter_filterId_fkey";`.execute(db);
-  await sql`ALTER TABLE "workflow_action" DROP CONSTRAINT "workflow_action_actionId_fkey";`.execute(db);
-  await sql`ALTER TABLE "workflow_filter" RENAME COLUMN "filterId" TO "pluginFilterId";`.execute(db);
-  await sql`ALTER TABLE "workflow_action" RENAME COLUMN "actionId" TO "pluginActionId";`.execute(db);
-  await sql`ALTER TABLE "workflow_filter" ADD CONSTRAINT "workflow_filter_pluginFilterId_fkey" FOREIGN KEY ("pluginFilterId") REFERENCES "plugin_filter" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "workflow_action" ADD CONSTRAINT "workflow_action_pluginActionId_fkey" FOREIGN KEY ("pluginActionId") REFERENCES "plugin_action" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`CREATE INDEX "workflow_filter_pluginFilterId_idx" ON "workflow_filter" ("pluginFilterId");`.execute(db);
-  await sql`CREATE INDEX "workflow_action_pluginActionId_idx" ON "workflow_action" ("pluginActionId");`.execute(db);
-}
-
-export async function down(db: Kysely<any>): Promise<void> {
-  await sql`DROP INDEX "workflow_filter_pluginFilterId_idx";`.execute(db);
-  await sql`DROP INDEX "workflow_action_pluginActionId_idx";`.execute(db);
-  await sql`ALTER TABLE "workflow_filter" DROP CONSTRAINT "workflow_filter_pluginFilterId_fkey";`.execute(db);
-  await sql`ALTER TABLE "workflow_action" DROP CONSTRAINT "workflow_action_pluginActionId_fkey";`.execute(db);
-  await sql`ALTER TABLE "workflow_filter" RENAME COLUMN "pluginFilterId" TO "filterId";`.execute(db);
-  await sql`ALTER TABLE "workflow_action" RENAME COLUMN "pluginActionId" TO "actionId";`.execute(db);
-  await sql`ALTER TABLE "workflow_filter" ADD CONSTRAINT "workflow_filter_filterId_fkey" FOREIGN KEY ("filterId") REFERENCES "plugin_filter" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "workflow_action" ADD CONSTRAINT "workflow_action_actionId_fkey" FOREIGN KEY ("actionId") REFERENCES "plugin_action" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`CREATE INDEX "workflow_filter_filterId_idx" ON "workflow_filter" ("filterId");`.execute(db);
-  await sql`CREATE INDEX "workflow_action_actionId_idx" ON "workflow_action" ("actionId");`.execute(db);
-}
@@ -72,9 +72,6 @@ export class AssetTable {
  @Column()
  type!: AssetType;

-  @Column()
-  originalPath!: string;
-
  @Column({ type: 'timestamp with time zone', index: true })
  fileCreatedAt!: Timestamp;

@@ -38,7 +38,7 @@ export class WorkflowTable {
 }

@Index({ columns: ['workflowId', 'order'] })
-@Index({ columns: ['pluginFilterId'] })
+@Index({ columns: ['filterId'] })
@Table('workflow_filter')
 export class WorkflowFilterTable {
  @PrimaryGeneratedColumn('uuid')
@@ -48,7 +48,7 @@ export class WorkflowFilterTable {
  workflowId!: Generated<string>;

  @ForeignKeyColumn(() => PluginFilterTable, { onDelete: 'CASCADE', onUpdate: 'CASCADE' })
-  pluginFilterId!: string;
+  filterId!: string;

  @Column({ type: 'jsonb', nullable: true })
  filterConfig!: FilterConfig | null;
@@ -58,7 +58,7 @@ export class WorkflowFilterTable {
 }

@Index({ columns: ['workflowId', 'order'] })
-@Index({ columns: ['pluginActionId'] })
+@Index({ columns: ['actionId'] })
@Table('workflow_action')
 export class WorkflowActionTable {
  @PrimaryGeneratedColumn('uuid')
@@ -68,7 +68,7 @@ export class WorkflowActionTable {
  workflowId!: Generated<string>;

  @ForeignKeyColumn(() => PluginActionTable, { onDelete: 'CASCADE', onUpdate: 'CASCADE' })
-  pluginActionId!: string;
+  actionId!: string;

  @Column({ type: 'jsonb', nullable: true })
  actionConfig!: ActionConfig | null;
@@ -515,7 +515,7 @@ describe(AssetMediaService.name, () => {
      await expect(sut.downloadOriginal(authStub.admin, 'asset-1')).resolves.toEqual(
        new ImmichFileResponse({
          path: '/original/path.jpg',
-          fileName: 'path.jpg',
+          fileName: 'asset-id.jpg',
          contentType: 'image/jpeg',
          cacheControl: CacheControl.PrivateWithCache,
        }),
@@ -1,5 +1,5 @@
 import { BadRequestException, Injectable, InternalServerErrorException, NotFoundException } from '@nestjs/common';
-import { basename, extname } from 'node:path';
+import { extname } from 'node:path';
 import sanitize from 'sanitize-filename';
 import { StorageCore } from 'src/cores/storage.core';
 import { Asset } from 'src/database';
@@ -200,7 +200,7 @@ export class AssetMediaService extends BaseService {

    return new ImmichFileResponse({
      path: asset.originalPath,
-      fileName: basename(asset.originalPath),
+      fileName: asset.originalFileName,
      contentType: mimeTypes.lookup(asset.originalPath),
      cacheControl: CacheControl.PrivateWithCache,
    });
@@ -585,6 +585,8 @@ describe(AssetService.name, () => {
                '/uploads/user-id/webp/path.ext',
                '/uploads/user-id/thumbs/path.jpg',
                '/uploads/user-id/fullsize/path.webp',
+                assetWithFace.encodedVideoPath, // this value is null
+                undefined, // no sidecar path
                assetWithFace.originalPath,
              ],
            },
@@ -646,6 +648,8 @@ describe(AssetService.name, () => {
                '/uploads/user-id/webp/path.ext',
                '/uploads/user-id/thumbs/path.jpg',
                '/uploads/user-id/fullsize/path.webp',
+                undefined,
+                undefined,
                'fake_path/asset_1.jpeg',
              ],
            },
@@ -672,6 +676,8 @@ describe(AssetService.name, () => {
                '/uploads/user-id/webp/path.ext',
                '/uploads/user-id/thumbs/path.jpg',
                '/uploads/user-id/fullsize/path.webp',
+                undefined,
+                undefined,
                'fake_path/asset_1.jpeg',
              ],
            },
@@ -363,11 +363,11 @@ export class AssetService extends BaseService {
    const { fullsizeFile, previewFile, thumbnailFile, sidecarFile } = getAssetFiles(asset.files ?? []);
    const files = [thumbnailFile?.path, previewFile?.path, fullsizeFile?.path, asset.encodedVideoPath];

-    if (deleteOnDisk && !asset.isOffline) {
+    if (deleteOnDisk) {
      files.push(sidecarFile?.path, asset.originalPath);
    }

-    await this.jobRepository.queue({ name: JobName.FileDelete, data: { files: files.filter(Boolean) } });
+    await this.jobRepository.queue({ name: JobName.FileDelete, data: { files } });

    return JobStatus.Success;
  }
@@ -165,7 +165,7 @@ describe(DownloadService.name, () => {
        stream: archiveMock.stream,
      });

-      expect(archiveMock.addFile).toHaveBeenCalledWith('/path/to/realpath.jpg', 'symlink.jpg');
+      expect(archiveMock.addFile).toHaveBeenCalledWith('/path/to/realpath.jpg', 'IMG_123.jpg');
    });
  });

@@ -1,5 +1,5 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
-import { basename, parse } from 'node:path';
+import { parse } from 'node:path';
 import { StorageCore } from 'src/cores/storage.core';
 import { AssetIdsDto } from 'src/dtos/asset.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
@@ -94,13 +94,13 @@ export class DownloadService extends BaseService {
        continue;
      }

-      const { originalPath } = asset;
+      const { originalPath, originalFileName } = asset;

-      let filename = basename(originalPath);
+      let filename = originalFileName;
      const count = paths[filename] || 0;
      paths[filename] = count + 1;
      if (count !== 0) {
-        const parsedFilename = parse(filename);
+        const parsedFilename = parse(originalFileName);
        filename = `${parsedFilename.name}+${count}${parsedFilename.ext}`;
      }

@@ -167,6 +167,8 @@ export class MediaService extends BaseService {
      return JobStatus.Skipped;
    }

+    const { originalFile } = getAssetFiles(asset.files);
+
    let generated: {
      previewPath: string;
      thumbnailPath: string;
@@ -174,11 +176,11 @@ export class MediaService extends BaseService {
      thumbhash: Buffer;
    };
    if (asset.type === AssetType.Video || asset.originalFileName.toLowerCase().endsWith('.gif')) {
-      this.logger.verbose(`Thumbnail generation for video ${id} ${asset.originalPath}`);
-      generated = await this.generateVideoThumbnails(asset);
+      this.logger.verbose(`Thumbnail generation for video ${id} ${originalFile.path}`);
+      generated = await this.generateVideoThumbnails(asset, originalFile.path);
    } else if (asset.type === AssetType.Image) {
-      this.logger.verbose(`Thumbnail generation for image ${id} ${asset.originalPath}`);
-      generated = await this.generateImageThumbnails(asset);
+      this.logger.verbose(`Thumbnail generation for image ${id} ${originalFile.path}`);
+      generated = await this.generateImageThumbnails(asset, originalFile.path);
    } else {
      this.logger.warn(`Skipping thumbnail generation for asset ${id}: ${asset.type} is not an image or video`);
      return JobStatus.Skipped;
@@ -423,13 +425,13 @@ export class MediaService extends BaseService {
    };
  }

-  private async generateVideoThumbnails(asset: ThumbnailPathEntity & { originalPath: string }) {
+  private async generateVideoThumbnails(asset: ThumbnailPathEntity, originalPath: string) {
    const { image, ffmpeg } = await this.getConfig({ withCache: true });
    const previewPath = StorageCore.getImagePath(asset, AssetPathType.Preview, image.preview.format);
    const thumbnailPath = StorageCore.getImagePath(asset, AssetPathType.Thumbnail, image.thumbnail.format);
    this.storageCore.ensureFolders(previewPath);

-    const { format, audioStreams, videoStreams } = await this.mediaRepository.probe(asset.originalPath);
+    const { format, audioStreams, videoStreams } = await this.mediaRepository.probe(originalPath);
    const mainVideoStream = this.getMainStream(videoStreams);
    if (!mainVideoStream) {
      throw new Error(`No video streams found for asset ${asset.id}`);
@@ -224,13 +224,15 @@ export class MetadataService extends BaseService {
      return;
    }

+    const { originalFile } = getAssetFiles(asset.files);
+
    const [exifTags, stats] = await Promise.all([
      this.getExifTags(asset),
-      this.storageRepository.stat(asset.originalPath),
+      this.storageRepository.stat(originalFile.path),
    ]);
    this.logger.verbose('Exif Tags', exifTags);

-    const dates = this.getDates(asset, exifTags, stats);
+    const dates = this.getDates(asset, originalFile.path, exifTags, stats);

    const { width, height } = this.getImageDimensions(exifTags);
    let geo: ReverseGeocodeResult = { country: null, state: null, city: null },
@@ -301,11 +303,11 @@ export class MetadataService extends BaseService {
    ];

    if (this.isMotionPhoto(asset, exifTags)) {
-      promises.push(this.applyMotionPhotos(asset, exifTags, dates, stats));
+      promises.push(this.applyMotionPhotos(asset, originalFile.path, exifTags, dates, stats));
    }

    if (isFaceImportEnabled(metadata) && this.hasTaggedFaces(exifTags)) {
-      promises.push(this.applyTaggedFaces(asset, exifTags));
+      promises.push(this.applyTaggedFaces(asset, originalFile.path, exifTags));
    }

    await Promise.all(promises);
@@ -361,12 +363,12 @@ export class MetadataService extends BaseService {
      break;
    }

-    const { sidecarFile } = getAssetFiles(asset.files);
+    const { originalFile, sidecarFile } = getAssetFiles(asset.files);

    const isChanged = sidecarPath !== sidecarFile?.path;

    this.logger.debug(
-      `Sidecar check found old=${sidecarFile?.path}, new=${sidecarPath} will ${isChanged ? 'update' : 'do nothing for'}  asset ${asset.id}: ${asset.originalPath}`,
+      `Sidecar check found old=${sidecarFile?.path}, new=${sidecarPath} will ${isChanged ? 'update' : 'do nothing for'}  asset ${asset.id}: ${originalFile.path}`,
    );

    if (!isChanged) {
@@ -400,9 +402,9 @@ export class MetadataService extends BaseService {

    const tagsList = (asset.tags || []).map((tag) => tag.value);

-    const { sidecarFile } = getAssetFiles(asset.files);
-    const sidecarPath = sidecarFile?.path || `${asset.originalPath}.xmp`;
+    const { originalFile, sidecarFile } = getAssetFiles(asset.files);

+    const sidecarPath = sidecarFile?.path || `${originalFile.path}.xmp`; // prefer file.jpg.xmp by default
    const exif = _.omitBy(
      <Tags>{
        Description: description,
@@ -429,19 +431,20 @@ export class MetadataService extends BaseService {
    return JobStatus.Success;
  }

-  private getSidecarCandidates({ files, originalPath }: { files: AssetFile[]; originalPath: string }) {
+  private getSidecarCandidates({ id, files }: { id: string; files: AssetFile[] }) {
    const candidates: string[] = [];

-    const { sidecarFile } = getAssetFiles(files);
+    const { originalFile, sidecarFile } = getAssetFiles(files);
+
    if (sidecarFile?.path) {
      candidates.push(sidecarFile.path);
    }

-    const assetPath = parse(originalPath);
+    const assetPath = parse(originalFile.path);

    candidates.push(
      // IMG_123.jpg.xmp
-      `${originalPath}.xmp`,
+      `${assetPath}.xmp`,
      // IMG_123.xmp
      `${join(assetPath.dir, assetPath.name)}.xmp`,
    );
@@ -465,13 +468,13 @@ export class MetadataService extends BaseService {
    return { width, height };
  }

-  private async getExifTags(asset: { originalPath: string; files: AssetFile[]; type: AssetType }): Promise<ImmichTags> {
-    const { sidecarFile } = getAssetFiles(asset.files);
+  private async getExifTags(asset: { files: AssetFile[]; type: AssetType }): Promise<ImmichTags> {
+    const { originalFile, sidecarFile } = getAssetFiles(asset.files);

    const [mediaTags, sidecarTags, videoTags] = await Promise.all([
-      this.metadataRepository.readTags(asset.originalPath),
+      this.metadataRepository.readTags(originalFile.path),
      sidecarFile ? this.metadataRepository.readTags(sidecarFile.path) : null,
-      asset.type === AssetType.Video ? this.getVideoTags(asset.originalPath) : null,
+      asset.type === AssetType.Video ? this.getVideoTags(originalFile.path) : null,
    ]);

    // prefer dates from sidecar tags
@@ -535,7 +538,7 @@ export class MetadataService extends BaseService {
    return asset.type === AssetType.Image && !!(tags.MotionPhoto || tags.MicroVideo);
  }

-  private async applyMotionPhotos(asset: Asset, tags: ImmichTags, dates: Dates, stats: Stats) {
+  private async applyMotionPhotos(asset: Asset, originalPath: string, tags: ImmichTags, dates: Dates, stats: Stats) {
    const isMotionPhoto = tags.MotionPhoto;
    const isMicroVideo = tags.MicroVideo;
    const videoOffset = tags.MicroVideoOffset;
@@ -566,7 +569,7 @@ export class MetadataService extends BaseService {
      return;
    }

-    this.logger.debug(`Starting motion photo video extraction for asset ${asset.id}: ${asset.originalPath}`);
+    this.logger.debug(`Starting motion photo video extraction for asset ${asset.id}: ${originalPath}`);

    try {
      const position = stats.size - length - padding;
@@ -574,15 +577,15 @@ export class MetadataService extends BaseService {
      // Samsung MotionPhoto video extraction
      //     HEIC-encoded
      if (hasMotionPhotoVideo) {
-        video = await this.metadataRepository.extractBinaryTag(asset.originalPath, 'MotionPhotoVideo');
+        video = await this.metadataRepository.extractBinaryTag(originalPath, 'MotionPhotoVideo');
      }
      //     JPEG-encoded; HEIC also contains these tags, so this conditional must come second
      else if (hasEmbeddedVideoFile) {
-        video = await this.metadataRepository.extractBinaryTag(asset.originalPath, 'EmbeddedVideoFile');
+        video = await this.metadataRepository.extractBinaryTag(originalPath, 'EmbeddedVideoFile');
      }
      // Default video extraction
      else {
-        video = await this.storageRepository.readFile(asset.originalPath, {
+        video = await this.storageRepository.readFile(originalPath, {
          buffer: Buffer.alloc(length),
          position,
          length,
@@ -597,21 +600,29 @@ export class MetadataService extends BaseService {
      if (!motionAsset) {
        try {
          const motionAssetId = this.cryptoRepository.randomUUID();
-          motionAsset = await this.assetRepository.create({
-            id: motionAssetId,
-            libraryId: asset.libraryId,
-            type: AssetType.Video,
-            fileCreatedAt: dates.dateTimeOriginal,
-            fileModifiedAt: stats.mtime,
-            localDateTime: dates.localDateTime,
-            checksum,
-            ownerId: asset.ownerId,
-            originalPath: StorageCore.getAndroidMotionPath(asset, motionAssetId),
-            originalFileName: `${parse(asset.originalFileName).name}.mp4`,
-            visibility: AssetVisibility.Hidden,
-            deviceAssetId: 'NONE',
-            deviceId: 'NONE',
-          });
+          motionAsset = await this.assetRepository.create(
+            {
+              id: motionAssetId,
+              libraryId: asset.libraryId,
+              type: AssetType.Video,
+              fileCreatedAt: dates.dateTimeOriginal,
+              fileModifiedAt: stats.mtime,
+              localDateTime: dates.localDateTime,
+              checksum,
+              ownerId: asset.ownerId,
+              originalFileName: `${parse(originalPath).name}.mp4`,
+              visibility: AssetVisibility.Hidden,
+              deviceAssetId: 'NONE',
+              deviceId: 'NONE',
+            },
+            [
+              {
+                type: AssetFileType.Original,
+                assetId: motionAssetId,
+                path: StorageCore.getAndroidMotionPath(asset, motionAssetId),
+              },
+            ],
+          );

          isNewMotionAsset = true;

@@ -625,16 +636,18 @@ export class MetadataService extends BaseService {

          motionAsset = await this.assetRepository.getByChecksum(checksumQuery);
          if (!motionAsset) {
-            this.logger.warn(`Unable to find existing motion video asset for ${asset.id}: ${asset.originalPath}`);
+            this.logger.warn(`Unable to find existing motion video asset for ${asset.id}: ${originalPath}`);
            return;
          }
        }
      }

+      const { originalFile: originalMotionFile } = getAssetFiles(motionAsset.files);
+
      if (!isNewMotionAsset) {
        this.logger.debugFn(() => {
          const base64Checksum = checksum.toString('base64');
-          return `Motion asset with checksum ${base64Checksum} already exists for asset ${asset.id}: ${asset.originalPath}`;
+          return `Motion asset with checksum ${base64Checksum} already exists for asset ${asset.id}: ${originalPath}`;
        });
      }

@@ -664,22 +677,18 @@ export class MetadataService extends BaseService {
      }

      // write extracted motion video to disk, especially if the encoded-video folder has been deleted
-      const existsOnDisk = await this.storageRepository.checkFileExists(motionAsset.originalPath);
+      const existsOnDisk = await this.storageRepository.checkFileExists(originalMotionFile.path);
      if (!existsOnDisk) {
-        this.storageCore.ensureFolders(motionAsset.originalPath);
-        await this.storageRepository.createFile(motionAsset.originalPath, video);
-        this.logger.log(`Wrote motion photo video to ${motionAsset.originalPath}`);
-
+        this.storageCore.ensureFolders(originalMotionFile.path);
+        await this.storageRepository.createFile(originalMotionFile.path, video);
+        this.logger.log(`Wrote motion photo video to ${originalMotionFile.path}`);
        await this.handleMetadataExtraction({ id: motionAsset.id });
        await this.jobRepository.queue({ name: JobName.AssetEncodeVideo, data: { id: motionAsset.id } });
      }

-      this.logger.debug(`Finished motion photo video extraction for asset ${asset.id}: ${asset.originalPath}`);
+      this.logger.debug(`Finished motion photo video extraction for asset ${asset.id}: ${originalPath}`);
    } catch (error: Error | any) {
-      this.logger.error(
-        `Failed to extract motion video for ${asset.id}: ${asset.originalPath}: ${error}`,
-        error?.stack,
-      );
+      this.logger.error(`Failed to extract motion video for ${asset.id}: ${originalPath}: ${error}`, error?.stack);
    }
  }

@@ -764,7 +773,8 @@ export class MetadataService extends BaseService {
  }

  private async applyTaggedFaces(
-    asset: { id: string; ownerId: string; faces: AssetFace[]; originalPath: string },
+    asset: { id: string; ownerId: string; faces: AssetFace[] },
+    originalPath: string,
    tags: ImmichTags,
  ) {
    if (!tags.RegionInfo?.AppliedToDimensions || tags.RegionInfo.RegionList.length === 0) {
@@ -818,13 +828,11 @@ export class MetadataService extends BaseService {

    const facesToRemove = asset.faces.filter((face) => face.sourceType === SourceType.Exif).map((face) => face.id);
    if (facesToRemove.length > 0) {
-      this.logger.debug(`Removing ${facesToRemove.length} faces for asset ${asset.id}: ${asset.originalPath}`);
+      this.logger.debug(`Removing ${facesToRemove.length} faces for asset ${asset.id}: ${originalPath}`);
    }

    if (facesToAdd.length > 0) {
-      this.logger.debug(
-        `Creating ${facesToAdd.length} faces from metadata for asset ${asset.id}: ${asset.originalPath}`,
-      );
+      this.logger.debug(`Creating ${facesToAdd.length} faces from metadata for asset ${asset.id}: ${originalPath}`);
    }

    if (facesToRemove.length > 0 || facesToAdd.length > 0) {
@@ -837,16 +845,15 @@ export class MetadataService extends BaseService {
  }

  private getDates(
-    asset: { id: string; originalPath: string; fileCreatedAt: Date },
+    asset: { id: string; fileCreatedAt: Date },
+    originalPath: string,
    exifTags: ImmichTags,
    stats: Stats,
  ) {
    const result = firstDateTime(exifTags);
    const tag = result?.tag;
    const dateTime = result?.dateTime;
-    this.logger.verbose(
-      `Date and time is ${dateTime} using exifTag ${tag} for asset ${asset.id}: ${asset.originalPath}`,
-    );
+    this.logger.verbose(`Date and time is ${dateTime} using exifTag ${tag} for asset ${asset.id}: ${originalPath}`);

    // timezone
    let timeZone = exifTags.tz ?? null;
@@ -857,11 +864,9 @@ export class MetadataService extends BaseService {
    }

    if (timeZone) {
-      this.logger.verbose(
-        `Found timezone ${timeZone} via ${exifTags.tzSource} for asset ${asset.id}: ${asset.originalPath}`,
-      );
+      this.logger.verbose(`Found timezone ${timeZone} via ${exifTags.tzSource} for asset ${asset.id}: ${originalPath}`);
    } else {
-      this.logger.debug(`No timezone information found for asset ${asset.id}: ${asset.originalPath}`);
+      this.logger.debug(`No timezone information found for asset ${asset.id}: ${originalPath}`);
    }

    let dateTimeOriginal = dateTime?.toDateTime();
@@ -887,12 +892,12 @@ export class MetadataService extends BaseService {
        ),
      );
      this.logger.debug(
-        `No exif date time found, falling back on ${earliestDate.toISO()}, earliest of file creation and modification for asset ${asset.id}: ${asset.originalPath}`,
+        `No exif date time found, falling back on ${earliestDate.toISO()}, earliest of file creation and modification for asset ${asset.id}: ${originalPath}`,
      );
      dateTimeOriginal = localDateTime = earliestDate;
    }

-    this.logger.verbose(`Found local date time ${localDateTime.toISO()} for asset ${asset.id}: ${asset.originalPath}`);
+    this.logger.verbose(`Found local date time ${localDateTime.toISO()} for asset ${asset.id}: ${originalPath}`);

    return {
      timeZone,
@@ -247,9 +247,9 @@ export class PluginService extends BaseService {

  private async executeFilters(workflowFilters: WorkflowFilter[], context: WorkflowContext): Promise<boolean> {
    for (const workflowFilter of workflowFilters) {
-      const filter = await this.pluginRepository.getFilter(workflowFilter.pluginFilterId);
+      const filter = await this.pluginRepository.getFilter(workflowFilter.filterId);
      if (!filter) {
-        this.logger.error(`Filter ${workflowFilter.pluginFilterId} not found`);
+        this.logger.error(`Filter ${workflowFilter.filterId} not found`);
        return false;
      }

@@ -291,9 +291,9 @@ export class PluginService extends BaseService {

  private async executeActions(workflowActions: WorkflowAction[], context: WorkflowContext): Promise<void> {
    for (const workflowAction of workflowActions) {
-      const action = await this.pluginRepository.getAction(workflowAction.pluginActionId);
+      const action = await this.pluginRepository.getAction(workflowAction.actionId);
      if (!action) {
-        throw new Error(`Action ${workflowAction.pluginActionId} not found`);
+        throw new Error(`Action ${workflowAction.actionId} not found`);
      }

      const pluginInstance = this.loadedPlugins.get(action.pluginId);
@@ -19,7 +19,7 @@ import {
 import { ArgOf } from 'src/repositories/event.repository';
 import { BaseService } from 'src/services/base.service';
 import { JobOf, StorageAsset } from 'src/types';
-import { getAssetFile } from 'src/utils/asset.util';
+import { getAssetFile, getAssetFiles } from 'src/utils/asset.util';
 import { getLivePhotoMotionFilename } from 'src/utils/file';

 const storageTokens = {
@@ -147,7 +147,8 @@ export class StorageTemplateService extends BaseService {
    const user = await this.userRepository.get(asset.ownerId, {});
    const storageLabel = user?.storageLabel || null;
    const filename = asset.originalFileName || asset.id;
-    await this.moveAsset(asset, { storageLabel, filename });
+    const { originalFile } = getAssetFiles(asset.files);
+    await this.moveAsset({ originalPath: originalFile.path, ...asset }, { storageLabel, filename });

    // move motion part of live photo
    if (asset.livePhotoVideoId) {
@@ -155,8 +156,12 @@ export class StorageTemplateService extends BaseService {
      if (!livePhotoVideo) {
        return JobStatus.Failed;
      }
-      const motionFilename = getLivePhotoMotionFilename(filename, livePhotoVideo.originalPath);
-      await this.moveAsset(livePhotoVideo, { storageLabel, filename: motionFilename });
+      const { originalFile: livePhotoOriginalFile } = getAssetFiles(livePhotoVideo.files);
+      const motionFilename = getLivePhotoMotionFilename(filename, livePhotoOriginalFile.path);
+      await this.moveAsset(
+        { originalPath: livePhotoOriginalFile.path, ...livePhotoVideo },
+        { storageLabel, filename: motionFilename },
+      );
    }
    return JobStatus.Success;
  }
@@ -180,7 +185,8 @@ export class StorageTemplateService extends BaseService {
      const user = users.find((user) => user.id === asset.ownerId);
      const storageLabel = user?.storageLabel || null;
      const filename = asset.originalFileName || asset.id;
-      await this.moveAsset(asset, { storageLabel, filename });
+      const { originalFile } = getAssetFiles(asset.files);
+      await this.moveAsset({ originalPath: originalFile.path, ...asset }, { storageLabel, filename });
    }

    this.logger.debug('Cleaning up empty directories...');
@@ -78,13 +78,13 @@ export class WorkflowService extends BaseService {
  }

  private async validateAndMapFilters(
-    filters: Array<{ pluginFilterId: string; filterConfig?: any }>,
+    filters: Array<{ filterId: string; filterConfig?: any }>,
    requiredContext: PluginContext,
  ) {
    for (const dto of filters) {
-      const filter = await this.pluginRepository.getFilter(dto.pluginFilterId);
+      const filter = await this.pluginRepository.getFilter(dto.filterId);
      if (!filter) {
-        throw new BadRequestException(`Invalid filter ID: ${dto.pluginFilterId}`);
+        throw new BadRequestException(`Invalid filter ID: ${dto.filterId}`);
      }

      if (!filter.supportedContexts.includes(requiredContext)) {
@@ -95,20 +95,20 @@ export class WorkflowService extends BaseService {
    }

    return filters.map((dto, index) => ({
-      pluginFilterId: dto.pluginFilterId,
+      filterId: dto.filterId,
      filterConfig: dto.filterConfig || null,
      order: index,
    }));
  }

  private async validateAndMapActions(
-    actions: Array<{ pluginActionId: string; actionConfig?: any }>,
+    actions: Array<{ actionId: string; actionConfig?: any }>,
    requiredContext: PluginContext,
  ) {
    for (const dto of actions) {
-      const action = await this.pluginRepository.getAction(dto.pluginActionId);
+      const action = await this.pluginRepository.getAction(dto.actionId);
      if (!action) {
-        throw new BadRequestException(`Invalid action ID: ${dto.pluginActionId}`);
+        throw new BadRequestException(`Invalid action ID: ${dto.actionId}`);
      }
      if (!action.supportedContexts.includes(requiredContext)) {
        throw new BadRequestException(
@@ -118,7 +118,7 @@ export class WorkflowService extends BaseService {
    }

    return actions.map((dto, index) => ({
-      pluginActionId: dto.pluginActionId,
+      actionId: dto.actionId,
      actionConfig: dto.actionConfig || null,
      order: index,
    }));
@@ -2,7 +2,7 @@ import { asOptions } from 'src/sql-tools/helpers';
 import { register } from 'src/sql-tools/register';
 import { ColumnStorage, ColumnType, DatabaseEnum } from 'src/sql-tools/types';

-export type ColumnValue = null | boolean | string | number | Array<unknown> | object | Date | (() => string);
+export type ColumnValue = null | boolean | string | number | object | Date | (() => string);

 export type ColumnBaseOptions = {
  name?: string;
@@ -39,10 +39,6 @@ export const fromColumnValue = (columnValue?: ColumnValue) => {
    return `'${value.toISOString()}'`;
  }

-  if (Array.isArray(value)) {
-    return "'{}'";
-  }
-
  return `'${String(value)}'`;
 };

@@ -394,20 +394,6 @@ describe(schemaDiff.name, () => {

        expect(diff.items).toEqual([]);
      });
-
-      it('should support arrays, ignoring types', () => {
-        const diff = schemaDiff(
-          fromColumn({ name: 'column1', type: 'character varying', isArray: true, default: "'{}'" }),
-          fromColumn({
-            name: 'column1',
-            type: 'character varying',
-            isArray: true,
-            default: "'{}'::character varying[]",
-          }),
-        );
-
-        expect(diff.items).toEqual([]);
-      });
    });
  });

@@ -18,6 +18,13 @@ export const getAssetFile = (files: AssetFile[], type: AssetFileType | Generated
 };

 export const getAssetFiles = (files: AssetFile[]) => ({
+  originalFile: (() => {
+    const file = getAssetFile(files, AssetFileType.Original);
+    if (!file?.path) {
+      throw new BadRequestException(`Asset has no original file`); // TODO: should we throw a specific error here that can be caught higher up?
+    }
+    return file;
+  })(),
  fullsizeFile: getAssetFile(files, AssetFileType.FullSize),
  previewFile: getAssetFile(files, AssetFileType.Preview),
  thumbnailFile: getAssetFile(files, AssetFileType.Thumbnail),
@@ -161,12 +168,18 @@ export const onBeforeUnlink = async (
  { asset: assetRepository }: AssetHookRepositories,
  { livePhotoVideoId }: { livePhotoVideoId: string },
 ) => {
-  const motion = await assetRepository.getById(livePhotoVideoId);
+  const motion = await assetRepository.getById(livePhotoVideoId, { files: true });
  if (!motion) {
    return null;
  }

-  if (StorageCore.isAndroidMotionPath(motion.originalPath)) {
+  const motionPath = motion.files?.find((file) => file.type === AssetFileType.Original)?.path;
+
+  if (!motionPath) {
+    throw new BadRequestException('Live photo video original file not found');
+  }
+
+  if (StorageCore.isAndroidMotionPath(motionPath)) {
    throw new BadRequestException('Cannot unlink Android motion photos');
  }

@@ -191,13 +191,23 @@ export function withFaces(eb: ExpressionBuilder<DB, 'asset'>, withDeletedFace?:
 }

 export function withFiles(eb: ExpressionBuilder<DB, 'asset'>, type?: AssetFileType) {
-  return jsonArrayFrom(
+  const files = jsonArrayFrom(
    eb
      .selectFrom('asset_file')
      .select(columns.assetFiles)
      .whereRef('asset_file.assetId', '=', 'asset.id')
      .$if(!!type, (qb) => qb.where('asset_file.type', '=', type!)),
  ).as('files');
+
+  return files;
+}
+
+export function withSidecars(eb: ExpressionBuilder<DB, 'asset'>, type?: AssetFileType) {
+  return withFiles(eb, AssetFileType.Sidecar);
+}
+
+export function withOriginals(eb: ExpressionBuilder<DB, 'asset'>, type?: AssetFileType) {
+  return withFiles(eb, AssetFileType.Original);
 }

 export function withFilePath(eb: ExpressionBuilder<DB, 'asset'>, type: AssetFileType) {
@@ -208,6 +218,10 @@ export function withFilePath(eb: ExpressionBuilder<DB, 'asset'>, type: AssetFile
    .where('asset_file.type', '=', type);
 }

+export function withOriginalPath(eb: ExpressionBuilder<DB, 'asset'>) {
+  return withFilePath(eb, AssetFileType.Original).as('originalPath');
+}
+
 export function withFacesAndPeople(eb: ExpressionBuilder<DB, 'asset'>, withDeletedFace?: boolean) {
  return jsonArrayFrom(
    eb
@@ -2,16 +2,13 @@ import { Kysely } from 'kysely';
 import { AssetFileType, JobName, SharedLinkType } from 'src/enum';
 import { AccessRepository } from 'src/repositories/access.repository';
 import { AlbumRepository } from 'src/repositories/album.repository';
-import { AssetJobRepository } from 'src/repositories/asset-job.repository';
 import { AssetRepository } from 'src/repositories/asset.repository';
-import { EventRepository } from 'src/repositories/event.repository';
 import { JobRepository } from 'src/repositories/job.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { SharedLinkAssetRepository } from 'src/repositories/shared-link-asset.repository';
 import { SharedLinkRepository } from 'src/repositories/shared-link.repository';
 import { StackRepository } from 'src/repositories/stack.repository';
 import { StorageRepository } from 'src/repositories/storage.repository';
-import { UserRepository } from 'src/repositories/user.repository';
 import { DB } from 'src/schema';
 import { AssetService } from 'src/services/asset.service';
 import { newMediumService } from 'test/medium.factory';
@@ -23,16 +20,8 @@ let defaultDatabase: Kysely<DB>;
 const setup = (db?: Kysely<DB>) => {
  return newMediumService(AssetService, {
    database: db || defaultDatabase,
-    real: [
-      AssetRepository,
-      AssetJobRepository,
-      AlbumRepository,
-      AccessRepository,
-      SharedLinkAssetRepository,
-      StackRepository,
-      UserRepository,
-    ],
-    mock: [EventRepository, LoggingRepository, JobRepository, StorageRepository],
+    real: [AssetRepository, AlbumRepository, AccessRepository, SharedLinkAssetRepository, StackRepository],
+    mock: [LoggingRepository, JobRepository, StorageRepository],
  });
 };

@@ -221,51 +210,4 @@ describe(AssetService.name, () => {
      });
    });
  });
-
-  describe('delete', () => {
-    it('should delete asset', async () => {
-      const { sut, ctx } = setup();
-      ctx.getMock(EventRepository).emit.mockResolvedValue();
-      ctx.getMock(JobRepository).queue.mockResolvedValue();
-      const { user } = await ctx.newUser();
-      const { asset } = await ctx.newAsset({ ownerId: user.id });
-      const thumbnailPath = '/path/to/thumbnail.jpg';
-      const previewPath = '/path/to/preview.jpg';
-      const sidecarPath = '/path/to/sidecar.xmp';
-      await Promise.all([
-        ctx.newAssetFile({ assetId: asset.id, type: AssetFileType.Thumbnail, path: thumbnailPath }),
-        ctx.newAssetFile({ assetId: asset.id, type: AssetFileType.Preview, path: previewPath }),
-        ctx.newAssetFile({ assetId: asset.id, type: AssetFileType.Sidecar, path: sidecarPath }),
-      ]);
-
-      await sut.handleAssetDeletion({ id: asset.id, deleteOnDisk: true });
-
-      expect(ctx.getMock(JobRepository).queue).toHaveBeenCalledWith({
-        name: JobName.FileDelete,
-        data: { files: [thumbnailPath, previewPath, sidecarPath, asset.originalPath] },
-      });
-    });
-
-    it('should not delete offline assets', async () => {
-      const { sut, ctx } = setup();
-      ctx.getMock(EventRepository).emit.mockResolvedValue();
-      ctx.getMock(JobRepository).queue.mockResolvedValue();
-      const { user } = await ctx.newUser();
-      const { asset } = await ctx.newAsset({ ownerId: user.id, isOffline: true });
-      const thumbnailPath = '/path/to/thumbnail.jpg';
-      const previewPath = '/path/to/preview.jpg';
-      await Promise.all([
-        ctx.newAssetFile({ assetId: asset.id, type: AssetFileType.Thumbnail, path: thumbnailPath }),
-        ctx.newAssetFile({ assetId: asset.id, type: AssetFileType.Preview, path: previewPath }),
-        ctx.newAssetFile({ assetId: asset.id, type: AssetFileType.Sidecar, path: `/path/to/sidecar.xmp` }),
-      ]);
-
-      await sut.handleAssetDeletion({ id: asset.id, deleteOnDisk: true });
-
-      expect(ctx.getMock(JobRepository).queue).toHaveBeenCalledWith({
-        name: JobName.FileDelete,
-        data: { files: [thumbnailPath, previewPath] },
-      });
-    });
-  });
 });
@@ -113,13 +113,13 @@ describe(WorkflowService.name, () => {
        enabled: true,
        filters: [
          {
-            pluginFilterId: testFilterId,
+            filterId: testFilterId,
            filterConfig: { key: 'value' },
          },
        ],
        actions: [
          {
-            pluginActionId: testActionId,
+            actionId: testActionId,
            actionConfig: { action: 'test' },
          },
        ],
@@ -137,7 +137,7 @@ describe(WorkflowService.name, () => {
      expect(workflow.filters[0]).toMatchObject({
        id: expect.any(String),
        workflowId: workflow.id,
-        pluginFilterId: testFilterId,
+        filterId: testFilterId,
        filterConfig: { key: 'value' },
        order: 0,
      });
@@ -146,7 +146,7 @@ describe(WorkflowService.name, () => {
      expect(workflow.actions[0]).toMatchObject({
        id: expect.any(String),
        workflowId: workflow.id,
-        pluginActionId: testActionId,
+        actionId: testActionId,
        actionConfig: { action: 'test' },
        order: 0,
      });
@@ -163,7 +163,7 @@ describe(WorkflowService.name, () => {
          name: 'invalid-workflow',
          description: 'A workflow with invalid filter',
          enabled: true,
-          filters: [{ pluginFilterId: factory.uuid(), filterConfig: { key: 'value' } }],
+          filters: [{ filterId: factory.uuid(), filterConfig: { key: 'value' } }],
          actions: [],
        }),
      ).rejects.toThrow('Invalid filter ID');
@@ -181,7 +181,7 @@ describe(WorkflowService.name, () => {
          description: 'A workflow with invalid action',
          enabled: true,
          filters: [],
-          actions: [{ pluginActionId: factory.uuid(), actionConfig: { action: 'test' } }],
+          actions: [{ actionId: factory.uuid(), actionConfig: { action: 'test' } }],
        }),
      ).rejects.toThrow('Invalid action ID');
    });
@@ -220,7 +220,7 @@ describe(WorkflowService.name, () => {
          name: 'invalid-context-workflow',
          description: 'A workflow with context mismatch',
          enabled: true,
-          filters: [{ pluginFilterId: result.filters[0].id }],
+          filters: [{ filterId: result.filters[0].id }],
          actions: [],
        }),
      ).rejects.toThrow('does not support asset context');
@@ -261,7 +261,7 @@ describe(WorkflowService.name, () => {
          description: 'A workflow with context mismatch',
          enabled: true,
          filters: [],
-          actions: [{ pluginActionId: result.actions[0].id }],
+          actions: [{ actionId: result.actions[0].id }],
        }),
      ).rejects.toThrow('does not support asset context');
    });
@@ -277,13 +277,13 @@ describe(WorkflowService.name, () => {
        description: 'A workflow with multiple filters and actions',
        enabled: true,
        filters: [
-          { pluginFilterId: testFilterId, filterConfig: { step: 1 } },
-          { pluginFilterId: testFilterId, filterConfig: { step: 2 } },
+          { filterId: testFilterId, filterConfig: { step: 1 } },
+          { filterId: testFilterId, filterConfig: { step: 2 } },
        ],
        actions: [
-          { pluginActionId: testActionId, actionConfig: { step: 1 } },
-          { pluginActionId: testActionId, actionConfig: { step: 2 } },
-          { pluginActionId: testActionId, actionConfig: { step: 3 } },
+          { actionId: testActionId, actionConfig: { step: 1 } },
+          { actionId: testActionId, actionConfig: { step: 2 } },
+          { actionId: testActionId, actionConfig: { step: 3 } },
        ],
      });

@@ -378,8 +378,8 @@ describe(WorkflowService.name, () => {
        name: 'test-workflow',
        description: 'A test workflow',
        enabled: true,
-        filters: [{ pluginFilterId: testFilterId, filterConfig: { key: 'value' } }],
-        actions: [{ pluginActionId: testActionId, actionConfig: { action: 'test' } }],
+        filters: [{ filterId: testFilterId, filterConfig: { key: 'value' } }],
+        actions: [{ actionId: testActionId, actionConfig: { action: 'test' } }],
      });

      const workflow = await sut.get(auth, created.id);
@@ -461,14 +461,14 @@ describe(WorkflowService.name, () => {
        name: 'test-workflow',
        description: 'Test',
        enabled: true,
-        filters: [{ pluginFilterId: testFilterId, filterConfig: { old: 'config' } }],
+        filters: [{ filterId: testFilterId, filterConfig: { old: 'config' } }],
        actions: [],
      });

      const updated = await sut.update(auth, created.id, {
        filters: [
-          { pluginFilterId: testFilterId, filterConfig: { new: 'config' } },
-          { pluginFilterId: testFilterId, filterConfig: { second: 'filter' } },
+          { filterId: testFilterId, filterConfig: { new: 'config' } },
+          { filterId: testFilterId, filterConfig: { second: 'filter' } },
        ],
      });

@@ -488,13 +488,13 @@ describe(WorkflowService.name, () => {
        description: 'Test',
        enabled: true,
        filters: [],
-        actions: [{ pluginActionId: testActionId, actionConfig: { old: 'config' } }],
+        actions: [{ actionId: testActionId, actionConfig: { old: 'config' } }],
      });

      const updated = await sut.update(auth, created.id, {
        actions: [
-          { pluginActionId: testActionId, actionConfig: { new: 'config' } },
-          { pluginActionId: testActionId, actionConfig: { second: 'action' } },
+          { actionId: testActionId, actionConfig: { new: 'config' } },
+          { actionId: testActionId, actionConfig: { second: 'action' } },
        ],
      });

@@ -513,7 +513,7 @@ describe(WorkflowService.name, () => {
        name: 'test-workflow',
        description: 'Test',
        enabled: true,
-        filters: [{ pluginFilterId: testFilterId, filterConfig: { key: 'value' } }],
+        filters: [{ filterId: testFilterId, filterConfig: { key: 'value' } }],
        actions: [],
      });

@@ -588,7 +588,7 @@ describe(WorkflowService.name, () => {

      await expect(
        sut.update(auth, created.id, {
-          filters: [{ pluginFilterId: factory.uuid(), filterConfig: {} }],
+          filters: [{ filterId: factory.uuid(), filterConfig: {} }],
        }),
      ).rejects.toThrow();
    });
@@ -608,7 +608,7 @@ describe(WorkflowService.name, () => {
      });

      await expect(
-        sut.update(auth, created.id, { actions: [{ pluginActionId: factory.uuid(), actionConfig: {} }] }),
+        sut.update(auth, created.id, { actions: [{ actionId: factory.uuid(), actionConfig: {} }] }),
      ).rejects.toThrow();
    });
  });
@@ -643,8 +643,8 @@ describe(WorkflowService.name, () => {
        name: 'test-workflow',
        description: 'Test',
        enabled: true,
-        filters: [{ pluginFilterId: testFilterId, filterConfig: {} }],
-        actions: [{ pluginActionId: testActionId, actionConfig: {} }],
+        filters: [{ filterId: testFilterId, filterConfig: {} }],
+        actions: [{ actionId: testActionId, actionConfig: {} }],
      });

      await sut.delete(auth, workflow.id);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jonathan Jogenfors	173904e387	Merge branch 'main' of https://github.com/immich-app/immich into chore/originals-in-asset-files	2025-12-04 11:30:35 +01:00
Jonathan Jogenfors	42854cad56	wip	2025-12-02 19:46:59 +01:00
Jonathan Jogenfors	93ec8b7ecf	Merge branch 'main' of https://github.com/immich-app/immich into feat/sidecar-asset-files	2025-11-28 01:22:36 +01:00
Jonathan Jogenfors	bf1d409be1	Merge branch 'main' of https://github.com/immich-app/immich into feat/sidecar-asset-files	2025-11-28 00:30:42 +01:00
Jonathan Jogenfors	857816bccc	Merge branch 'fix/asset-service-argument-order' of https://github.com/immich-app/immich into feat/sidecar-asset-files	2025-10-31 01:00:09 +01:00
Jonathan Jogenfors	e19467eddd	fix(server): improved method signatures for stack and sidecar copying	2025-10-31 00:31:03 +01:00
Jonathan Jogenfors	0cb96837d0	Merge branch 'fix/asset-service-argument-order' of https://github.com/immich-app/immich into feat/sidecar-asset-files	2025-10-31 00:27:33 +01:00
Jonathan Jogenfors	cbdfe08344	fix(server): improved method signatures for stack and sidecar copying	2025-10-31 00:14:12 +01:00
Jonathan Jogenfors	6229f9feb4	Merge branch 'main' of https://github.com/immich-app/immich into feat/sidecar-asset-files	2025-10-31 00:03:32 +01:00
Jonathan Jogenfors	20f5a14d03	Merge branch 'main' of https://github.com/immich-app/immich into feat/sidecar-asset-files	2025-10-30 23:19:07 +01:00
Jonathan Jogenfors	7ade8ad69a	Merge branch 'main' of https://github.com/immich-app/immich into feat/sidecar-asset-files	2025-10-04 00:01:53 +02:00
Jonathan Jogenfors	6b91b31dbc	feat: combine with handleSidecarCheck	2025-09-07 21:36:02 +02:00
Jonathan Jogenfors	65f63be564	Merge branch 'fix/sidecar-check-job' of https://github.com/immich-app/immich into feat/sidecar-asset-files	2025-08-27 13:51:14 +02:00
Jonathan Jogenfors	430af9a145	feat: move sidecars to asset_files	2025-08-27 13:02:03 +02:00
Jason Rasmussen	f3b0e8a5e6	fix: sidecar check job	2025-08-26 11:51:21 -04:00