High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: show missing local assets only in timeline with partner sharing (#20298)
shenlonge6ec01985285
diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift b/mobile/lib/infrastructure/entities/merged_asset.driftindex 9778ba723b..579323d641 100644--- a/mobile/lib/infrastructure/entities/merged_asset.drift+++ b/mobile/lib/infrastructure/entities/merged_asset.drift@@ -29,7 +29,7 @@ LEFT JOINWHERErae.deleted_at IS NULLAND rae.visibility = 0 -- timeline visibility- AND rae.owner_id in ?+ AND rae.owner_id IN :user_idsAND (rae.stack_id IS NULLOR rae.id = se.primary_asset_id@@ -57,7 +57,7 @@ SELECTFROMlocal_asset_entity laeWHERE NOT EXISTS (- SELECT 1 FROM remote_asset_entity rae WHERE rae.checksum = lae.checksum+ SELECT 1 FROM remote_asset_entity rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN :user_ids)AND EXISTS (SELECT 1 FROM local_album_asset_entity laa@@ -85,7 +85,7 @@ FROMWHERErae.deleted_at IS NULLAND rae.visibility = 0 -- timeline visibility- AND rae.owner_id in ?+ AND rae.owner_id in :user_idsAND (rae.stack_id IS NULLOR rae.id = se.primary_asset_id@@ -103,6 +103,7 @@ FROMlocal_album_entity la ON la.id = laa.album_idWHERErae.id IS NULL+ AND rae.owner_id IN :user_idsAND la.backup_selection = 0 -- selected)GROUP BY bucket_datediff --git a/mobile/lib/infrastructure/entities/merged_asset.drift.dart b/mobile/lib/infrastructure/entities/merged_asset.drift.dartindex 75f8de2de0..9916ec13bb 100644--- a/mobile/lib/infrastructure/entities/merged_asset.drift.dart+++ b/mobile/lib/infrastructure/entities/merged_asset.drift.dart@@ -16,22 +16,22 @@ import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dclass MergedAssetDrift extends i1.ModularAccessor {MergedAssetDrift(i0.GeneratedDatabase db) : super(db);- i0.Selectable<MergedAssetResult> mergedAsset(- List<String> var1, {+ i0.Selectable<MergedAssetResult> mergedAsset({+ required List<String> userIds,required MergedAsset$limit limit,}) {var $arrayStartIndex = 1;- final expandedvar1 = $expandVar($arrayStartIndex, var1.length);- $arrayStartIndex += var1.length;+ final expandeduserIds = $expandVar($arrayStartIndex, userIds.length);+ $arrayStartIndex += userIds.length;final generatedlimit = $write(limit(alias(this.localAssetEntity, 'lae')),startIndex: $arrayStartIndex,);$arrayStartIndex += generatedlimit.amountOfVariables;return customSelect(- 'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar1) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) ORDER BY created_at DESC ${generatedlimit.sql}',+ 'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) ORDER BY created_at DESC ${generatedlimit.sql}',variables: [- for (var $ in var1) i0.Variable<String>($),+ for (var $ in userIds) i0.Variable<String>($),...generatedlimit.introducedVariables,],readsFrom: {@@ -66,18 +66,18 @@ class MergedAssetDrift extends i1.ModularAccessor {);}- i0.Selectable<MergedBucketResult> mergedBucket(- List<String> var2, {+ i0.Selectable<MergedBucketResult> mergedBucket({required int groupBy,+ required List<String?> userIds,}) {var $arrayStartIndex = 2;- final expandedvar2 = $expandVar($arrayStartIndex, var2.length);- $arrayStartIndex += var2.length;+ final expandeduserIds = $expandVar($arrayStartIndex, userIds.length);+ $arrayStartIndex += userIds.length;return customSelect(- 'SELECT COUNT(*) AS asset_count, CASE WHEN ?1 = 0 THEN STRFTIME(\'%Y-%m-%d\', created_at, \'localtime\') WHEN ?1 = 1 THEN STRFTIME(\'%Y-%m\', created_at, \'localtime\') END AS bucket_date FROM (SELECT rae.created_at FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar2) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT lae.created_at FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum LEFT JOIN local_album_asset_entity AS laa ON laa.asset_id = lae.id LEFT JOIN local_album_entity AS la ON la.id = laa.album_id WHERE rae.id IS NULL AND la.backup_selection = 0) GROUP BY bucket_date ORDER BY bucket_date DESC',+ 'SELECT COUNT(*) AS asset_count, CASE WHEN ?1 = 0 THEN STRFTIME(\'%Y-%m-%d\', created_at, \'localtime\') WHEN ?1 = 1 THEN STRFTIME(\'%Y-%m\', created_at, \'localtime\') END AS bucket_date FROM (SELECT rae.created_at FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT lae.created_at FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum LEFT JOIN local_album_asset_entity AS laa ON laa.asset_id = lae.id LEFT JOIN local_album_entity AS la ON la.id = laa.album_id WHERE rae.id IS NULL AND rae.owner_id IN ($expandeduserIds) AND la.backup_selection = 0) GROUP BY bucket_date ORDER BY bucket_date DESC',variables: [i0.Variable<int>(groupBy),- for (var $ in var2) i0.Variable<String>($),+ for (var $ in userIds) i0.Variable<String>($),],readsFrom: {remoteAssetEntity,diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dartindex a2c14a363f..dcd10faa64 100644--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart@@ -41,7 +41,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {}return _db.mergedAssetDrift- .mergedBucket(userIds, groupBy: groupBy.index)+ .mergedBucket(userIds: userIds, groupBy: groupBy.index).map((row) {final date = row.bucketDate.dateFmt(groupBy);return TimeBucket(date: date, assetCount: row.assetCount);@@ -52,7 +52,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {Future<List<BaseAsset>> _getMainBucketAssets(List<String> userIds, {required int offset, required int count}) {return _db.mergedAssetDrift- .mergedAsset(userIds, limit: (_) => Limit(count, offset))+ .mergedAsset(userIds: userIds, limit: (_) => Limit(count, offset)).map((row) => row.remoteId != null && row.ownerId != null? RemoteAsset(