mirror of
https://github.com/immich-app/immich.git
synced 2024-09-21 10:37:20 +00:00
refactor: sync
This commit is contained in:
parent
a84f57168d
commit
8b615bf7de
@ -11,7 +11,7 @@
|
||||
|
||||
<application
|
||||
android:label="Immich"
|
||||
android:name=".ImmichApp"
|
||||
android:name="${applicationName}"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:usesCleartextTraffic="true"
|
||||
android:requestLegacyExternalStorage="true"
|
||||
|
@ -7,9 +7,9 @@ import io.flutter.embedding.engine.FlutterEngine
|
||||
|
||||
class MainActivity: FlutterActivity() {
|
||||
override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
|
||||
super.configureFlutterEngine(flutterEngine)
|
||||
|
||||
// Register piegon handler
|
||||
ImmichHostService.setUp(flutterEngine.dartExecutor.binaryMessenger, ImmichHostServiceImpl())
|
||||
|
||||
super.configureFlutterEngine(flutterEngine)
|
||||
}
|
||||
}
|
||||
|
@ -1,15 +1,26 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:immich_mobile/domain/models/asset.model.dart';
|
||||
import 'package:immich_mobile/domain/models/render_list.model.dart';
|
||||
|
||||
abstract class IAssetRepository {
|
||||
/// Batch insert asset
|
||||
Future<bool> addAll(Iterable<Asset> assets);
|
||||
FutureOr<bool> addAll(Iterable<Asset> assets);
|
||||
|
||||
/// Removes assets with the [localIds]
|
||||
FutureOr<List<Asset>> fetchLocalAssetsForIds(List<String> localIds);
|
||||
|
||||
/// Removes assets with the [remoteIds]
|
||||
FutureOr<List<Asset>> fetchRemoteAssetsForIds(List<String> remoteIds);
|
||||
|
||||
/// Removes assets with the given [ids]
|
||||
FutureOr<void> deleteAssetsForIds(List<int> ids);
|
||||
|
||||
/// Removes all assets
|
||||
Future<bool> clearAll();
|
||||
FutureOr<bool> clearAll();
|
||||
|
||||
/// Fetch assets from the [offset] with the [limit]
|
||||
Future<List<Asset>> fetchAssets({int? offset, int? limit});
|
||||
FutureOr<List<Asset>> fetchAssets({int? offset, int? limit});
|
||||
|
||||
/// Streams assets as groups grouped by the group type passed
|
||||
Stream<RenderList> watchRenderList();
|
||||
|
@ -1,3 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:immich_mobile/utils/collection_util.dart';
|
||||
import 'package:immich_mobile/utils/extensions/string.extension.dart';
|
||||
import 'package:openapi/api.dart';
|
||||
|
||||
@ -70,8 +72,8 @@ class Asset {
|
||||
DateTime? createdTime,
|
||||
DateTime? modifiedTime,
|
||||
int? duration,
|
||||
String? localId,
|
||||
String? remoteId,
|
||||
ValueGetter<String?>? localId,
|
||||
ValueGetter<String?>? remoteId,
|
||||
String? livePhotoVideoId,
|
||||
}) {
|
||||
return Asset(
|
||||
@ -84,12 +86,32 @@ class Asset {
|
||||
createdTime: createdTime ?? this.createdTime,
|
||||
modifiedTime: modifiedTime ?? this.modifiedTime,
|
||||
duration: duration ?? this.duration,
|
||||
localId: localId ?? this.localId,
|
||||
remoteId: remoteId ?? this.remoteId,
|
||||
localId: localId != null ? localId() : this.localId,
|
||||
remoteId: remoteId != null ? remoteId() : this.remoteId,
|
||||
livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
|
||||
);
|
||||
}
|
||||
|
||||
Asset merge(Asset newAsset) {
|
||||
if (newAsset.modifiedTime.isAfter(modifiedTime)) {
|
||||
return newAsset.copyWith(
|
||||
height: newAsset.height ?? height,
|
||||
width: newAsset.width ?? width,
|
||||
localId: () => newAsset.localId ?? localId,
|
||||
remoteId: () => newAsset.remoteId ?? remoteId,
|
||||
livePhotoVideoId: newAsset.livePhotoVideoId ?? livePhotoVideoId,
|
||||
);
|
||||
}
|
||||
|
||||
return copyWith(
|
||||
height: height ?? newAsset.height,
|
||||
width: width ?? newAsset.width,
|
||||
localId: () => localId ?? newAsset.localId,
|
||||
remoteId: () => remoteId ?? newAsset.remoteId,
|
||||
livePhotoVideoId: livePhotoVideoId ?? newAsset.livePhotoVideoId,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
String toString() => """
|
||||
{
|
||||
@ -140,6 +162,12 @@ class Asset {
|
||||
remoteId.hashCode ^
|
||||
livePhotoVideoId.hashCode;
|
||||
}
|
||||
|
||||
static int compareByRemoteId(Asset a, Asset b) =>
|
||||
CollectionUtil.compareToNullable(a.remoteId, b.remoteId);
|
||||
|
||||
static int compareByLocalId(Asset a, Asset b) =>
|
||||
CollectionUtil.compareToNullable(a.localId, b.localId);
|
||||
}
|
||||
|
||||
AssetType _toAssetType(AssetTypeEnum type) => switch (type) {
|
||||
|
@ -85,6 +85,29 @@ class RemoteAssetDriftRepository with LogContext implements IAssetRepository {
|
||||
.watch()
|
||||
.map((elements) => RenderList(elements: elements));
|
||||
}
|
||||
|
||||
@override
|
||||
Future<List<Asset>> fetchLocalAssetsForIds(List<String> localIds) async {
|
||||
final query = _db.asset.select()
|
||||
..where((row) => row.localId.isIn(localIds))
|
||||
..orderBy([(asset) => OrderingTerm.asc(asset.localId)]);
|
||||
|
||||
return (await query.get()).map(_toModel).toList();
|
||||
}
|
||||
|
||||
@override
|
||||
Future<List<Asset>> fetchRemoteAssetsForIds(List<String> remoteIds) async {
|
||||
final query = _db.asset.select()
|
||||
..where((row) => row.remoteId.isIn(remoteIds))
|
||||
..orderBy([(asset) => OrderingTerm.asc(asset.remoteId)]);
|
||||
|
||||
return (await query.get()).map(_toModel).toList();
|
||||
}
|
||||
|
||||
@override
|
||||
FutureOr<void> deleteAssetsForIds(List<int> ids) async {
|
||||
await _db.asset.deleteWhere((row) => row.id.isIn(ids));
|
||||
}
|
||||
}
|
||||
|
||||
AssetCompanion _toEntity(Asset asset) {
|
||||
|
@ -75,7 +75,7 @@ class StoreDriftRepository with LogContext implements IStoreRepository {
|
||||
_ => null,
|
||||
} as U?;
|
||||
if (primitive != null) {
|
||||
return key.converter.fromPrimitive(primitive);
|
||||
return await key.converter.fromPrimitive(primitive);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
149
mobile-v2/lib/domain/services/asset_sync.service.dart
Normal file
149
mobile-v2/lib/domain/services/asset_sync.service.dart
Normal file
@ -0,0 +1,149 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:collection/collection.dart';
|
||||
import 'package:immich_mobile/domain/interfaces/asset.interface.dart';
|
||||
import 'package:immich_mobile/domain/models/asset.model.dart';
|
||||
import 'package:immich_mobile/domain/models/user.model.dart';
|
||||
import 'package:immich_mobile/service_locator.dart';
|
||||
import 'package:immich_mobile/utils/collection_util.dart';
|
||||
import 'package:immich_mobile/utils/constants/globals.dart';
|
||||
import 'package:immich_mobile/utils/immich_api_client.dart';
|
||||
import 'package:immich_mobile/utils/isolate_helper.dart';
|
||||
import 'package:immich_mobile/utils/mixins/log_context.mixin.dart';
|
||||
import 'package:logging/logging.dart';
|
||||
import 'package:openapi/api.dart';
|
||||
|
||||
class AssetSyncService with LogContext {
|
||||
const AssetSyncService();
|
||||
|
||||
Future<bool> doFullRemoteSyncForUserDrift(
|
||||
User user, {
|
||||
DateTime? updatedUtil,
|
||||
int? limit,
|
||||
}) async {
|
||||
return await IsolateHelper.run(() async {
|
||||
try {
|
||||
final logger = Logger("SyncService <Isolate>");
|
||||
final syncClient = di<ImmichApiClient>().getSyncApi();
|
||||
|
||||
final chunkSize = limit ?? kFullSyncChunkSize;
|
||||
final updatedTill = updatedUtil ?? DateTime.now().toUtc();
|
||||
updatedUtil ??= DateTime.now().toUtc();
|
||||
String? lastAssetId;
|
||||
|
||||
while (true) {
|
||||
logger.info(
|
||||
"Requesting more chunks from lastId - ${lastAssetId ?? "<initial_fetch>"}",
|
||||
);
|
||||
|
||||
final assets = await syncClient.getFullSyncForUser(AssetFullSyncDto(
|
||||
limit: chunkSize,
|
||||
updatedUntil: updatedTill,
|
||||
lastId: lastAssetId,
|
||||
userId: user.id,
|
||||
));
|
||||
if (assets == null) {
|
||||
break;
|
||||
}
|
||||
|
||||
final assetsFromServer =
|
||||
assets.map(Asset.remote).sorted(Asset.compareByRemoteId);
|
||||
|
||||
final assetsInDb =
|
||||
await di<IAssetRepository>().fetchRemoteAssetsForIds(
|
||||
assetsFromServer.map((a) => a.remoteId!).toList(),
|
||||
);
|
||||
|
||||
await _syncAssetsToDbDrift(
|
||||
assetsFromServer,
|
||||
assetsInDb,
|
||||
Asset.compareByRemoteId,
|
||||
isRemoteSync: true,
|
||||
);
|
||||
|
||||
lastAssetId = assets.lastOrNull?.id;
|
||||
if (assets.length != chunkSize) break;
|
||||
}
|
||||
|
||||
return true;
|
||||
} catch (e, s) {
|
||||
log.severe("Error performing full sync for user - ${user.name}", e, s);
|
||||
}
|
||||
return false;
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> _syncAssetsToDbDrift(
|
||||
List<Asset> newAssets,
|
||||
List<Asset> existingAssets,
|
||||
Comparator<Asset> compare, {
|
||||
bool? isRemoteSync,
|
||||
}) async {
|
||||
final (toAdd, toUpdate, assetsToRemove) = _diffAssets(
|
||||
newAssets,
|
||||
existingAssets,
|
||||
compare: compare,
|
||||
isRemoteSync: isRemoteSync,
|
||||
);
|
||||
|
||||
final assetsToAdd = toAdd.followedBy(toUpdate);
|
||||
|
||||
await di<IAssetRepository>().addAll(assetsToAdd);
|
||||
await di<IAssetRepository>()
|
||||
.deleteAssetsForIds(assetsToRemove.map((a) => a.id).toList());
|
||||
}
|
||||
|
||||
/// Returns a triple (toAdd, toUpdate, toRemove)
|
||||
(List<Asset>, List<Asset>, List<Asset>) _diffAssets(
|
||||
List<Asset> newAssets,
|
||||
List<Asset> inDb, {
|
||||
bool? isRemoteSync,
|
||||
required Comparator<Asset> compare,
|
||||
}) {
|
||||
// fast paths for trivial cases: reduces memory usage during initial sync etc.
|
||||
if (newAssets.isEmpty && inDb.isEmpty) {
|
||||
return const ([], [], []);
|
||||
} else if (newAssets.isEmpty && isRemoteSync == null) {
|
||||
// remove all from database
|
||||
return (const [], const [], inDb);
|
||||
} else if (inDb.isEmpty) {
|
||||
// add all assets
|
||||
return (newAssets, const [], const []);
|
||||
}
|
||||
|
||||
final List<Asset> toAdd = [];
|
||||
final List<Asset> toUpdate = [];
|
||||
final List<Asset> toRemove = [];
|
||||
CollectionUtil.diffSortedLists(
|
||||
inDb,
|
||||
newAssets,
|
||||
compare: compare,
|
||||
both: (Asset a, Asset b) {
|
||||
if (a == b) {
|
||||
toUpdate.add(a.merge(b));
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
},
|
||||
// Only in DB (removed asset)
|
||||
onlyFirst: (Asset a) {
|
||||
// We are syncing remote assets, if asset only inDB, then it is removed from remote
|
||||
if (isRemoteSync == true && a.isLocal) {
|
||||
if (a.remoteId != null) {
|
||||
toUpdate.add(a.copyWith(remoteId: () => null));
|
||||
}
|
||||
// We are syncing local assets, mark the asset inDB as local only
|
||||
} else if (isRemoteSync == false && a.isRemote) {
|
||||
if (a.isLocal) {
|
||||
toUpdate.add(a.copyWith(localId: () => null));
|
||||
}
|
||||
} else {
|
||||
toRemove.add(a);
|
||||
}
|
||||
},
|
||||
// Only in remote (new asset)
|
||||
onlySecond: (Asset b) => toAdd.add(b),
|
||||
);
|
||||
return (toAdd, toUpdate, toRemove);
|
||||
}
|
||||
}
|
@ -132,6 +132,7 @@ class LoginService with LogContext {
|
||||
return false;
|
||||
}
|
||||
|
||||
ServiceLocator.registerCurrentUser(user);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -1,63 +0,0 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:immich_mobile/domain/interfaces/asset.interface.dart';
|
||||
import 'package:immich_mobile/domain/models/asset.model.dart';
|
||||
import 'package:immich_mobile/domain/models/user.model.dart';
|
||||
import 'package:immich_mobile/domain/repositories/database.repository.dart';
|
||||
import 'package:immich_mobile/service_locator.dart';
|
||||
import 'package:immich_mobile/utils/constants/globals.dart';
|
||||
import 'package:immich_mobile/utils/immich_api_client.dart';
|
||||
import 'package:immich_mobile/utils/isolate_helper.dart';
|
||||
import 'package:immich_mobile/utils/mixins/log_context.mixin.dart';
|
||||
import 'package:logging/logging.dart';
|
||||
import 'package:openapi/api.dart';
|
||||
|
||||
class SyncService with LogContext {
|
||||
SyncService();
|
||||
|
||||
Future<bool> doFullSyncForUserDrift(
|
||||
User user, {
|
||||
DateTime? updatedUtil,
|
||||
int? limit,
|
||||
}) async {
|
||||
return await IsolateHelper.run(() async {
|
||||
try {
|
||||
final logger = Logger("SyncService <Isolate>");
|
||||
final syncClient = di<ImmichApiClient>().getSyncApi();
|
||||
|
||||
final chunkSize = limit ?? kFullSyncChunkSize;
|
||||
final updatedTill = updatedUtil ?? DateTime.now().toUtc();
|
||||
updatedUtil ??= DateTime.now().toUtc();
|
||||
String? lastAssetId;
|
||||
|
||||
while (true) {
|
||||
logger.info(
|
||||
"Requesting more chunks from lastId - ${lastAssetId ?? "<initial_fetch>"}",
|
||||
);
|
||||
|
||||
final assets = await syncClient.getFullSyncForUser(AssetFullSyncDto(
|
||||
limit: chunkSize,
|
||||
updatedUntil: updatedTill,
|
||||
lastId: lastAssetId,
|
||||
userId: user.id,
|
||||
));
|
||||
if (assets == null) {
|
||||
break;
|
||||
}
|
||||
|
||||
await di<IAssetRepository>().addAll(assets.map(Asset.remote));
|
||||
|
||||
lastAssetId = assets.lastOrNull?.id;
|
||||
if (assets.length != chunkSize) break;
|
||||
}
|
||||
|
||||
return true;
|
||||
} catch (e, s) {
|
||||
log.severe("Error performing full sync for user - ${user.name}", e, s);
|
||||
} finally {
|
||||
await di<DriftDatabaseRepository>().close();
|
||||
}
|
||||
return false;
|
||||
});
|
||||
}
|
||||
}
|
@ -17,6 +17,8 @@ class ImApp extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _ImAppState extends State<ImApp> with WidgetsBindingObserver {
|
||||
_ImAppState();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return TranslationProvider(
|
||||
|
@ -1,3 +1,5 @@
|
||||
// ignore_for_file: avoid-passing-self-as-argument
|
||||
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
@ -8,7 +8,7 @@ import 'package:immich_mobile/domain/models/render_list.model.dart';
|
||||
import 'package:immich_mobile/utils/constants/globals.dart';
|
||||
|
||||
typedef RenderListProvider = Stream<RenderList> Function();
|
||||
typedef RenderListAssetProvider = Future<List<Asset>> Function({
|
||||
typedef RenderListAssetProvider = FutureOr<List<Asset>> Function({
|
||||
int? offset,
|
||||
int? limit,
|
||||
});
|
||||
|
@ -27,7 +27,6 @@ class ImLogo extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
// ignore: prefer-single-widget-per-file
|
||||
class ImLogoText extends StatelessWidget {
|
||||
const ImLogoText({
|
||||
super.key,
|
||||
|
@ -17,7 +17,6 @@ class ImAdaptiveRoutePrimaryAppBar extends StatelessWidget
|
||||
Size get preferredSize => const Size.fromHeight(kToolbarHeight);
|
||||
}
|
||||
|
||||
// ignore: prefer-single-widget-per-file
|
||||
class ImAdaptiveRouteSecondaryAppBar extends StatelessWidget
|
||||
implements PreferredSizeWidget {
|
||||
const ImAdaptiveRouteSecondaryAppBar({super.key});
|
||||
|
@ -5,8 +5,8 @@ import 'package:immich_mobile/domain/interfaces/asset.interface.dart';
|
||||
import 'package:immich_mobile/domain/interfaces/store.interface.dart';
|
||||
import 'package:immich_mobile/domain/interfaces/user.interface.dart';
|
||||
import 'package:immich_mobile/domain/models/store.model.dart';
|
||||
import 'package:immich_mobile/domain/services/asset_sync.service.dart';
|
||||
import 'package:immich_mobile/domain/services/login.service.dart';
|
||||
import 'package:immich_mobile/domain/services/sync.service.dart';
|
||||
import 'package:immich_mobile/domain/services/user.service.dart';
|
||||
import 'package:immich_mobile/i18n/strings.g.dart';
|
||||
import 'package:immich_mobile/presentation/modules/common/states/server_info/server_feature_config.state.dart';
|
||||
@ -139,7 +139,7 @@ class LoginPageCubit extends Cubit<LoginPageState> with LogContext {
|
||||
await di<IUserRepository>().add(user);
|
||||
// Remove and Sync assets in background
|
||||
await di<IAssetRepository>().clearAll();
|
||||
unawaited(di<SyncService>().doFullSyncForUserDrift(user));
|
||||
unawaited(di<AssetSyncService>().doFullRemoteSyncForUserDrift(user));
|
||||
|
||||
emit(state.copyWith(
|
||||
isValidationInProgress: false,
|
||||
|
@ -22,7 +22,6 @@ class SettingsWrapperPage extends StatelessWidget {
|
||||
}
|
||||
|
||||
@RoutePage()
|
||||
// ignore: prefer-single-widget-per-file
|
||||
class SettingsPage extends StatelessWidget {
|
||||
const SettingsPage({super.key});
|
||||
|
||||
|
@ -10,9 +10,9 @@ import 'package:immich_mobile/domain/repositories/log.repository.dart';
|
||||
import 'package:immich_mobile/domain/repositories/store.repository.dart';
|
||||
import 'package:immich_mobile/domain/repositories/user.repository.dart';
|
||||
import 'package:immich_mobile/domain/services/app_setting.service.dart';
|
||||
import 'package:immich_mobile/domain/services/asset_sync.service.dart';
|
||||
import 'package:immich_mobile/domain/services/login.service.dart';
|
||||
import 'package:immich_mobile/domain/services/server_info.service.dart';
|
||||
import 'package:immich_mobile/domain/services/sync.service.dart';
|
||||
import 'package:immich_mobile/domain/services/user.service.dart';
|
||||
import 'package:immich_mobile/presentation/modules/common/states/current_user.state.dart';
|
||||
import 'package:immich_mobile/presentation/modules/common/states/server_info/server_feature_config.state.dart';
|
||||
@ -92,7 +92,7 @@ class ServiceLocator {
|
||||
_registerFactory<ServerInfoService>(() => ServerInfoService(
|
||||
di<ImmichApiClient>().getServerApi(),
|
||||
));
|
||||
_registerFactory<SyncService>(() => SyncService());
|
||||
_registerFactory<AssetSyncService>(() => const AssetSyncService());
|
||||
}
|
||||
|
||||
static void registerPostGlobalStates() {
|
||||
|
52
mobile-v2/lib/utils/collection_util.dart
Normal file
52
mobile-v2/lib/utils/collection_util.dart
Normal file
@ -0,0 +1,52 @@
|
||||
// ignore_for_file: avoid-unsafe-collection-methods
|
||||
|
||||
class CollectionUtil {
|
||||
const CollectionUtil();
|
||||
|
||||
static int compareToNullable<T extends Comparable>(T? a, T? b) {
|
||||
if (a == null) {
|
||||
return 1;
|
||||
}
|
||||
if (b == null) {
|
||||
return -1;
|
||||
}
|
||||
return a.compareTo(b);
|
||||
}
|
||||
|
||||
/// Find the difference between the two sorted lists [first] and [second]
|
||||
/// Results are passed as callbacks back to the caller during the comparison
|
||||
static bool diffSortedLists<T>(
|
||||
List<T> first,
|
||||
List<T> second, {
|
||||
required Comparator<T> compare,
|
||||
required bool Function(T a, T b) both,
|
||||
required void Function(T a) onlyFirst,
|
||||
required void Function(T b) onlySecond,
|
||||
}) {
|
||||
bool diff = false;
|
||||
int i = 0, j = 0;
|
||||
|
||||
for (; i < first.length && j < second.length;) {
|
||||
final int order = compare(first[i], second[j]);
|
||||
if (order == 0) {
|
||||
diff |= both(first[i++], second[j++]);
|
||||
} else if (order < 0) {
|
||||
onlyFirst(first[i++]);
|
||||
diff = true;
|
||||
} else if (order > 0) {
|
||||
onlySecond(second[j++]);
|
||||
diff = true;
|
||||
}
|
||||
}
|
||||
|
||||
diff |= i < first.length || j < second.length;
|
||||
|
||||
for (; i < first.length; i++) {
|
||||
onlyFirst(first[i]);
|
||||
}
|
||||
for (; j < second.length; j++) {
|
||||
onlySecond(second[j]);
|
||||
}
|
||||
return diff;
|
||||
}
|
||||
}
|
4
mobile-v2/lib/utils/extensions/iterable.extension.dart
Normal file
4
mobile-v2/lib/utils/extensions/iterable.extension.dart
Normal file
@ -0,0 +1,4 @@
|
||||
extension SortIterable<T> on Iterable<T> {
|
||||
Iterable<T> sortedBy(Comparable Function(T k) key) =>
|
||||
toList()..sort((a, b) => key(a).compareTo(key(b)));
|
||||
}
|
@ -16,13 +16,19 @@ class _ImApiClientData {
|
||||
const _ImApiClientData({required this.endpoint, required this.headersMap});
|
||||
}
|
||||
|
||||
class InvalidIsolateUsageException implements Exception {
|
||||
const InvalidIsolateUsageException();
|
||||
|
||||
@override
|
||||
String toString() =>
|
||||
"IsolateHelper should only be used from the root isolate";
|
||||
}
|
||||
|
||||
// !! Should be used only from the root isolate
|
||||
class IsolateHelper {
|
||||
// Cache the ApiClient to reconstruct it later after inside the isolate
|
||||
late final _ImApiClientData? _clientData;
|
||||
|
||||
static RootIsolateToken get _rootToken => RootIsolateToken.instance!;
|
||||
|
||||
IsolateHelper();
|
||||
|
||||
void preIsolateHandling() {
|
||||
@ -52,12 +58,21 @@ class IsolateHelper {
|
||||
}
|
||||
|
||||
static Future<T> run<T>(FutureOr<T> Function() computation) async {
|
||||
final token = RootIsolateToken.instance;
|
||||
if (token == null) {
|
||||
throw const InvalidIsolateUsageException();
|
||||
}
|
||||
|
||||
final helper = IsolateHelper()..preIsolateHandling();
|
||||
final token = _rootToken;
|
||||
return await Isolate.run(() async {
|
||||
BackgroundIsolateBinaryMessenger.ensureInitialized(token);
|
||||
helper.postIsolateHandling();
|
||||
return await computation();
|
||||
try {
|
||||
return await computation();
|
||||
} finally {
|
||||
// Always close the new database connection on Isolate end
|
||||
await di<DriftDatabaseRepository>().close();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user