fix: show only local assets from albums selected for backup (#20050)

* show only local assets from albums selected for backup # Conflicts: # mobile/lib/infrastructure/repositories/db.repository.drift.dart * ignore backup selection * fix: backup album ownerId * fix: backup album ownerId * only show local only assets that are selected for backup * add index on visibility and backup selection * fix: video not playing in search view * remove safe area from bottom bar * refactor stack count with a CTE and local asset with a SELECT * fix lint * remove redundant COALESCE * remove stack count from main timeline query --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com>
2025-07-23 19:43:15 +05:30
parent 92384c28de
commit 08122d6871
19 changed files with 916 additions and 935 deletions
@@ -50,7 +50,7 @@ class DriftBackupRepository extends DriftDatabaseRepository {
    return query.get().then((rows) => rows.length);
  }

-  Future<int> getRemainderCount() async {
+  Future<int> getRemainderCount(String userId) async {
    final query = _db.localAlbumAssetEntity.selectOnly(distinct: true)
      ..addColumns([_db.localAlbumAssetEntity.assetId])
      ..join([
@@ -74,7 +74,8 @@ class DriftBackupRepository extends DriftDatabaseRepository {
      ..where(
        _db.localAlbumEntity.backupSelection
                .equalsValue(BackupSelection.selected) &
-            _db.remoteAssetEntity.id.isNull() &
+            (_db.remoteAssetEntity.id.isNull() |
+                _db.remoteAssetEntity.ownerId.equals(userId).not()) &
            _db.localAlbumAssetEntity.assetId
                .isNotInQuery(_getExcludedSubquery()),
      );
@@ -82,7 +83,7 @@ class DriftBackupRepository extends DriftDatabaseRepository {
    return query.get().then((rows) => rows.length);
  }

-  Future<int> getBackupCount() async {
+  Future<int> getBackupCount(String userId) async {
    final query = _db.localAlbumAssetEntity.selectOnly(distinct: true)
      ..addColumns(
        [_db.localAlbumAssetEntity.assetId],
@@ -109,6 +110,7 @@ class DriftBackupRepository extends DriftDatabaseRepository {
        _db.localAlbumEntity.backupSelection
                .equalsValue(BackupSelection.selected) &
            _db.remoteAssetEntity.id.isNotNull() &
+            _db.remoteAssetEntity.ownerId.equals(userId) &
            _db.localAlbumAssetEntity.assetId
                .isNotInQuery(_getExcludedSubquery()),
      );
@@ -116,7 +118,7 @@ class DriftBackupRepository extends DriftDatabaseRepository {
    return query.get().then((rows) => rows.length);
  }

-  Future<List<LocalAsset>> getCandidates() async {
+  Future<List<LocalAsset>> getCandidates(String userId) async {
    final selectedAlbumIds = _db.localAlbumEntity.selectOnly(distinct: true)
      ..addColumns([_db.localAlbumEntity.id])
      ..where(
@@ -141,6 +143,7 @@ class DriftBackupRepository extends DriftDatabaseRepository {
                ..addColumns([_db.remoteAssetEntity.checksum])
                ..where(
                  _db.remoteAssetEntity.checksum.equalsExp(lae.checksum) &
+                      _db.remoteAssetEntity.ownerId.equals(userId) &
                      lae.checksum.isNotNull(),
                ),
            ) &
@@ -4,8 +4,8 @@ import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart';
 import 'package:flutter/foundation.dart';
 import 'package:immich_mobile/domain/interfaces/db.interface.dart';
-import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.dart';
+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';
@@ -97,7 +97,9 @@ class Drift extends $Drift implements IDatabaseRepository {
                await m.alterTable(TableMigration(v3.stackEntity));
              },
              from3To4: (m, v4) async {
+                // Thumbnail path column got removed from person_entity
                await m.alterTable(TableMigration(v4.personEntity));
+                // asset_face_entity is added
                await m.create(v4.assetFaceEntity);
              },
            ),
@@ -5,17 +5,17 @@ import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart'
    as i1;
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
    as i2;
-import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart'
-    as i3;
 import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart'
+    as i3;
+import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart'
    as i4;
-import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart'
-    as i5;
-import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart'
-    as i6;
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart'
-    as i7;
+    as i5;
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.drift.dart'
+    as i6;
+import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart'
+    as i7;
+import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart'
    as i8;
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart'
    as i9;
@@ -43,17 +43,17 @@ abstract class $Drift extends i0.GeneratedDatabase {
  late final i1.$UserEntityTable userEntity = i1.$UserEntityTable(this);
  late final i2.$RemoteAssetEntityTable remoteAssetEntity =
      i2.$RemoteAssetEntityTable(this);
-  late final i3.$LocalAssetEntityTable localAssetEntity =
-      i3.$LocalAssetEntityTable(this);
-  late final i4.$StackEntityTable stackEntity = i4.$StackEntityTable(this);
-  late final i5.$UserMetadataEntityTable userMetadataEntity =
-      i5.$UserMetadataEntityTable(this);
-  late final i6.$PartnerEntityTable partnerEntity =
-      i6.$PartnerEntityTable(this);
-  late final i7.$LocalAlbumEntityTable localAlbumEntity =
-      i7.$LocalAlbumEntityTable(this);
-  late final i8.$LocalAlbumAssetEntityTable localAlbumAssetEntity =
-      i8.$LocalAlbumAssetEntityTable(this);
+  late final i3.$StackEntityTable stackEntity = i3.$StackEntityTable(this);
+  late final i4.$LocalAssetEntityTable localAssetEntity =
+      i4.$LocalAssetEntityTable(this);
+  late final i5.$LocalAlbumEntityTable localAlbumEntity =
+      i5.$LocalAlbumEntityTable(this);
+  late final i6.$LocalAlbumAssetEntityTable localAlbumAssetEntity =
+      i6.$LocalAlbumAssetEntityTable(this);
+  late final i7.$UserMetadataEntityTable userMetadataEntity =
+      i7.$UserMetadataEntityTable(this);
+  late final i8.$PartnerEntityTable partnerEntity =
+      i8.$PartnerEntityTable(this);
  late final i9.$RemoteExifEntityTable remoteExifEntity =
      i9.$RemoteExifEntityTable(this);
  late final i10.$RemoteAlbumEntityTable remoteAlbumEntity =
@@ -77,15 +77,15 @@ abstract class $Drift extends i0.GeneratedDatabase {
  List<i0.DatabaseSchemaEntity> get allSchemaEntities => [
        userEntity,
        remoteAssetEntity,
-        localAssetEntity,
        stackEntity,
-        i3.idxLocalAssetChecksum,
+        localAssetEntity,
+        localAlbumEntity,
+        localAlbumAssetEntity,
+        i4.idxLocalAssetChecksum,
        i2.uQRemoteAssetOwnerChecksum,
        i2.idxRemoteAssetChecksum,
        userMetadataEntity,
        partnerEntity,
-        localAlbumEntity,
-        localAlbumAssetEntity,
        remoteExifEntity,
        remoteAlbumEntity,
        remoteAlbumAssetEntity,
@@ -113,6 +113,22 @@ abstract class $Drift extends i0.GeneratedDatabase {
              i0.TableUpdate('stack_entity', kind: i0.UpdateKind.delete),
            ],
          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('local_asset_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('local_album_asset_entity',
+                  kind: i0.UpdateKind.delete),
+            ],
+          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('local_album_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('local_album_asset_entity',
+                  kind: i0.UpdateKind.delete),
+            ],
+          ),
          i0.WritePropagation(
            on: i0.TableUpdateQuery.onTableName('user_entity',
                limitUpdateKind: i0.UpdateKind.delete),
@@ -135,22 +151,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
              i0.TableUpdate('partner_entity', kind: i0.UpdateKind.delete),
            ],
          ),
-          i0.WritePropagation(
-            on: i0.TableUpdateQuery.onTableName('local_asset_entity',
-                limitUpdateKind: i0.UpdateKind.delete),
-            result: [
-              i0.TableUpdate('local_album_asset_entity',
-                  kind: i0.UpdateKind.delete),
-            ],
-          ),
-          i0.WritePropagation(
-            on: i0.TableUpdateQuery.onTableName('local_album_entity',
-                limitUpdateKind: i0.UpdateKind.delete),
-            result: [
-              i0.TableUpdate('local_album_asset_entity',
-                  kind: i0.UpdateKind.delete),
-            ],
-          ),
          i0.WritePropagation(
            on: i0.TableUpdateQuery.onTableName('remote_asset_entity',
                limitUpdateKind: i0.UpdateKind.delete),
@@ -260,18 +260,18 @@ class $DriftManager {
      i1.$$UserEntityTableTableManager(_db, _db.userEntity);
  i2.$$RemoteAssetEntityTableTableManager get remoteAssetEntity =>
      i2.$$RemoteAssetEntityTableTableManager(_db, _db.remoteAssetEntity);
-  i3.$$LocalAssetEntityTableTableManager get localAssetEntity =>
-      i3.$$LocalAssetEntityTableTableManager(_db, _db.localAssetEntity);
-  i4.$$StackEntityTableTableManager get stackEntity =>
-      i4.$$StackEntityTableTableManager(_db, _db.stackEntity);
-  i5.$$UserMetadataEntityTableTableManager get userMetadataEntity =>
-      i5.$$UserMetadataEntityTableTableManager(_db, _db.userMetadataEntity);
-  i6.$$PartnerEntityTableTableManager get partnerEntity =>
-      i6.$$PartnerEntityTableTableManager(_db, _db.partnerEntity);
-  i7.$$LocalAlbumEntityTableTableManager get localAlbumEntity =>
-      i7.$$LocalAlbumEntityTableTableManager(_db, _db.localAlbumEntity);
-  i8.$$LocalAlbumAssetEntityTableTableManager get localAlbumAssetEntity => i8
+  i3.$$StackEntityTableTableManager get stackEntity =>
+      i3.$$StackEntityTableTableManager(_db, _db.stackEntity);
+  i4.$$LocalAssetEntityTableTableManager get localAssetEntity =>
+      i4.$$LocalAssetEntityTableTableManager(_db, _db.localAssetEntity);
+  i5.$$LocalAlbumEntityTableTableManager get localAlbumEntity =>
+      i5.$$LocalAlbumEntityTableTableManager(_db, _db.localAlbumEntity);
+  i6.$$LocalAlbumAssetEntityTableTableManager get localAlbumAssetEntity => i6
      .$$LocalAlbumAssetEntityTableTableManager(_db, _db.localAlbumAssetEntity);
+  i7.$$UserMetadataEntityTableTableManager get userMetadataEntity =>
+      i7.$$UserMetadataEntityTableTableManager(_db, _db.userMetadataEntity);
+  i8.$$PartnerEntityTableTableManager get partnerEntity =>
+      i8.$$PartnerEntityTableTableManager(_db, _db.partnerEntity);
  i9.$$RemoteExifEntityTableTableManager get remoteExifEntity =>
      i9.$$RemoteExifEntityTableTableManager(_db, _db.remoteExifEntity);
  i10.$$RemoteAlbumEntityTableTableManager get remoteAlbumEntity =>
@@ -1273,15 +1273,15 @@ final class Schema4 extends i0.VersionedSchema {
  late final List<i1.DatabaseSchemaEntity> entities = [
    userEntity,
    remoteAssetEntity,
-    localAssetEntity,
    stackEntity,
+    localAssetEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
    idxLocalAssetChecksum,
    uQRemoteAssetOwnerChecksum,
    idxRemoteAssetChecksum,
    userMetadataEntity,
    partnerEntity,
-    localAlbumEntity,
-    localAlbumAssetEntity,
    remoteExifEntity,
    remoteAlbumEntity,
    remoteAlbumAssetEntity,
@@ -1342,6 +1342,24 @@ final class Schema4 extends i0.VersionedSchema {
        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 Shape2 localAssetEntity = Shape2(
      source: i0.VersionedTable(
        entityName: 'local_asset_entity',
@@ -1366,9 +1384,9 @@ final class Schema4 extends i0.VersionedSchema {
        attachedDatabase: database,
      ),
      alias: null);
-  late final Shape3 stackEntity = Shape3(
+  late final Shape6 localAlbumEntity = Shape6(
      source: i0.VersionedTable(
-        entityName: 'stack_entity',
+        entityName: 'local_album_entity',
        withoutRowId: true,
        isStrict: true,
        tableConstraints: [
@@ -1376,10 +1394,26 @@ final class Schema4 extends i0.VersionedSchema {
        ],
        columns: [
          _column_0,
-          _column_9,
+          _column_1,
          _column_5,
-          _column_15,
-          _column_75,
+          _column_31,
+          _column_32,
+          _column_33,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape7 localAlbumAssetEntity = Shape7(
+      source: i0.VersionedTable(
+        entityName: 'local_album_asset_entity',
+        withoutRowId: true,
+        isStrict: true,
+        tableConstraints: [
+          'PRIMARY KEY(asset_id, album_id)',
+        ],
+        columns: [
+          _column_34,
+          _column_35,
        ],
        attachedDatabase: database,
      ),
@@ -1423,40 +1457,6 @@ final class Schema4 extends i0.VersionedSchema {
        attachedDatabase: database,
      ),
      alias: null);
-  late final Shape6 localAlbumEntity = Shape6(
-      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_33,
-        ],
-        attachedDatabase: database,
-      ),
-      alias: null);
-  late final Shape7 localAlbumAssetEntity = Shape7(
-      source: i0.VersionedTable(
-        entityName: 'local_album_asset_entity',
-        withoutRowId: true,
-        isStrict: true,
-        tableConstraints: [
-          'PRIMARY KEY(asset_id, album_id)',
-        ],
-        columns: [
-          _column_34,
-          _column_35,
-        ],
-        attachedDatabase: database,
-      ),
-      alias: null);
  late final Shape8 remoteExifEntity = Shape8(
      source: i0.VersionedTable(
        entityName: 'remote_exif_entity',
@@ -32,49 +32,21 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
  }

  Stream<RemoteAsset?> watchAsset(String id) {
-    final stackCountRef = _db.stackEntity.id.count();
-
    final query = _db.remoteAssetEntity.select().addColumns([
      _db.localAssetEntity.id,
-      _db.stackEntity.primaryAssetId,
-      stackCountRef,
    ]).join([
      leftOuterJoin(
        _db.localAssetEntity,
        _db.remoteAssetEntity.checksum.equalsExp(_db.localAssetEntity.checksum),
        useColumns: false,
      ),
-      leftOuterJoin(
-        _db.stackEntity,
-        _db.stackEntity.primaryAssetId.equalsExp(_db.remoteAssetEntity.id),
-        useColumns: false,
-      ),
-      leftOuterJoin(
-        _db.remoteAssetEntity.createAlias('stacked_assets'),
-        _db.stackEntity.id.equalsExp(
-          _db.remoteAssetEntity.createAlias('stacked_assets').stackId,
-        ),
-        useColumns: false,
-      ),
    ])
      ..where(_db.remoteAssetEntity.id.equals(id))
-      ..groupBy([
-        _db.remoteAssetEntity.id,
-        _db.localAssetEntity.id,
-        _db.stackEntity.primaryAssetId,
-      ])
      ..limit(1);

    return query.map((row) {
      final asset = row.readTable(_db.remoteAssetEntity).toDto();
-      final primaryAssetId = row.read(_db.stackEntity.primaryAssetId);
-      final stackCount =
-          primaryAssetId == id ? (row.read(stackCountRef) ?? 0) : 0;
-
-      return asset.copyWith(
-        localId: row.read(_db.localAssetEntity.id),
-        stackCount: stackCount,
-      );
+      return asset.copyWith(localId: row.read(_db.localAssetEntity.id));
    }).watchSingleOrNull();
  }

@@ -71,7 +71,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
    required int count,
  }) {
    return _db.mergedAssetDrift
-        .mergedAsset(userIds, limit: Limit(count, offset))
+        .mergedAsset(userIds, limit: (_) => Limit(count, offset))
        .map(
          (row) => row.remoteId != null && row.ownerId != null
              ? RemoteAsset(
@@ -90,7 +90,6 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
                  durationInSeconds: row.durationInSeconds,
                  livePhotoVideoId: row.livePhotoVideoId,
                  stackId: row.stackId,
-                  stackCount: row.stackCount,
                )
              : LocalAsset(
                  id: row.localId!,