diff --git a/mobile/drift_schemas/main/drift_schema_v25.json b/mobile/drift_schemas/main/drift_schema_v25.json index 1e2bf92d50..bef3379d35 100644 --- a/mobile/drift_schemas/main/drift_schema_v25.json +++ b/mobile/drift_schemas/main/drift_schema_v25.json @@ -2924,7 +2924,7 @@ "dsl_features": [] }, { - "name": "text", + "name": "recognized_text", "getter_name": "recognizedText", "moor_type": "string", "nullable": false, @@ -3392,7 +3392,7 @@ "sql": [ { "dialect": "sqlite", - "sql": "CREATE TABLE IF NOT EXISTS \"asset_ocr_entity\" (\"id\" TEXT NOT NULL, \"asset_id\" TEXT NOT NULL REFERENCES remote_asset_entity (id) ON DELETE CASCADE, \"x1\" REAL NOT NULL, \"y1\" REAL NOT NULL, \"x2\" REAL NOT NULL, \"y2\" REAL NOT NULL, \"x3\" REAL NOT NULL, \"y3\" REAL NOT NULL, \"x4\" REAL NOT NULL, \"y4\" REAL NOT NULL, \"box_score\" REAL NOT NULL, \"text_score\" REAL NOT NULL, \"text\" TEXT NOT NULL, \"is_visible\" INTEGER NOT NULL DEFAULT 1 CHECK (\"is_visible\" IN (0, 1)), PRIMARY KEY (\"id\")) WITHOUT ROWID, STRICT;" + "sql": "CREATE TABLE IF NOT EXISTS \"asset_ocr_entity\" (\"id\" TEXT NOT NULL, \"asset_id\" TEXT NOT NULL REFERENCES remote_asset_entity (id) ON DELETE CASCADE, \"x1\" REAL NOT NULL, \"y1\" REAL NOT NULL, \"x2\" REAL NOT NULL, \"y2\" REAL NOT NULL, \"x3\" REAL NOT NULL, \"y3\" REAL NOT NULL, \"x4\" REAL NOT NULL, \"y4\" REAL NOT NULL, \"box_score\" REAL NOT NULL, \"text_score\" REAL NOT NULL, \"recognized_text\" TEXT NOT NULL, \"is_visible\" INTEGER NOT NULL DEFAULT 1 CHECK (\"is_visible\" IN (0, 1)), PRIMARY KEY (\"id\")) WITHOUT ROWID, STRICT;" } ] }, diff --git a/mobile/lib/infrastructure/entities/asset_ocr.entity.dart b/mobile/lib/infrastructure/entities/asset_ocr.entity.dart index 0abfb91354..d7f5ecc75e 100644 --- a/mobile/lib/infrastructure/entities/asset_ocr.entity.dart +++ b/mobile/lib/infrastructure/entities/asset_ocr.entity.dart @@ -24,7 +24,7 @@ class AssetOcrEntity extends Table with DriftDefaultsMixin { RealColumn get boxScore => real()(); RealColumn get textScore => real()(); - TextColumn get recognizedText => text().named('text')(); + TextColumn get recognizedText => text()(); BoolColumn get isVisible => boolean().withDefault(const Constant(true))(); diff --git a/mobile/lib/infrastructure/repositories/db.repository.steps.dart b/mobile/lib/infrastructure/repositories/db.repository.steps.dart index 5dbe026093..19cc7d921a 100644 --- a/mobile/lib/infrastructure/repositories/db.repository.steps.dart +++ b/mobile/lib/infrastructure/repositories/db.repository.steps.dart @@ -12958,8 +12958,8 @@ class Shape49 extends i0.VersionedTable { columnsByName['box_score']! as i1.GeneratedColumn; i1.GeneratedColumn get textScore => columnsByName['text_score']! as i1.GeneratedColumn; - i1.GeneratedColumn get text => - columnsByName['text']! as i1.GeneratedColumn; + i1.GeneratedColumn get recognizedText => + columnsByName['recognized_text']! as i1.GeneratedColumn; i1.GeneratedColumn get isVisible => columnsByName['is_visible']! as i1.GeneratedColumn; } @@ -13046,7 +13046,7 @@ i1.GeneratedColumn _column_219(String aliasedName) => ); i1.GeneratedColumn _column_220(String aliasedName) => i1.GeneratedColumn( - 'text', + 'recognized_text', aliasedName, false, type: i1.DriftSqlType.string, diff --git a/mobile/lib/providers/infrastructure/ocr.provider.dart b/mobile/lib/providers/infrastructure/ocr.provider.dart index e77cf9c5b9..b1ab710112 100644 --- a/mobile/lib/providers/infrastructure/ocr.provider.dart +++ b/mobile/lib/providers/infrastructure/ocr.provider.dart @@ -1,8 +1,8 @@ +import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/domain/models/ocr.model.dart'; import 'package:immich_mobile/domain/services/ocr.service.dart'; import 'package:immich_mobile/infrastructure/repositories/ocr.repository.dart'; import 'package:immich_mobile/providers/infrastructure/db.provider.dart'; -import 'package:riverpod_annotation/riverpod_annotation.dart'; final ocrRepositoryProvider = Provider((ref) => OcrRepository(ref.watch(driftProvider))); diff --git a/mobile/test/drift/main/generated/schema_v25.dart b/mobile/test/drift/main/generated/schema_v25.dart index c22c9a1070..54f092d2d5 100644 --- a/mobile/test/drift/main/generated/schema_v25.dart +++ b/mobile/test/drift/main/generated/schema_v25.dart @@ -8895,8 +8895,8 @@ class AssetOcrEntity extends Table requiredDuringInsert: true, $customConstraints: 'NOT NULL', ); - late final GeneratedColumn text = GeneratedColumn( - 'text', + late final GeneratedColumn recognizedText = GeneratedColumn( + 'recognized_text', aliasedName, false, type: DriftSqlType.string, @@ -8926,7 +8926,7 @@ class AssetOcrEntity extends Table y4, boxScore, textScore, - text, + recognizedText, isVisible, ]; @override @@ -8988,9 +8988,9 @@ class AssetOcrEntity extends Table DriftSqlType.double, data['${effectivePrefix}text_score'], )!, - text: attachedDatabase.typeMapping.read( + recognizedText: attachedDatabase.typeMapping.read( DriftSqlType.string, - data['${effectivePrefix}text'], + data['${effectivePrefix}recognized_text'], )!, isVisible: attachedDatabase.typeMapping.read( DriftSqlType.int, @@ -9028,7 +9028,7 @@ class AssetOcrEntityData extends DataClass final double y4; final double boxScore; final double textScore; - final String text; + final String recognizedText; final int isVisible; const AssetOcrEntityData({ required this.id, @@ -9043,7 +9043,7 @@ class AssetOcrEntityData extends DataClass required this.y4, required this.boxScore, required this.textScore, - required this.text, + required this.recognizedText, required this.isVisible, }); @override @@ -9061,7 +9061,7 @@ class AssetOcrEntityData extends DataClass map['y4'] = Variable(y4); map['box_score'] = Variable(boxScore); map['text_score'] = Variable(textScore); - map['text'] = Variable(text); + map['recognized_text'] = Variable(recognizedText); map['is_visible'] = Variable(isVisible); return map; } @@ -9084,7 +9084,7 @@ class AssetOcrEntityData extends DataClass y4: serializer.fromJson(json['y4']), boxScore: serializer.fromJson(json['boxScore']), textScore: serializer.fromJson(json['textScore']), - text: serializer.fromJson(json['text']), + recognizedText: serializer.fromJson(json['recognizedText']), isVisible: serializer.fromJson(json['isVisible']), ); } @@ -9104,7 +9104,7 @@ class AssetOcrEntityData extends DataClass 'y4': serializer.toJson(y4), 'boxScore': serializer.toJson(boxScore), 'textScore': serializer.toJson(textScore), - 'text': serializer.toJson(text), + 'recognizedText': serializer.toJson(recognizedText), 'isVisible': serializer.toJson(isVisible), }; } @@ -9122,7 +9122,7 @@ class AssetOcrEntityData extends DataClass double? y4, double? boxScore, double? textScore, - String? text, + String? recognizedText, int? isVisible, }) => AssetOcrEntityData( id: id ?? this.id, @@ -9137,7 +9137,7 @@ class AssetOcrEntityData extends DataClass y4: y4 ?? this.y4, boxScore: boxScore ?? this.boxScore, textScore: textScore ?? this.textScore, - text: text ?? this.text, + recognizedText: recognizedText ?? this.recognizedText, isVisible: isVisible ?? this.isVisible, ); AssetOcrEntityData copyWithCompanion(AssetOcrEntityCompanion data) { @@ -9154,7 +9154,9 @@ class AssetOcrEntityData extends DataClass y4: data.y4.present ? data.y4.value : this.y4, boxScore: data.boxScore.present ? data.boxScore.value : this.boxScore, textScore: data.textScore.present ? data.textScore.value : this.textScore, - text: data.text.present ? data.text.value : this.text, + recognizedText: data.recognizedText.present + ? data.recognizedText.value + : this.recognizedText, isVisible: data.isVisible.present ? data.isVisible.value : this.isVisible, ); } @@ -9174,7 +9176,7 @@ class AssetOcrEntityData extends DataClass ..write('y4: $y4, ') ..write('boxScore: $boxScore, ') ..write('textScore: $textScore, ') - ..write('text: $text, ') + ..write('recognizedText: $recognizedText, ') ..write('isVisible: $isVisible') ..write(')')) .toString(); @@ -9194,7 +9196,7 @@ class AssetOcrEntityData extends DataClass y4, boxScore, textScore, - text, + recognizedText, isVisible, ); @override @@ -9213,7 +9215,7 @@ class AssetOcrEntityData extends DataClass other.y4 == this.y4 && other.boxScore == this.boxScore && other.textScore == this.textScore && - other.text == this.text && + other.recognizedText == this.recognizedText && other.isVisible == this.isVisible); } @@ -9230,7 +9232,7 @@ class AssetOcrEntityCompanion extends UpdateCompanion { final Value y4; final Value boxScore; final Value textScore; - final Value text; + final Value recognizedText; final Value isVisible; const AssetOcrEntityCompanion({ this.id = const Value.absent(), @@ -9245,7 +9247,7 @@ class AssetOcrEntityCompanion extends UpdateCompanion { this.y4 = const Value.absent(), this.boxScore = const Value.absent(), this.textScore = const Value.absent(), - this.text = const Value.absent(), + this.recognizedText = const Value.absent(), this.isVisible = const Value.absent(), }); AssetOcrEntityCompanion.insert({ @@ -9261,7 +9263,7 @@ class AssetOcrEntityCompanion extends UpdateCompanion { required double y4, required double boxScore, required double textScore, - required String text, + required String recognizedText, this.isVisible = const Value.absent(), }) : id = Value(id), assetId = Value(assetId), @@ -9275,7 +9277,7 @@ class AssetOcrEntityCompanion extends UpdateCompanion { y4 = Value(y4), boxScore = Value(boxScore), textScore = Value(textScore), - text = Value(text); + recognizedText = Value(recognizedText); static Insertable custom({ Expression? id, Expression? assetId, @@ -9289,7 +9291,7 @@ class AssetOcrEntityCompanion extends UpdateCompanion { Expression? y4, Expression? boxScore, Expression? textScore, - Expression? text, + Expression? recognizedText, Expression? isVisible, }) { return RawValuesInsertable({ @@ -9305,7 +9307,7 @@ class AssetOcrEntityCompanion extends UpdateCompanion { if (y4 != null) 'y4': y4, if (boxScore != null) 'box_score': boxScore, if (textScore != null) 'text_score': textScore, - if (text != null) 'text': text, + if (recognizedText != null) 'recognized_text': recognizedText, if (isVisible != null) 'is_visible': isVisible, }); } @@ -9323,7 +9325,7 @@ class AssetOcrEntityCompanion extends UpdateCompanion { Value? y4, Value? boxScore, Value? textScore, - Value? text, + Value? recognizedText, Value? isVisible, }) { return AssetOcrEntityCompanion( @@ -9339,7 +9341,7 @@ class AssetOcrEntityCompanion extends UpdateCompanion { y4: y4 ?? this.y4, boxScore: boxScore ?? this.boxScore, textScore: textScore ?? this.textScore, - text: text ?? this.text, + recognizedText: recognizedText ?? this.recognizedText, isVisible: isVisible ?? this.isVisible, ); } @@ -9383,8 +9385,8 @@ class AssetOcrEntityCompanion extends UpdateCompanion { if (textScore.present) { map['text_score'] = Variable(textScore.value); } - if (text.present) { - map['text'] = Variable(text.value); + if (recognizedText.present) { + map['recognized_text'] = Variable(recognizedText.value); } if (isVisible.present) { map['is_visible'] = Variable(isVisible.value); @@ -9407,7 +9409,7 @@ class AssetOcrEntityCompanion extends UpdateCompanion { ..write('y4: $y4, ') ..write('boxScore: $boxScore, ') ..write('textScore: $textScore, ') - ..write('text: $text, ') + ..write('recognizedText: $recognizedText, ') ..write('isVisible: $isVisible') ..write(')')) .toString();