Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-08-30 23:02:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

sync remote asset metadata

Browse Source
This commit is contained in:
shenlong-tanwen 2025-08-29 15:04:37 +05:30
parent 5e2e4f9c84
commit 902d81a818
15 changed files with 1113 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/drift_schemas/main/drift_schema_v9.json generated
View File

File diff suppressed because one or more lines are too long

39
mobile/lib/domain/models/asset/asset_metadata.model.dart Normal file
View File

@ -0,0 +1,39 @@
import 'dart:convert';
enum RemoteAssetMetadataKey {
mobileApp("mobile-app");
final String key;
const RemoteAssetMetadataKey(this.key);
factory RemoteAssetMetadataKey.fromKey(String key) {
switch (key) {
case "mobile-app":
return RemoteAssetMetadataKey.mobileApp;
default:
throw ArgumentError("Unknown AssetMetadataKey key: $key");
}
}
}
class RemoteAssetMetadata {
final String? cloudId;
const RemoteAssetMetadata({this.cloudId});
Map<String, dynamic> toMap() {
final mobileAppValue = {};
if (cloudId != null) {
mobileAppValue["iCloudId"] = cloudId;
}
return {
"metadata": [
{"key": RemoteAssetMetadataKey.mobileApp.key, "value": mobileAppValue},
],
};
}
String toJson() => json.encode(toMap());
}

20
mobile/lib/domain/models/asset/metadata.model.dart
View File

@ -1,20 +0,0 @@
import 'dart:convert';
class AssetMetadata {
final String? cloudId;
const AssetMetadata({this.cloudId});
Map<String, dynamic> toMap() {
return {
"metadata": [
{
"key": "mobile-app",
"value": cloudId != null ? {"iCloudId": cloudId} : {},
},
],
};
}
String toJson() => json.encode(toMap());
}

4
mobile/lib/domain/services/sync_stream.service.dart
View File

@ -117,6 +117,10 @@ class SyncStreamService {
return _syncStreamRepository.deleteAssetsV1(data.cast()); return _syncStreamRepository.deleteAssetsV1(data.cast());
case SyncEntityType.assetExifV1: case SyncEntityType.assetExifV1:
return _syncStreamRepository.updateAssetsExifV1(data.cast()); return _syncStreamRepository.updateAssetsExifV1(data.cast());
case SyncEntityType.assetMetadataV1:
return _syncStreamRepository.updateAssetsMetadataV1(data.cast());
case SyncEntityType.assetMetadataDeleteV1:
return _syncStreamRepository.deleteAssetsMetadataV1(data.cast());
case SyncEntityType.partnerAssetV1: case SyncEntityType.partnerAssetV1:
return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'partner'); return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'partner');
case SyncEntityType.partnerAssetBackfillV1: case SyncEntityType.partnerAssetBackfillV1:

1
mobile/lib/infrastructure/entities/local_asset.entity.dart
View File

@ -5,6 +5,7 @@ import 'package:immich_mobile/infrastructure/utils/asset.mixin.dart';
import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart'; import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)') @TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)')
@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (cloud_id)')
class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin { class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
const LocalAssetEntity(); const LocalAssetEntity();

5
mobile/lib/infrastructure/entities/local_asset.entity.drift.dart generated
View File

@ -1055,3 +1055,8 @@ class LocalAssetEntityCompanion
.toString(); .toString();
} }
} }
i0.Index get idxLocalAssetCloudId => i0.Index(
'idx_local_asset_cloud_id',
'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (cloud_id)',
);

31
mobile/lib/infrastructure/entities/remote_asset_metadata.entity.dart Normal file
View File

@ -0,0 +1,31 @@
import 'package:drift/drift.dart';
import 'package:immich_mobile/domain/models/asset/asset_metadata.model.dart';
import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
class RemoteAssetMetadataEntity extends Table with DriftDefaultsMixin {
const RemoteAssetMetadataEntity();
TextColumn get assetId => text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
TextColumn get key => text().map(const RemoteAssetMetadataKeyConverter())();
BlobColumn get value => blob().map(assetMetadataConverter)();
@override
Set<Column> get primaryKey => {assetId, key};
}
class RemoteAssetMetadataKeyConverter extends TypeConverter<RemoteAssetMetadataKey, String> {
const RemoteAssetMetadataKeyConverter();
@override
RemoteAssetMetadataKey fromSql(String fromDb) => RemoteAssetMetadataKey.fromKey(fromDb);
@override
String toSql(RemoteAssetMetadataKey value) => value.key;
}
final JsonTypeConverter2<Map<String, Object?>, Uint8List, Object?> assetMetadataConverter = TypeConverter.jsonb(
fromJson: (json) => json as Map<String, Object?>,
);

647
mobile/lib/infrastructure/entities/remote_asset_metadata.entity.drift.dart generated Normal file
View File

@ -0,0 +1,647 @@
// dart format width=80
// ignore_for_file: type=lint
import 'package:drift/drift.dart' as i0;
import 'package:immich_mobile/infrastructure/entities/remote_asset_metadata.entity.drift.dart'
as i1;
import 'package:immich_mobile/domain/models/asset/asset_metadata.model.dart'
as i2;
import 'dart:typed_data' as i3;
import 'package:immich_mobile/infrastructure/entities/remote_asset_metadata.entity.dart'
as i4;
import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
as i5;
import 'package:drift/internal/modular.dart' as i6;
typedef $$RemoteAssetMetadataEntityTableCreateCompanionBuilder =
i1.RemoteAssetMetadataEntityCompanion Function({
required String assetId,
required i2.RemoteAssetMetadataKey key,
required Map<String, Object?> value,
});
typedef $$RemoteAssetMetadataEntityTableUpdateCompanionBuilder =
i1.RemoteAssetMetadataEntityCompanion Function({
i0.Value<String> assetId,
i0.Value<i2.RemoteAssetMetadataKey> key,
i0.Value<Map<String, Object?>> value,
});
final class $$RemoteAssetMetadataEntityTableReferences
extends
i0.BaseReferences<
i0.GeneratedDatabase,
i1.$RemoteAssetMetadataEntityTable,
i1.RemoteAssetMetadataEntityData
> {
$$RemoteAssetMetadataEntityTableReferences(
super.$_db,
super.$_table,
super.$_typedResult,
);
static i5.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
i6.ReadDatabaseContainer(db)
.resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity')
.createAlias(
i0.$_aliasNameGenerator(
i6.ReadDatabaseContainer(db)
.resultSet<i1.$RemoteAssetMetadataEntityTable>(
'remote_asset_metadata_entity',
)
.assetId,
i6.ReadDatabaseContainer(
db,
).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity').id,
),
);
i5.$$RemoteAssetEntityTableProcessedTableManager get assetId {
final $_column = $_itemColumn<String>('asset_id')!;
final manager = i5
.$$RemoteAssetEntityTableTableManager(
$_db,
i6.ReadDatabaseContainer(
$_db,
).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
)
.filter((f) => f.id.sqlEquals($_column));
final item = $_typedResult.readTableOrNull(_assetIdTable($_db));
if (item == null) return manager;
return i0.ProcessedTableManager(
manager.$state.copyWith(prefetchedData: [item]),
);
}
}
class $$RemoteAssetMetadataEntityTableFilterComposer
extends
i0.Composer<i0.GeneratedDatabase, i1.$RemoteAssetMetadataEntityTable> {
$$RemoteAssetMetadataEntityTableFilterComposer({
required super.$db,
required super.$table,
super.joinBuilder,
super.$addJoinBuilderToRootComposer,
super.$removeJoinBuilderFromRootComposer,
});
i0.ColumnWithTypeConverterFilters<
i2.RemoteAssetMetadataKey,
i2.RemoteAssetMetadataKey,
String
>
get key => $composableBuilder(
column: $table.key,
builder: (column) => i0.ColumnWithTypeConverterFilters(column),
);
i0.ColumnWithTypeConverterFilters<
Map<String, Object?>,
Map<String, Object>,
i3.Uint8List
>
get value => $composableBuilder(
column: $table.value,
builder: (column) => i0.ColumnWithTypeConverterFilters(column),
);
i5.$$RemoteAssetEntityTableFilterComposer get assetId {
final i5.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
composer: this,
getCurrentColumn: (t) => t.assetId,
referencedTable: i6.ReadDatabaseContainer(
$db,
).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
getReferencedColumn: (t) => t.id,
builder:
(
joinBuilder, {
$addJoinBuilderToRootComposer,
$removeJoinBuilderFromRootComposer,
}) => i5.$$RemoteAssetEntityTableFilterComposer(
$db: $db,
$table: i6.ReadDatabaseContainer(
$db,
).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
$addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
joinBuilder: joinBuilder,
$removeJoinBuilderFromRootComposer:
$removeJoinBuilderFromRootComposer,
),
);
return composer;
}
}
class $$RemoteAssetMetadataEntityTableOrderingComposer
extends
i0.Composer<i0.GeneratedDatabase, i1.$RemoteAssetMetadataEntityTable> {
$$RemoteAssetMetadataEntityTableOrderingComposer({
required super.$db,
required super.$table,
super.joinBuilder,
super.$addJoinBuilderToRootComposer,
super.$removeJoinBuilderFromRootComposer,
});
i0.ColumnOrderings<String> get key => $composableBuilder(
column: $table.key,
builder: (column) => i0.ColumnOrderings(column),
);
i0.ColumnOrderings<i3.Uint8List> get value => $composableBuilder(
column: $table.value,
builder: (column) => i0.ColumnOrderings(column),
);
i5.$$RemoteAssetEntityTableOrderingComposer get assetId {
final i5.$$RemoteAssetEntityTableOrderingComposer composer =
$composerBuilder(
composer: this,
getCurrentColumn: (t) => t.assetId,
referencedTable: i6.ReadDatabaseContainer(
$db,
).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
getReferencedColumn: (t) => t.id,
builder:
(
joinBuilder, {
$addJoinBuilderToRootComposer,
$removeJoinBuilderFromRootComposer,
}) => i5.$$RemoteAssetEntityTableOrderingComposer(
$db: $db,
$table: i6.ReadDatabaseContainer(
$db,
).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
$addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
joinBuilder: joinBuilder,
$removeJoinBuilderFromRootComposer:
$removeJoinBuilderFromRootComposer,
),
);
return composer;
}
}
class $$RemoteAssetMetadataEntityTableAnnotationComposer
extends
i0.Composer<i0.GeneratedDatabase, i1.$RemoteAssetMetadataEntityTable> {
$$RemoteAssetMetadataEntityTableAnnotationComposer({
required super.$db,
required super.$table,
super.joinBuilder,
super.$addJoinBuilderToRootComposer,
super.$removeJoinBuilderFromRootComposer,
});
i0.GeneratedColumnWithTypeConverter<i2.RemoteAssetMetadataKey, String>
get key =>
$composableBuilder(column: $table.key, builder: (column) => column);
i0.GeneratedColumnWithTypeConverter<Map<String, Object?>, i3.Uint8List>
get value =>
$composableBuilder(column: $table.value, builder: (column) => column);
i5.$$RemoteAssetEntityTableAnnotationComposer get assetId {
final i5.$$RemoteAssetEntityTableAnnotationComposer composer =
$composerBuilder(
composer: this,
getCurrentColumn: (t) => t.assetId,
referencedTable: i6.ReadDatabaseContainer(
$db,
).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
getReferencedColumn: (t) => t.id,
builder:
(
joinBuilder, {
$addJoinBuilderToRootComposer,
$removeJoinBuilderFromRootComposer,
}) => i5.$$RemoteAssetEntityTableAnnotationComposer(
$db: $db,
$table: i6.ReadDatabaseContainer(
$db,
).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
$addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
joinBuilder: joinBuilder,
$removeJoinBuilderFromRootComposer:
$removeJoinBuilderFromRootComposer,
),
);
return composer;
}
}
class $$RemoteAssetMetadataEntityTableTableManager
extends
i0.RootTableManager<
i0.GeneratedDatabase,
i1.$RemoteAssetMetadataEntityTable,
i1.RemoteAssetMetadataEntityData,
i1.$$RemoteAssetMetadataEntityTableFilterComposer,
i1.$$RemoteAssetMetadataEntityTableOrderingComposer,
i1.$$RemoteAssetMetadataEntityTableAnnotationComposer,
$$RemoteAssetMetadataEntityTableCreateCompanionBuilder,
$$RemoteAssetMetadataEntityTableUpdateCompanionBuilder,
(
i1.RemoteAssetMetadataEntityData,
i1.$$RemoteAssetMetadataEntityTableReferences,
),
i1.RemoteAssetMetadataEntityData,
i0.PrefetchHooks Function({bool assetId})
> {
$$RemoteAssetMetadataEntityTableTableManager(
i0.GeneratedDatabase db,
i1.$RemoteAssetMetadataEntityTable table,
) : super(
i0.TableManagerState(
db: db,
table: table,
createFilteringComposer: () =>
i1.$$RemoteAssetMetadataEntityTableFilterComposer(
$db: db,
$table: table,
),
createOrderingComposer: () =>
i1.$$RemoteAssetMetadataEntityTableOrderingComposer(
$db: db,
$table: table,
),
createComputedFieldComposer: () =>
i1.$$RemoteAssetMetadataEntityTableAnnotationComposer(
$db: db,
$table: table,
),
updateCompanionCallback:
({
i0.Value<String> assetId = const i0.Value.absent(),
i0.Value<i2.RemoteAssetMetadataKey> key =
const i0.Value.absent(),
i0.Value<Map<String, Object?>> value = const i0.Value.absent(),
}) => i1.RemoteAssetMetadataEntityCompanion(
assetId: assetId,
key: key,
value: value,
),
createCompanionCallback:
({
required String assetId,
required i2.RemoteAssetMetadataKey key,
required Map<String, Object?> value,
}) => i1.RemoteAssetMetadataEntityCompanion.insert(
assetId: assetId,
key: key,
value: value,
),
withReferenceMapper: (p0) => p0
.map(
(e) => (
e.readTable(table),
i1.$$RemoteAssetMetadataEntityTableReferences(db, table, e),
),
)
.toList(),
prefetchHooksCallback: ({assetId = false}) {
return i0.PrefetchHooks(
db: db,
explicitlyWatchedTables: [],
addJoins:
<
T extends i0.TableManagerState<
dynamic,
dynamic,
dynamic,
dynamic,
dynamic,
dynamic,
dynamic,
dynamic,
dynamic,
dynamic,
dynamic
>
>(state) {
if (assetId) {
state =
state.withJoin(
currentTable: table,
currentColumn: table.assetId,
referencedTable: i1
.$$RemoteAssetMetadataEntityTableReferences
._assetIdTable(db),
referencedColumn: i1
.$$RemoteAssetMetadataEntityTableReferences
._assetIdTable(db)
.id,
)
as T;
}
return state;
},
getPrefetchedDataCallback: (items) async {
return [];
},
);
},
),
);
}
typedef $$RemoteAssetMetadataEntityTableProcessedTableManager =
i0.ProcessedTableManager<
i0.GeneratedDatabase,
i1.$RemoteAssetMetadataEntityTable,
i1.RemoteAssetMetadataEntityData,
i1.$$RemoteAssetMetadataEntityTableFilterComposer,
i1.$$RemoteAssetMetadataEntityTableOrderingComposer,
i1.$$RemoteAssetMetadataEntityTableAnnotationComposer,
$$RemoteAssetMetadataEntityTableCreateCompanionBuilder,
$$RemoteAssetMetadataEntityTableUpdateCompanionBuilder,
(
i1.RemoteAssetMetadataEntityData,
i1.$$RemoteAssetMetadataEntityTableReferences,
),
i1.RemoteAssetMetadataEntityData,
i0.PrefetchHooks Function({bool assetId})
>;
class $RemoteAssetMetadataEntityTable extends i4.RemoteAssetMetadataEntity
with
i0.TableInfo<
$RemoteAssetMetadataEntityTable,
i1.RemoteAssetMetadataEntityData
> {
@override
final i0.GeneratedDatabase attachedDatabase;
final String? _alias;
$RemoteAssetMetadataEntityTable(this.attachedDatabase, [this._alias]);
static const i0.VerificationMeta _assetIdMeta = const i0.VerificationMeta(
'assetId',
);
@override
late final i0.GeneratedColumn<String> assetId = i0.GeneratedColumn<String>(
'asset_id',
aliasedName,
false,
type: i0.DriftSqlType.string,
requiredDuringInsert: true,
defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
'REFERENCES remote_asset_entity (id) ON DELETE CASCADE',
),
);
@override
late final i0.GeneratedColumnWithTypeConverter<
i2.RemoteAssetMetadataKey,
String
>
key =
i0.GeneratedColumn<String>(
'key',
aliasedName,
false,
type: i0.DriftSqlType.string,
requiredDuringInsert: true,
).withConverter<i2.RemoteAssetMetadataKey>(
i1.$RemoteAssetMetadataEntityTable.$converterkey,
);
@override
late final i0.GeneratedColumnWithTypeConverter<
Map<String, Object?>,
i3.Uint8List
>
value =
i0.GeneratedColumn<i3.Uint8List>(
'value',
aliasedName,
false,
type: i0.DriftSqlType.blob,
requiredDuringInsert: true,
).withConverter<Map<String, Object?>>(
i1.$RemoteAssetMetadataEntityTable.$convertervalue,
);
@override
List<i0.GeneratedColumn> get $columns => [assetId, key, value];
@override
String get aliasedName => _alias ?? actualTableName;
@override
String get actualTableName => $name;
static const String $name = 'remote_asset_metadata_entity';
@override
i0.VerificationContext validateIntegrity(
i0.Insertable<i1.RemoteAssetMetadataEntityData> instance, {
bool isInserting = false,
}) {
final context = i0.VerificationContext();
final data = instance.toColumns(true);
if (data.containsKey('asset_id')) {
context.handle(
_assetIdMeta,
assetId.isAcceptableOrUnknown(data['asset_id']!, _assetIdMeta),
);
} else if (isInserting) {
context.missing(_assetIdMeta);
}
return context;
}
@override
Set<i0.GeneratedColumn> get $primaryKey => {assetId, key};
@override
i1.RemoteAssetMetadataEntityData map(
Map<String, dynamic> data, {
String? tablePrefix,
}) {
final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
return i1.RemoteAssetMetadataEntityData(
assetId: attachedDatabase.typeMapping.read(
i0.DriftSqlType.string,
data['${effectivePrefix}asset_id'],
)!,
key: i1.$RemoteAssetMetadataEntityTable.$converterkey.fromSql(
attachedDatabase.typeMapping.read(
i0.DriftSqlType.string,
data['${effectivePrefix}key'],
)!,
),
value: i1.$RemoteAssetMetadataEntityTable.$convertervalue.fromSql(
attachedDatabase.typeMapping.read(
i0.DriftSqlType.blob,
data['${effectivePrefix}value'],
)!,
),
);
}
@override
$RemoteAssetMetadataEntityTable createAlias(String alias) {
return $RemoteAssetMetadataEntityTable(attachedDatabase, alias);
}
static i0.TypeConverter<i2.RemoteAssetMetadataKey, String> $converterkey =
const i4.RemoteAssetMetadataKeyConverter();
static i0.JsonTypeConverter2<Map<String, Object?>, i3.Uint8List, Object?>
$convertervalue = i4.assetMetadataConverter;
@override
bool get withoutRowId => true;
@override
bool get isStrict => true;
}
class RemoteAssetMetadataEntityData extends i0.DataClass
implements i0.Insertable<i1.RemoteAssetMetadataEntityData> {
final String assetId;
final i2.RemoteAssetMetadataKey key;
final Map<String, Object?> value;
const RemoteAssetMetadataEntityData({
required this.assetId,
required this.key,
required this.value,
});
@override
Map<String, i0.Expression> toColumns(bool nullToAbsent) {
final map = <String, i0.Expression>{};
map['asset_id'] = i0.Variable<String>(assetId);
{
map['key'] = i0.Variable<String>(
i1.$RemoteAssetMetadataEntityTable.$converterkey.toSql(key),
);
}
{
map['value'] = i0.Variable<i3.Uint8List>(
i1.$RemoteAssetMetadataEntityTable.$convertervalue.toSql(value),
);
}
return map;
}
factory RemoteAssetMetadataEntityData.fromJson(
Map<String, dynamic> json, {
i0.ValueSerializer? serializer,
}) {
serializer ??= i0.driftRuntimeOptions.defaultSerializer;
return RemoteAssetMetadataEntityData(
assetId: serializer.fromJson<String>(json['assetId']),
key: serializer.fromJson<i2.RemoteAssetMetadataKey>(json['key']),
value: i1.$RemoteAssetMetadataEntityTable.$convertervalue.fromJson(
serializer.fromJson<Object?>(json['value']),
),
);
}
@override
Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
serializer ??= i0.driftRuntimeOptions.defaultSerializer;
return <String, dynamic>{
'assetId': serializer.toJson<String>(assetId),
'key': serializer.toJson<i2.RemoteAssetMetadataKey>(key),
'value': serializer.toJson<Object?>(
i1.$RemoteAssetMetadataEntityTable.$convertervalue.toJson(value),
),
};
}
i1.RemoteAssetMetadataEntityData copyWith({
String? assetId,
i2.RemoteAssetMetadataKey? key,
Map<String, Object?>? value,
}) => i1.RemoteAssetMetadataEntityData(
assetId: assetId ?? this.assetId,
key: key ?? this.key,
value: value ?? this.value,
);
RemoteAssetMetadataEntityData copyWithCompanion(
i1.RemoteAssetMetadataEntityCompanion data,
) {
return RemoteAssetMetadataEntityData(
assetId: data.assetId.present ? data.assetId.value : this.assetId,
key: data.key.present ? data.key.value : this.key,
value: data.value.present ? data.value.value : this.value,
);
}
@override
String toString() {
return (StringBuffer('RemoteAssetMetadataEntityData(')
..write('assetId: $assetId, ')
..write('key: $key, ')
..write('value: $value')
..write(')'))
.toString();
}
@override
int get hashCode => Object.hash(assetId, key, value);
@override
bool operator ==(Object other) =>
identical(this, other) ||
(other is i1.RemoteAssetMetadataEntityData &&
other.assetId == this.assetId &&
other.key == this.key &&
other.value == this.value);
}
class RemoteAssetMetadataEntityCompanion
extends i0.UpdateCompanion<i1.RemoteAssetMetadataEntityData> {
final i0.Value<String> assetId;
final i0.Value<i2.RemoteAssetMetadataKey> key;
final i0.Value<Map<String, Object?>> value;
const RemoteAssetMetadataEntityCompanion({
this.assetId = const i0.Value.absent(),
this.key = const i0.Value.absent(),
this.value = const i0.Value.absent(),
});
RemoteAssetMetadataEntityCompanion.insert({
required String assetId,
required i2.RemoteAssetMetadataKey key,
required Map<String, Object?> value,
}) : assetId = i0.Value(assetId),
key = i0.Value(key),
value = i0.Value(value);
static i0.Insertable<i1.RemoteAssetMetadataEntityData> custom({
i0.Expression<String>? assetId,
i0.Expression<String>? key,
i0.Expression<i3.Uint8List>? value,
}) {
return i0.RawValuesInsertable({
if (assetId != null) 'asset_id': assetId,
if (key != null) 'key': key,
if (value != null) 'value': value,
});
}
i1.RemoteAssetMetadataEntityCompanion copyWith({
i0.Value<String>? assetId,
i0.Value<i2.RemoteAssetMetadataKey>? key,
i0.Value<Map<String, Object?>>? value,
}) {
return i1.RemoteAssetMetadataEntityCompanion(
assetId: assetId ?? this.assetId,
key: key ?? this.key,
value: value ?? this.value,
);
}
@override
Map<String, i0.Expression> toColumns(bool nullToAbsent) {
final map = <String, i0.Expression>{};
if (assetId.present) {
map['asset_id'] = i0.Variable<String>(assetId.value);
}
if (key.present) {
map['key'] = i0.Variable<String>(
i1.$RemoteAssetMetadataEntityTable.$converterkey.toSql(key.value),
);
}
if (value.present) {
map['value'] = i0.Variable<i3.Uint8List>(
i1.$RemoteAssetMetadataEntityTable.$convertervalue.toSql(value.value),
);
}
return map;
}
@override
String toString() {
return (StringBuffer('RemoteAssetMetadataEntityCompanion(')
..write('assetId: $assetId, ')
..write('key: $key, ')
..write('value: $value')
..write(')'))
.toString();
}
}

5
mobile/lib/infrastructure/repositories/db.repository.dart
View File

@ -17,6 +17,7 @@ import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.dart'; import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.dart';
import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.dart'; import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.dart';
import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart'; import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
import 'package:immich_mobile/infrastructure/entities/remote_asset_metadata.entity.dart';
import 'package:immich_mobile/infrastructure/entities/stack.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/store.entity.dart';
import 'package:immich_mobile/infrastructure/entities/user.entity.dart'; import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
@ -50,6 +51,7 @@ class IsarDatabaseRepository implements IDatabaseRepository {
LocalAssetEntity, LocalAssetEntity,
LocalAlbumAssetEntity, LocalAlbumAssetEntity,
RemoteAssetEntity, RemoteAssetEntity,
RemoteAssetMetadataEntity,
RemoteExifEntity, RemoteExifEntity,
RemoteAlbumEntity, RemoteAlbumEntity,
RemoteAlbumAssetEntity, RemoteAlbumAssetEntity,
@ -126,6 +128,9 @@ class Drift extends $Drift implements IDatabaseRepository {
from8To9: (m, v9) async { from8To9: (m, v9) async {
// Add cloudId column to local_asset_entity // Add cloudId column to local_asset_entity
await m.addColumn(v9.localAssetEntity, v9.localAssetEntity.cloudId); await m.addColumn(v9.localAssetEntity, v9.localAssetEntity.cloudId);
await m.createIndex(v9.idxLocalAssetCloudId);
// Create new table
await m.createTable(v9.remoteAssetMetadataEntity);
}, },
), ),
); );

104
mobile/lib/infrastructure/repositories/db.repository.drift.dart generated
View File

@ -17,27 +17,29 @@ import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift
as i7; as i7;
import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart' import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart'
as i8; as i8;
import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart' import 'package:immich_mobile/infrastructure/entities/remote_asset_metadata.entity.drift.dart'
as i9; as i9;
import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart' import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart'
as i10; as i10;
import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart' import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart'
as i11; as i11;
import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart' import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart'
as i12; as i12;
import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart' import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart'
as i13; as i13;
import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart' import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart'
as i14; as i14;
import 'package:immich_mobile/infrastructure/entities/person.entity.drift.dart' import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart'
as i15; as i15;
import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart' import 'package:immich_mobile/infrastructure/entities/person.entity.drift.dart'
as i16; as i16;
import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart' import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart'
as i17; as i17;
import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart' import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart'
as i18; as i18;
import 'package:drift/internal/modular.dart' as i19; import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
as i19;
import 'package:drift/internal/modular.dart' as i20;
abstract class $Drift extends i0.GeneratedDatabase { abstract class $Drift extends i0.GeneratedDatabase {
$Drift(i0.QueryExecutor e) : super(e); $Drift(i0.QueryExecutor e) : super(e);
@ -57,24 +59,26 @@ abstract class $Drift extends i0.GeneratedDatabase {
late final i8.$PartnerEntityTable partnerEntity = i8.$PartnerEntityTable( late final i8.$PartnerEntityTable partnerEntity = i8.$PartnerEntityTable(
this, this,
); );
late final i9.$RemoteExifEntityTable remoteExifEntity = i9 late final i9.$RemoteAssetMetadataEntityTable remoteAssetMetadataEntity = i9
.$RemoteAssetMetadataEntityTable(this);
late final i10.$RemoteExifEntityTable remoteExifEntity = i10
.$RemoteExifEntityTable(this); .$RemoteExifEntityTable(this);
late final i10.$RemoteAlbumEntityTable remoteAlbumEntity = i10 late final i11.$RemoteAlbumEntityTable remoteAlbumEntity = i11
.$RemoteAlbumEntityTable(this); .$RemoteAlbumEntityTable(this);
late final i11.$RemoteAlbumAssetEntityTable remoteAlbumAssetEntity = i11 late final i12.$RemoteAlbumAssetEntityTable remoteAlbumAssetEntity = i12
.$RemoteAlbumAssetEntityTable(this); .$RemoteAlbumAssetEntityTable(this);
late final i12.$RemoteAlbumUserEntityTable remoteAlbumUserEntity = i12 late final i13.$RemoteAlbumUserEntityTable remoteAlbumUserEntity = i13
.$RemoteAlbumUserEntityTable(this); .$RemoteAlbumUserEntityTable(this);
late final i13.$MemoryEntityTable memoryEntity = i13.$MemoryEntityTable(this); late final i14.$MemoryEntityTable memoryEntity = i14.$MemoryEntityTable(this);
late final i14.$MemoryAssetEntityTable memoryAssetEntity = i14 late final i15.$MemoryAssetEntityTable memoryAssetEntity = i15
.$MemoryAssetEntityTable(this); .$MemoryAssetEntityTable(this);
late final i15.$PersonEntityTable personEntity = i15.$PersonEntityTable(this); late final i16.$PersonEntityTable personEntity = i16.$PersonEntityTable(this);
late final i16.$AssetFaceEntityTable assetFaceEntity = i16 late final i17.$AssetFaceEntityTable assetFaceEntity = i17
.$AssetFaceEntityTable(this); .$AssetFaceEntityTable(this);
late final i17.$StoreEntityTable storeEntity = i17.$StoreEntityTable(this); late final i18.$StoreEntityTable storeEntity = i18.$StoreEntityTable(this);
i18.MergedAssetDrift get mergedAssetDrift => i19.ReadDatabaseContainer( i19.MergedAssetDrift get mergedAssetDrift => i20.ReadDatabaseContainer(
this, this,
).accessor<i18.MergedAssetDrift>(i18.MergedAssetDrift.new); ).accessor<i19.MergedAssetDrift>(i19.MergedAssetDrift.new);
@override @override
Iterable<i0.TableInfo<i0.Table, Object?>> get allTables => Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>(); allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@ -87,12 +91,14 @@ abstract class $Drift extends i0.GeneratedDatabase {
localAlbumEntity, localAlbumEntity,
localAlbumAssetEntity, localAlbumAssetEntity,
i4.idxLocalAssetChecksum, i4.idxLocalAssetChecksum,
i4.idxLocalAssetCloudId,
i2.idxRemoteAssetOwnerChecksum, i2.idxRemoteAssetOwnerChecksum,
i2.uQRemoteAssetsOwnerChecksum, i2.uQRemoteAssetsOwnerChecksum,
i2.uQRemoteAssetsOwnerLibraryChecksum, i2.uQRemoteAssetsOwnerLibraryChecksum,
i2.idxRemoteAssetChecksum, i2.idxRemoteAssetChecksum,
userMetadataEntity, userMetadataEntity,
partnerEntity, partnerEntity,
remoteAssetMetadataEntity,
remoteExifEntity, remoteExifEntity,
remoteAlbumEntity, remoteAlbumEntity,
remoteAlbumAssetEntity, remoteAlbumAssetEntity,
@ -102,7 +108,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
personEntity, personEntity,
assetFaceEntity, assetFaceEntity,
storeEntity, storeEntity,
i9.idxLatLng, i10.idxLatLng,
]; ];
@override @override
i0.StreamQueryUpdateRules i0.StreamQueryUpdateRules
@ -164,6 +170,18 @@ abstract class $Drift extends i0.GeneratedDatabase {
), ),
result: [i0.TableUpdate('partner_entity', kind: i0.UpdateKind.delete)], result: [i0.TableUpdate('partner_entity', kind: i0.UpdateKind.delete)],
), ),
i0.WritePropagation(
on: i0.TableUpdateQuery.onTableName(
'remote_asset_entity',
limitUpdateKind: i0.UpdateKind.delete,
),
result: [
i0.TableUpdate(
'remote_asset_metadata_entity',
kind: i0.UpdateKind.delete,
),
],
),
i0.WritePropagation( i0.WritePropagation(
on: i0.TableUpdateQuery.onTableName( on: i0.TableUpdateQuery.onTableName(
'remote_asset_entity', 'remote_asset_entity',
@ -298,25 +316,31 @@ class $DriftManager {
i7.$$UserMetadataEntityTableTableManager(_db, _db.userMetadataEntity); i7.$$UserMetadataEntityTableTableManager(_db, _db.userMetadataEntity);
i8.$$PartnerEntityTableTableManager get partnerEntity => i8.$$PartnerEntityTableTableManager get partnerEntity =>
i8.$$PartnerEntityTableTableManager(_db, _db.partnerEntity); i8.$$PartnerEntityTableTableManager(_db, _db.partnerEntity);
i9.$$RemoteExifEntityTableTableManager get remoteExifEntity => i9.$$RemoteAssetMetadataEntityTableTableManager
i9.$$RemoteExifEntityTableTableManager(_db, _db.remoteExifEntity); get remoteAssetMetadataEntity =>
i10.$$RemoteAlbumEntityTableTableManager get remoteAlbumEntity => i9.$$RemoteAssetMetadataEntityTableTableManager(
i10.$$RemoteAlbumEntityTableTableManager(_db, _db.remoteAlbumEntity); _db,
i11.$$RemoteAlbumAssetEntityTableTableManager get remoteAlbumAssetEntity => _db.remoteAssetMetadataEntity,
i11.$$RemoteAlbumAssetEntityTableTableManager( );
i10.$$RemoteExifEntityTableTableManager get remoteExifEntity =>
i10.$$RemoteExifEntityTableTableManager(_db, _db.remoteExifEntity);
i11.$$RemoteAlbumEntityTableTableManager get remoteAlbumEntity =>
i11.$$RemoteAlbumEntityTableTableManager(_db, _db.remoteAlbumEntity);
i12.$$RemoteAlbumAssetEntityTableTableManager get remoteAlbumAssetEntity =>
i12.$$RemoteAlbumAssetEntityTableTableManager(
_db, _db,
_db.remoteAlbumAssetEntity, _db.remoteAlbumAssetEntity,
); );
i12.$$RemoteAlbumUserEntityTableTableManager get remoteAlbumUserEntity => i12 i13.$$RemoteAlbumUserEntityTableTableManager get remoteAlbumUserEntity => i13
.$$RemoteAlbumUserEntityTableTableManager(_db, _db.remoteAlbumUserEntity); .$$RemoteAlbumUserEntityTableTableManager(_db, _db.remoteAlbumUserEntity);
i13.$$MemoryEntityTableTableManager get memoryEntity => i14.$$MemoryEntityTableTableManager get memoryEntity =>
i13.$$MemoryEntityTableTableManager(_db, _db.memoryEntity); i14.$$MemoryEntityTableTableManager(_db, _db.memoryEntity);
i14.$$MemoryAssetEntityTableTableManager get memoryAssetEntity => i15.$$MemoryAssetEntityTableTableManager get memoryAssetEntity =>
i14.$$MemoryAssetEntityTableTableManager(_db, _db.memoryAssetEntity); i15.$$MemoryAssetEntityTableTableManager(_db, _db.memoryAssetEntity);
i15.$$PersonEntityTableTableManager get personEntity => i16.$$PersonEntityTableTableManager get personEntity =>
i15.$$PersonEntityTableTableManager(_db, _db.personEntity); i16.$$PersonEntityTableTableManager(_db, _db.personEntity);
i16.$$AssetFaceEntityTableTableManager get assetFaceEntity => i17.$$AssetFaceEntityTableTableManager get assetFaceEntity =>
i16.$$AssetFaceEntityTableTableManager(_db, _db.assetFaceEntity); i17.$$AssetFaceEntityTableTableManager(_db, _db.assetFaceEntity);
i17.$$StoreEntityTableTableManager get storeEntity => i18.$$StoreEntityTableTableManager get storeEntity =>
i17.$$StoreEntityTableTableManager(_db, _db.storeEntity); i18.$$StoreEntityTableTableManager(_db, _db.storeEntity);
} }

35
mobile/lib/infrastructure/repositories/db.repository.steps.dart generated
View File

@ -3447,12 +3447,14 @@ final class Schema9 extends i0.VersionedSchema {
localAlbumEntity, localAlbumEntity,
localAlbumAssetEntity, localAlbumAssetEntity,
idxLocalAssetChecksum, idxLocalAssetChecksum,
idxLocalAssetCloudId,
idxRemoteAssetOwnerChecksum, idxRemoteAssetOwnerChecksum,
uQRemoteAssetsOwnerChecksum, uQRemoteAssetsOwnerChecksum,
uQRemoteAssetsOwnerLibraryChecksum, uQRemoteAssetsOwnerLibraryChecksum,
idxRemoteAssetChecksum, idxRemoteAssetChecksum,
userMetadataEntity, userMetadataEntity,
partnerEntity, partnerEntity,
remoteAssetMetadataEntity,
remoteExifEntity, remoteExifEntity,
remoteAlbumEntity, remoteAlbumEntity,
remoteAlbumAssetEntity, remoteAlbumAssetEntity,
@ -3581,6 +3583,10 @@ final class Schema9 extends i0.VersionedSchema {
'idx_local_asset_checksum', 'idx_local_asset_checksum',
'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)', 'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
); );
final i1.Index idxLocalAssetCloudId = i1.Index(
'idx_local_asset_cloud_id',
'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (cloud_id)',
);
final i1.Index idxRemoteAssetOwnerChecksum = i1.Index( final i1.Index idxRemoteAssetOwnerChecksum = i1.Index(
'idx_remote_asset_owner_checksum', 'idx_remote_asset_owner_checksum',
'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)', 'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
@ -3619,6 +3625,17 @@ final class Schema9 extends i0.VersionedSchema {
), ),
alias: null, alias: null,
); );
late final Shape20 remoteAssetMetadataEntity = Shape20(
source: i0.VersionedTable(
entityName: 'remote_asset_metadata_entity',
withoutRowId: true,
isStrict: true,
tableConstraints: ['PRIMARY KEY(asset_id, "key")'],
columns: [_column_36, _column_91, _column_27],
attachedDatabase: database,
),
alias: null,
);
late final Shape8 remoteExifEntity = Shape8( late final Shape8 remoteExifEntity = Shape8(
source: i0.VersionedTable( source: i0.VersionedTable(
entityName: 'remote_exif_entity', entityName: 'remote_exif_entity',
@ -3827,6 +3844,24 @@ i1.GeneratedColumn<String> _column_90(String aliasedName) =>
true, true,
type: i1.DriftSqlType.string, type: i1.DriftSqlType.string,
); );
class Shape20 extends i0.VersionedTable {
Shape20({required super.source, required super.alias}) : super.aliased();
i1.GeneratedColumn<String> get assetId =>
columnsByName['asset_id']! as i1.GeneratedColumn<String>;
i1.GeneratedColumn<String> get key =>
columnsByName['key']! as i1.GeneratedColumn<String>;
i1.GeneratedColumn<i2.Uint8List> get value =>
columnsByName['value']! as i1.GeneratedColumn<i2.Uint8List>;
}
i1.GeneratedColumn<String> _column_91(String aliasedName) =>
i1.GeneratedColumn<String>(
'key',
aliasedName,
false,
type: i1.DriftSqlType.string,
);
i0.MigrationStepWithVersion migrationSteps({ i0.MigrationStepWithVersion migrationSteps({
required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2, required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3, required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,

3
mobile/lib/infrastructure/repositories/sync_api.repository.dart
View File

@ -40,6 +40,7 @@ class SyncApiRepository {
SyncRequestType.usersV1, SyncRequestType.usersV1,
SyncRequestType.assetsV1, SyncRequestType.assetsV1,
SyncRequestType.assetExifsV1, SyncRequestType.assetExifsV1,
SyncRequestType.assetMetadataV1,
SyncRequestType.partnersV1, SyncRequestType.partnersV1,
SyncRequestType.partnerAssetsV1, SyncRequestType.partnerAssetsV1,
SyncRequestType.partnerAssetExifsV1, SyncRequestType.partnerAssetExifsV1,
@ -137,6 +138,8 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
SyncEntityType.assetV1: SyncAssetV1.fromJson, SyncEntityType.assetV1: SyncAssetV1.fromJson,
SyncEntityType.assetDeleteV1: SyncAssetDeleteV1.fromJson, SyncEntityType.assetDeleteV1: SyncAssetDeleteV1.fromJson,
SyncEntityType.assetExifV1: SyncAssetExifV1.fromJson, SyncEntityType.assetExifV1: SyncAssetExifV1.fromJson,
SyncEntityType.assetMetadataV1: SyncAssetMetadataV1.fromJson,
SyncEntityType.assetMetadataDeleteV1: SyncAssetMetadataDeleteV1.fromJson,
SyncEntityType.partnerAssetV1: SyncAssetV1.fromJson, SyncEntityType.partnerAssetV1: SyncAssetV1.fromJson,
SyncEntityType.partnerAssetBackfillV1: SyncAssetV1.fromJson, SyncEntityType.partnerAssetBackfillV1: SyncAssetV1.fromJson,
SyncEntityType.partnerAssetDeleteV1: SyncAssetDeleteV1.fromJson, SyncEntityType.partnerAssetDeleteV1: SyncAssetDeleteV1.fromJson,

51
mobile/lib/infrastructure/repositories/sync_stream.repository.dart
View File

@ -2,6 +2,7 @@ import 'dart:convert';
import 'package:drift/drift.dart'; import 'package:drift/drift.dart';
import 'package:immich_mobile/domain/models/album/album.model.dart'; import 'package:immich_mobile/domain/models/album/album.model.dart';
import 'package:immich_mobile/domain/models/asset/asset_metadata.model.dart';
import 'package:immich_mobile/domain/models/asset/base_asset.model.dart'; import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
import 'package:immich_mobile/domain/models/memory.model.dart'; import 'package:immich_mobile/domain/models/memory.model.dart';
import 'package:immich_mobile/domain/models/user_metadata.model.dart'; import 'package:immich_mobile/domain/models/user_metadata.model.dart';
@ -15,13 +16,14 @@ import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.
import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart'; import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart';
import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart'; import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart';
import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'; import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
import 'package:immich_mobile/infrastructure/entities/remote_asset_metadata.entity.drift.dart';
import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart'; import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart';
import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart'; import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart'; import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart';
import 'package:immich_mobile/infrastructure/repositories/db.repository.dart'; import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
import 'package:logging/logging.dart'; import 'package:logging/logging.dart';
import 'package:openapi/api.dart' as api show AssetVisibility, AlbumUserRole, UserMetadataKey; import 'package:openapi/api.dart' as api show AssetVisibility, AlbumUserRole, UserMetadataKey, AssetMetadataKey;
import 'package:openapi/api.dart' hide AssetVisibility, AlbumUserRole, UserMetadataKey; import 'package:openapi/api.dart' hide AssetVisibility, AlbumUserRole, UserMetadataKey, AssetMetadataKey;
class SyncStreamRepository extends DriftDatabaseRepository { class SyncStreamRepository extends DriftDatabaseRepository {
final Logger _logger = Logger('DriftSyncStreamRepository'); final Logger _logger = Logger('DriftSyncStreamRepository');
@ -178,6 +180,44 @@ class SyncStreamRepository extends DriftDatabaseRepository {
} }
} }
Future<void> deleteAssetsMetadataV1(Iterable<SyncAssetMetadataDeleteV1> data) async {
try {
await _db.batch((batch) {
for (final metadata in data) {
batch.deleteWhere(
_db.remoteAssetMetadataEntity,
(row) => row.assetId.equals(metadata.assetId) & row.key.equals(metadata.key.value),
);
}
});
} catch (error, stack) {
_logger.severe('Error: deleteAssetsMetadataV1', error, stack);
rethrow;
}
}
Future<void> updateAssetsMetadataV1(Iterable<SyncAssetMetadataV1> data) async {
try {
await _db.batch((batch) {
for (final metadata in data) {
final companion = RemoteAssetMetadataEntityCompanion(
key: Value(metadata.key.toRemoteAssetMetadataKey()),
value: Value(jsonDecode(metadata.value as String)),
);
batch.insert(
_db.remoteAssetMetadataEntity,
companion.copyWith(assetId: Value(metadata.assetId)),
onConflict: DoUpdate((_) => companion),
);
}
});
} catch (error, stack) {
_logger.severe('Error: updateAssetsMetadataV1', error, stack);
rethrow;
}
}
Future<void> deleteAlbumsV1(Iterable<SyncAlbumDeleteV1> data) async { Future<void> deleteAlbumsV1(Iterable<SyncAlbumDeleteV1> data) async {
try { try {
await _db.remoteAlbumEntity.deleteWhere((row) => row.id.isIn(data.map((e) => e.albumId))); await _db.remoteAlbumEntity.deleteWhere((row) => row.id.isIn(data.map((e) => e.albumId)));
@ -573,3 +613,10 @@ extension on String {
} }
} }
} }
extension on api.AssetMetadataKey {
RemoteAssetMetadataKey toRemoteAssetMetadataKey() => switch (this) {
api.AssetMetadataKey.mobileApp => RemoteAssetMetadataKey.mobileApp,
_ => throw Exception('Unknown AssetMetadataKey value: $this'),
};
}

4
mobile/lib/services/upload.service.dart
View File

@ -6,8 +6,8 @@ import 'package:background_downloader/background_downloader.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/constants/constants.dart'; import 'package:immich_mobile/constants/constants.dart';
import 'package:immich_mobile/domain/models/asset/asset_metadata.model.dart';
import 'package:immich_mobile/domain/models/asset/base_asset.model.dart'; import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
import 'package:immich_mobile/domain/models/asset/metadata.model.dart';
import 'package:immich_mobile/domain/models/store.model.dart'; import 'package:immich_mobile/domain/models/store.model.dart';
import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/entities/store.entity.dart';
import 'package:immich_mobile/infrastructure/repositories/backup.repository.dart'; import 'package:immich_mobile/infrastructure/repositories/backup.repository.dart';
@ -353,7 +353,7 @@ class UploadService {
'fileModifiedAt': fileModifiedAt.toUtc().toIso8601String(), 'fileModifiedAt': fileModifiedAt.toUtc().toIso8601String(),
'isFavorite': isFavorite?.toString() ?? 'false', 'isFavorite': isFavorite?.toString() ?? 'false',
'duration': '0', 'duration': '0',
'metadata': AssetMetadata(cloudId: cloudId).toJson(), 'metadata': RemoteAssetMetadata(cloudId: cloudId).toJson(),
if (fields != null) ...fields, if (fields != null) ...fields,
}; };

227
mobile/test/drift/main/generated/schema_v9.dart generated
View File

@ -2941,6 +2941,225 @@ class PartnerEntityCompanion extends UpdateCompanion<PartnerEntityData> {
} }
} }
class RemoteAssetMetadataEntity extends Table
with TableInfo<RemoteAssetMetadataEntity, RemoteAssetMetadataEntityData> {
@override
final GeneratedDatabase attachedDatabase;
final String? _alias;
RemoteAssetMetadataEntity(this.attachedDatabase, [this._alias]);
late final GeneratedColumn<String> assetId = GeneratedColumn<String>(
'asset_id',
aliasedName,
false,
type: DriftSqlType.string,
requiredDuringInsert: true,
defaultConstraints: GeneratedColumn.constraintIsAlways(
'REFERENCES remote_asset_entity (id) ON DELETE CASCADE',
),
);
late final GeneratedColumn<String> key = GeneratedColumn<String>(
'key',
aliasedName,
false,
type: DriftSqlType.string,
requiredDuringInsert: true,
);
late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
'value',
aliasedName,
false,
type: DriftSqlType.blob,
requiredDuringInsert: true,
);
@override
List<GeneratedColumn> get $columns => [assetId, key, value];
@override
String get aliasedName => _alias ?? actualTableName;
@override
String get actualTableName => $name;
static const String $name = 'remote_asset_metadata_entity';
@override
Set<GeneratedColumn> get $primaryKey => {assetId, key};
@override
RemoteAssetMetadataEntityData map(
Map<String, dynamic> data, {
String? tablePrefix,
}) {
final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
return RemoteAssetMetadataEntityData(
assetId: attachedDatabase.typeMapping.read(
DriftSqlType.string,
data['${effectivePrefix}asset_id'],
)!,
key: attachedDatabase.typeMapping.read(
DriftSqlType.string,
data['${effectivePrefix}key'],
)!,
value: attachedDatabase.typeMapping.read(
DriftSqlType.blob,
data['${effectivePrefix}value'],
)!,
);
}
@override
RemoteAssetMetadataEntity createAlias(String alias) {
return RemoteAssetMetadataEntity(attachedDatabase, alias);
}
@override
bool get withoutRowId => true;
@override
bool get isStrict => true;
}
class RemoteAssetMetadataEntityData extends DataClass
implements Insertable<RemoteAssetMetadataEntityData> {
final String assetId;
final String key;
final Uint8List value;
const RemoteAssetMetadataEntityData({
required this.assetId,
required this.key,
required this.value,
});
@override
Map<String, Expression> toColumns(bool nullToAbsent) {
final map = <String, Expression>{};
map['asset_id'] = Variable<String>(assetId);
map['key'] = Variable<String>(key);
map['value'] = Variable<Uint8List>(value);
return map;
}
factory RemoteAssetMetadataEntityData.fromJson(
Map<String, dynamic> json, {
ValueSerializer? serializer,
}) {
serializer ??= driftRuntimeOptions.defaultSerializer;
return RemoteAssetMetadataEntityData(
assetId: serializer.fromJson<String>(json['assetId']),
key: serializer.fromJson<String>(json['key']),
value: serializer.fromJson<Uint8List>(json['value']),
);
}
@override
Map<String, dynamic> toJson({ValueSerializer? serializer}) {
serializer ??= driftRuntimeOptions.defaultSerializer;
return <String, dynamic>{
'assetId': serializer.toJson<String>(assetId),
'key': serializer.toJson<String>(key),
'value': serializer.toJson<Uint8List>(value),
};
}
RemoteAssetMetadataEntityData copyWith({
String? assetId,
String? key,
Uint8List? value,
}) => RemoteAssetMetadataEntityData(
assetId: assetId ?? this.assetId,
key: key ?? this.key,
value: value ?? this.value,
);
RemoteAssetMetadataEntityData copyWithCompanion(
RemoteAssetMetadataEntityCompanion data,
) {
return RemoteAssetMetadataEntityData(
assetId: data.assetId.present ? data.assetId.value : this.assetId,
key: data.key.present ? data.key.value : this.key,
value: data.value.present ? data.value.value : this.value,
);
}
@override
String toString() {
return (StringBuffer('RemoteAssetMetadataEntityData(')
..write('assetId: $assetId, ')
..write('key: $key, ')
..write('value: $value')
..write(')'))
.toString();
}
@override
int get hashCode => Object.hash(assetId, key, $driftBlobEquality.hash(value));
@override
bool operator ==(Object other) =>
identical(this, other) ||
(other is RemoteAssetMetadataEntityData &&
other.assetId == this.assetId &&
other.key == this.key &&
$driftBlobEquality.equals(other.value, this.value));
}
class RemoteAssetMetadataEntityCompanion
extends UpdateCompanion<RemoteAssetMetadataEntityData> {
final Value<String> assetId;
final Value<String> key;
final Value<Uint8List> value;
const RemoteAssetMetadataEntityCompanion({
this.assetId = const Value.absent(),
this.key = const Value.absent(),
this.value = const Value.absent(),
});
RemoteAssetMetadataEntityCompanion.insert({
required String assetId,
required String key,
required Uint8List value,
}) : assetId = Value(assetId),
key = Value(key),
value = Value(value);
static Insertable<RemoteAssetMetadataEntityData> custom({
Expression<String>? assetId,
Expression<String>? key,
Expression<Uint8List>? value,
}) {
return RawValuesInsertable({
if (assetId != null) 'asset_id': assetId,
if (key != null) 'key': key,
if (value != null) 'value': value,
});
}
RemoteAssetMetadataEntityCompanion copyWith({
Value<String>? assetId,
Value<String>? key,
Value<Uint8List>? value,
}) {
return RemoteAssetMetadataEntityCompanion(
assetId: assetId ?? this.assetId,
key: key ?? this.key,
value: value ?? this.value,
);
}
@override
Map<String, Expression> toColumns(bool nullToAbsent) {
final map = <String, Expression>{};
if (assetId.present) {
map['asset_id'] = Variable<String>(assetId.value);
}
if (key.present) {
map['key'] = Variable<String>(key.value);
}
if (value.present) {
map['value'] = Variable<Uint8List>(value.value);
}
return map;
}
@override
String toString() {
return (StringBuffer('RemoteAssetMetadataEntityCompanion(')
..write('assetId: $assetId, ')
..write('key: $key, ')
..write('value: $value')
..write(')'))
.toString();
}
}
class RemoteExifEntity extends Table class RemoteExifEntity extends Table
with TableInfo<RemoteExifEntity, RemoteExifEntityData> { with TableInfo<RemoteExifEntity, RemoteExifEntityData> {
@override @override
@ -6629,6 +6848,10 @@ class DatabaseAtV9 extends GeneratedDatabase {
'idx_local_asset_checksum', 'idx_local_asset_checksum',
'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)', 'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
); );
late final Index idxLocalAssetCloudId = Index(
'idx_local_asset_cloud_id',
'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (cloud_id)',
);
late final Index idxRemoteAssetOwnerChecksum = Index( late final Index idxRemoteAssetOwnerChecksum = Index(
'idx_remote_asset_owner_checksum', 'idx_remote_asset_owner_checksum',
'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)', 'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
@ -6647,6 +6870,8 @@ class DatabaseAtV9 extends GeneratedDatabase {
); );
late final UserMetadataEntity userMetadataEntity = UserMetadataEntity(this); late final UserMetadataEntity userMetadataEntity = UserMetadataEntity(this);
late final PartnerEntity partnerEntity = PartnerEntity(this); late final PartnerEntity partnerEntity = PartnerEntity(this);
late final RemoteAssetMetadataEntity remoteAssetMetadataEntity =
RemoteAssetMetadataEntity(this);
late final RemoteExifEntity remoteExifEntity = RemoteExifEntity(this); late final RemoteExifEntity remoteExifEntity = RemoteExifEntity(this);
late final RemoteAlbumEntity remoteAlbumEntity = RemoteAlbumEntity(this); late final RemoteAlbumEntity remoteAlbumEntity = RemoteAlbumEntity(this);
late final RemoteAlbumAssetEntity remoteAlbumAssetEntity = late final RemoteAlbumAssetEntity remoteAlbumAssetEntity =
@ -6674,12 +6899,14 @@ class DatabaseAtV9 extends GeneratedDatabase {
localAlbumEntity, localAlbumEntity,
localAlbumAssetEntity, localAlbumAssetEntity,
idxLocalAssetChecksum, idxLocalAssetChecksum,
idxLocalAssetCloudId,
idxRemoteAssetOwnerChecksum, idxRemoteAssetOwnerChecksum,
uQRemoteAssetsOwnerChecksum, uQRemoteAssetsOwnerChecksum,
uQRemoteAssetsOwnerLibraryChecksum, uQRemoteAssetsOwnerLibraryChecksum,
idxRemoteAssetChecksum, idxRemoteAssetChecksum,
userMetadataEntity, userMetadataEntity,
partnerEntity, partnerEntity,
remoteAssetMetadataEntity,
remoteExifEntity, remoteExifEntity,
remoteAlbumEntity, remoteAlbumEntity,
remoteAlbumAssetEntity, remoteAlbumAssetEntity,