Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions mobile/lib/domain/interfaces/sync-stream.interface.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import 'package:immich_mobile/domain/interfaces/db.interface.dart';
import 'package:openapi/api.dart';

abstract interface class ISyncStreamRepository implements IDatabaseRepository {
Future<bool> updateUsersV1(SyncUserV1 data);
Future<bool> deleteUsersV1(SyncUserDeleteV1 data);
}
8 changes: 2 additions & 6 deletions mobile/lib/domain/models/sync/sync_event.model.dart
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
class SyncEvent {
// dynamic
// ignore: avoid-dynamic
final dynamic data;

final String ack;

SyncEvent({
required this.data,
required this.ack,
});
const SyncEvent({required this.data, required this.ack});

@override
String toString() => 'SyncEvent(data: $data, ack: $ack)';
Expand Down
43 changes: 21 additions & 22 deletions mobile/lib/domain/services/sync_stream.service.dart
Original file line number Diff line number Diff line change
@@ -1,43 +1,42 @@
// ignore_for_file: avoid-passing-async-when-sync-expected

import 'dart:async';

import 'package:flutter/foundation.dart';
import 'package:immich_mobile/domain/interfaces/sync-stream.interface.dart';
import 'package:immich_mobile/domain/interfaces/sync_api.interface.dart';
import 'package:logging/logging.dart';
import 'package:openapi/api.dart';

class SyncStreamService {
final ISyncApiRepository _syncApiRepository;

SyncStreamService(this._syncApiRepository);
final Logger _logger = Logger('SyncStreamService');

final ISyncApiRepository _syncApiRepository;
final ISyncStreamRepository _syncStreamRepository;
StreamSubscription? _userSyncSubscription;

SyncStreamService({
required ISyncApiRepository syncApiRepository,
required ISyncStreamRepository syncStreamRepository,
}) : _syncApiRepository = syncApiRepository,
_syncStreamRepository = syncStreamRepository;

void syncUsers() {
_userSyncSubscription =
_syncApiRepository.watchUserSyncEvent().listen((events) async {
for (final event in events) {
bool status = false;
if (event.data is SyncUserV1) {
final data = event.data as SyncUserV1;
debugPrint("User Update: $data");

// final user = await _userRepository.get(data.id);

// if (user == null) {
// continue;
// }

// user.name = data.name;
// user.email = data.email;
// user.updatedAt = DateTime.now();

// await _userRepository.update(user);
// await _syncApiRepository.ack(event.ack);
_logger.fine("UserSyncUpdate: ${event.data}");
status = await _syncStreamRepository.updateUsersV1(event.data);
}

if (event.data is SyncUserDeleteV1) {
final data = event.data as SyncUserDeleteV1;
_logger.fine("SyncUserDelete: ${event.data}");
status = await _syncStreamRepository.deleteUsersV1(event.data);
}

debugPrint("User delete: $data");
// await _syncApiRepository.ack(event.ack);
if (status) {
await _syncApiRepository.ack(event.ack);
}
}
});
Expand Down
29 changes: 29 additions & 0 deletions mobile/lib/infrastructure/repositories/sync-stream.repository.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import 'package:drift/drift.dart';
import 'package:immich_mobile/domain/interfaces/sync-stream.interface.dart';
import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
import 'package:openapi/api.dart';

class DriftSyncStreamRepository extends DriftDatabaseRepository
implements ISyncStreamRepository {
final Drift _db;

const DriftSyncStreamRepository(super.db) : _db = db;

@override
Future<bool> deleteUsersV1(SyncUserDeleteV1 data) async {
return (await _db.managers.userEntity
.filter((row) => row.uid.equals(data.userId))
.delete()) ==
1;
}

@override
Future<bool> updateUsersV1(SyncUserV1 data) async {
return (await _db.managers.userEntity
.filter((row) => row.uid.equals(data.id))
.update(
(u) => u(email: Value(data.email), name: Value(data.name)),
)) ==
1;
}
}
12 changes: 6 additions & 6 deletions mobile/lib/infrastructure/repositories/sync_api.repository.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,19 @@ import 'dart:async';
import 'dart:convert';

import 'package:flutter/foundation.dart';
import 'package:http/http.dart' as http;
import 'package:immich_mobile/domain/interfaces/sync_api.interface.dart';
import 'package:immich_mobile/domain/models/sync/sync_event.model.dart';
import 'package:immich_mobile/services/api.service.dart';
import 'package:openapi/api.dart';
import 'package:http/http.dart' as http;

class SyncApiRepository implements ISyncApiRepository {
final ApiService _api;
const SyncApiRepository(this._api);

@override
Stream<List<SyncEvent>> watchUserSyncEvent() {
return _getSyncStream(
SyncStreamDto(types: [SyncRequestType.usersV1]),
);
return _getSyncStream(SyncStreamDto(types: [SyncRequestType.usersV1]));
}

@override
Expand All @@ -31,7 +29,7 @@ class SyncApiRepository implements ISyncApiRepository {
final client = http.Client();
final endpoint = "${_api.apiClient.basePath}/sync/stream";

final headers = <String, String>{
final headers = {
'Content-Type': 'application/json',
'Accept': 'application/jsonlines+json',
};
Expand Down Expand Up @@ -61,6 +59,7 @@ class SyncApiRepository implements ISyncApiRepository {

await for (final chunk in response.stream.transform(utf8.decoder)) {
previousChunk += chunk;
// ignore: move-variable-outside-iteration
final parts = previousChunk.split('\n');
previousChunk = parts.removeLast();
lines.addAll(parts);
Expand All @@ -81,6 +80,7 @@ class SyncApiRepository implements ISyncApiRepository {
}
}

// ignore: avoid-dynamic
const _kResponseMap = <SyncEntityType, Function(dynamic)>{
SyncEntityType.userV1: SyncUserV1.fromJson,
SyncEntityType.userDeleteV1: SyncUserDeleteV1.fromJson,
Expand All @@ -90,7 +90,7 @@ const _kResponseMap = <SyncEntityType, Function(dynamic)>{
List<SyncEvent> _parseSyncResponse(List<String> lines) {
final List<SyncEvent> data = [];

for (var line in lines) {
for (final line in lines) {
try {
final jsonData = jsonDecode(line);
final type = SyncEntityType.fromJson(jsonData['type'])!;
Expand Down
4 changes: 4 additions & 0 deletions mobile/lib/providers/infrastructure/db.provider.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
import 'package:isar/isar.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';

part 'db.provider.g.dart';

@Riverpod(keepAlive: true)
Isar isar(IsarRef ref) => throw UnimplementedError('isar');

@Riverpod(keepAlive: true)
Drift drift(DriftRef _) => Drift();
14 changes: 14 additions & 0 deletions mobile/lib/providers/infrastructure/db.provider.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 15 additions & 12 deletions mobile/lib/providers/infrastructure/sync_stream.provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,26 @@ import 'dart:async';

import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/domain/services/sync_stream.service.dart';
import 'package:immich_mobile/infrastructure/repositories/sync-stream.repository.dart';
import 'package:immich_mobile/infrastructure/repositories/sync_api.repository.dart';
import 'package:immich_mobile/providers/api.provider.dart';
import 'package:immich_mobile/providers/infrastructure/db.provider.dart';

final syncStreamServiceProvider = Provider(
(ref) {
final instance = SyncStreamService(
ref.watch(syncApiRepositoryProvider),
);
final syncStreamServiceProvider = Provider((ref) {
final instance = SyncStreamService(
syncApiRepository: ref.watch(syncApiRepositoryProvider),
syncStreamRepository: ref.watch(syncStreamRepositoryProvider),
);

ref.onDispose(() => unawaited(instance.dispose()));
ref.onDispose(() => unawaited(instance.dispose()));

return instance;
},
);
return instance;
});

final syncApiRepositoryProvider = Provider(
(ref) => SyncApiRepository(
ref.watch(apiServiceProvider),
),
(ref) => SyncApiRepository(ref.watch(apiServiceProvider)),
);

final syncStreamRepositoryProvider = Provider(
(ref) => DriftSyncStreamRepository(ref.watch(driftProvider)),
);
Loading