From 0c985ec1e88048717cf34ab3216151fa55ea5f0c Mon Sep 17 00:00:00 2001 From: Yaros Date: Mon, 13 Apr 2026 17:28:05 +0200 Subject: [PATCH] chore: remove drift prefix naming --- mobile/lib/domain/models/ocr.model.dart | 10 +++++----- mobile/lib/domain/services/ocr.service.dart | 8 ++++---- .../infrastructure/repositories/ocr.repository.dart | 10 +++++----- .../widgets/asset_viewer/ocr_overlay.widget.dart | 6 +++--- .../asset_viewer/viewer_top_app_bar.widget.dart | 2 +- mobile/lib/providers/infrastructure/ocr.provider.dart | 10 ++++------ 6 files changed, 22 insertions(+), 24 deletions(-) diff --git a/mobile/lib/domain/models/ocr.model.dart b/mobile/lib/domain/models/ocr.model.dart index aa2c9a97cf..648dcafd4c 100644 --- a/mobile/lib/domain/models/ocr.model.dart +++ b/mobile/lib/domain/models/ocr.model.dart @@ -1,4 +1,4 @@ -class DriftOcr { +class Ocr { final String id; final String assetId; final double x1; @@ -14,7 +14,7 @@ class DriftOcr { final String text; final bool isVisible; - const DriftOcr({ + const Ocr({ required this.id, required this.assetId, required this.x1, @@ -31,7 +31,7 @@ class DriftOcr { required this.isVisible, }); - DriftOcr copyWith({ + Ocr copyWith({ String? id, String? assetId, double? x1, @@ -47,7 +47,7 @@ class DriftOcr { String? text, bool? isVisible, }) { - return DriftOcr( + return Ocr( id: id ?? this.id, assetId: assetId ?? this.assetId, x1: x1 ?? this.x1, @@ -89,7 +89,7 @@ class DriftOcr { bool operator ==(Object other) { if (identical(this, other)) return true; - return other is DriftOcr && + return other is Ocr && other.id == id && other.assetId == assetId && other.x1 == x1 && diff --git a/mobile/lib/domain/services/ocr.service.dart b/mobile/lib/domain/services/ocr.service.dart index 93eb3cca1a..2786b1ce22 100644 --- a/mobile/lib/domain/services/ocr.service.dart +++ b/mobile/lib/domain/services/ocr.service.dart @@ -1,12 +1,12 @@ import 'package:immich_mobile/domain/models/ocr.model.dart'; import 'package:immich_mobile/infrastructure/repositories/ocr.repository.dart'; -class DriftOcrService { - final DriftOcrRepository _repository; +class OcrService { + final OcrRepository _repository; - const DriftOcrService(this._repository); + const OcrService(this._repository); - Future?> get(String assetId) { + Future?> get(String assetId) { return _repository.get(assetId); } } diff --git a/mobile/lib/infrastructure/repositories/ocr.repository.dart b/mobile/lib/infrastructure/repositories/ocr.repository.dart index 4d15f9e7cf..018d016ab3 100644 --- a/mobile/lib/infrastructure/repositories/ocr.repository.dart +++ b/mobile/lib/infrastructure/repositories/ocr.repository.dart @@ -2,11 +2,11 @@ import 'package:immich_mobile/domain/models/ocr.model.dart'; import 'package:immich_mobile/infrastructure/entities/asset_ocr.entity.drift.dart'; import 'package:immich_mobile/infrastructure/repositories/db.repository.dart'; -class DriftOcrRepository extends DriftDatabaseRepository { +class OcrRepository extends DriftDatabaseRepository { final Drift _db; - const DriftOcrRepository(this._db) : super(_db); + const OcrRepository(this._db) : super(_db); - Future?> get(String assetId) async { + Future?> get(String assetId) async { final query = _db.select(_db.assetOcrEntity)..where((row) => row.assetId.equals(assetId)); final result = await query.get(); @@ -15,8 +15,8 @@ class DriftOcrRepository extends DriftDatabaseRepository { } extension on AssetOcrEntityData { - DriftOcr toDto() { - return DriftOcr( + Ocr toDto() { + return Ocr( id: id, assetId: assetId, x1: x1, diff --git a/mobile/lib/presentation/widgets/asset_viewer/ocr_overlay.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/ocr_overlay.widget.dart index 0557a31ab3..36b1005cab 100644 --- a/mobile/lib/presentation/widgets/asset_viewer/ocr_overlay.widget.dart +++ b/mobile/lib/presentation/widgets/asset_viewer/ocr_overlay.widget.dart @@ -85,7 +85,7 @@ class _OcrOverlayState extends ConsumerState { return const SizedBox.shrink(); } - final ocrData = ref.watch(driftOcrAssetProvider((widget.asset as RemoteAsset).id)); + final ocrData = ref.watch(ocrAssetProvider((widget.asset as RemoteAsset).id)); return ocrData.when( data: (data) { @@ -99,7 +99,7 @@ class _OcrOverlayState extends ConsumerState { ); } - Widget _buildOcrBoxes(List ocrData) { + Widget _buildOcrBoxes(List ocrData) { // Use the actual decoded image size from PhotoView's scaleBoundaries when // available. The image provider may serve a downscaled preview (e.g. Immich // serves a ~1440px preview for large originals), so the decoded dimensions @@ -114,7 +114,7 @@ class _OcrOverlayState extends ConsumerState { return _buildBoxStack(ocrData, imageSize, scale, position); } - Widget _buildBoxStack(List ocrData, Size imageSize, double scale, Offset position) { + Widget _buildBoxStack(List ocrData, Size imageSize, double scale, Offset position) { final imageWidth = imageSize.width; final imageHeight = imageSize.height; final viewportWidth = widget.viewportSize.width; diff --git a/mobile/lib/presentation/widgets/asset_viewer/viewer_top_app_bar.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/viewer_top_app_bar.widget.dart index f883872f26..e6109361af 100644 --- a/mobile/lib/presentation/widgets/asset_viewer/viewer_top_app_bar.widget.dart +++ b/mobile/lib/presentation/widgets/asset_viewer/viewer_top_app_bar.widget.dart @@ -33,7 +33,7 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget { final isOwner = asset is RemoteAsset && asset.ownerId == user?.id; final isInLockedView = ref.watch(inLockedViewProvider); final isReadonlyModeEnabled = ref.watch(readonlyModeProvider); - final hasOcr = asset is RemoteAsset && ref.watch(driftOcrAssetProvider(asset.id)).valueOrNull?.isNotEmpty == true; + final hasOcr = asset is RemoteAsset && ref.watch(ocrAssetProvider(asset.id)).valueOrNull?.isNotEmpty == true; final showingDetails = ref.watch(assetViewerProvider.select((state) => state.showingDetails)); diff --git a/mobile/lib/providers/infrastructure/ocr.provider.dart b/mobile/lib/providers/infrastructure/ocr.provider.dart index 3ea72e0277..e77cf9c5b9 100644 --- a/mobile/lib/providers/infrastructure/ocr.provider.dart +++ b/mobile/lib/providers/infrastructure/ocr.provider.dart @@ -4,13 +4,11 @@ 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 driftOcrRepositoryProvider = Provider((ref) => DriftOcrRepository(ref.watch(driftProvider))); +final ocrRepositoryProvider = Provider((ref) => OcrRepository(ref.watch(driftProvider))); -final driftOcrServiceProvider = Provider( - (ref) => DriftOcrService(ref.watch(driftOcrRepositoryProvider)), -); +final ocrServiceProvider = Provider((ref) => OcrService(ref.watch(ocrRepositoryProvider))); -final driftOcrAssetProvider = FutureProvider.family?, String>((ref, assetId) async { - final service = ref.watch(driftOcrServiceProvider); +final ocrAssetProvider = FutureProvider.family?, String>((ref, assetId) async { + final service = ref.watch(ocrServiceProvider); return service.get(assetId); });