gitea-mirror/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2026-01-20 16:43:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

fix: remote sync errors in backup page

Browse Source
This commit is contained in:
shenlong-tanwen
2026-01-20 21:28:17 +05:30
parent 3c1a5c744b
commit 3cd2d7f657
2 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mobile/lib/providers/background_sync.provider.dart
View File

@@ -21,7 +21,13 @@ final backgroundSyncProvider = Provider<BackgroundSyncManager>((ref) {
backupProvider.updateError(isSuccess == true ? BackupError.none : BackupError.syncFailed);
}
},
onRemoteSyncError: syncStatusNotifier.errorRemoteSync,
onRemoteSyncError: (error) {
syncStatusNotifier.errorRemoteSync(error);
final backupProvider = ref.read(driftBackupProvider.notifier);
if (backupProvider.mounted) {
backupProvider.updateError(BackupError.syncFailed);
}
},
onLocalSyncStart: syncStatusNotifier.startLocalSync,
onLocalSyncComplete: syncStatusNotifier.completeLocalSync,
onLocalSyncError: syncStatusNotifier.errorLocalSync,

46
mobile/lib/utils/isolate.dart
View File

@@ -172,6 +172,9 @@ class _IsolateTaskRunner<T> {
void _cleanup() {
if (_isCleanedUp) return;
if (!_completer.isCompleted) {
_completer.completeError(Exception("Isolate task cleaned up without completing."));
}
_isCleanedUp = true;
_cleanupTimeoutTimer?.cancel();
@@ -249,9 +252,9 @@ Future<void> _isolateEntryPoint<T>(_IsolateTaskConfig<T> config) async {
});
final log = Logger("IsolateWorker[${config.debugLabel}]");
try {
await runZonedGuarded(
() async {
await runZonedGuarded(
() async {
try {
ref = ProviderContainer(
overrides: [
dbProvider.overrideWithValue(isar),
@@ -269,27 +272,30 @@ Future<void> _isolateEntryPoint<T>(_IsolateTaskConfig<T> config) async {
} else {
log.fine("Task completed but was cancelled - not sending result");
}
},
(error, stack) {
log.severe("Uncaught error in isolate zone", error, stack);
} catch (error, stack) {
log.severe("Error in isolate execution", error, stack);
config.mainSendPort.send(_ErrorMessage(error, stack));
},
);
} catch (error, stack) {
log.severe("Error in isolate execution", error, stack);
config.mainSendPort.send(_ErrorMessage(error, stack));
} finally {
try {
} finally {
try {
receivePort.close();
unawaited(subscription.cancel());
await _cleanupResources(ref, isar, drift, logDb);
} catch (error, stack) {
dPrint(() => "Error during isolate cleanup: $error with stack: $stack");
} finally {
unawaited(subscription.cancel());
config.mainSendPort.send(const _DoneMessage());
}
}
},
(error, stack) async {
dPrint(() => "Uncaught error in isolate zone: $error, $stack");
receivePort.close();
unawaited(subscription.cancel());
await _cleanupResources(ref, isar, drift, logDb);
} catch (error, stack) {
dPrint(() => "Error during isolate cleanup: $error with stack: $stack");
} finally {
unawaited(subscription.cancel());
config.mainSendPort.send(const _DoneMessage());
}
}
config.mainSendPort.send(_ErrorMessage(error, stack));
},
);
}
CancellableTask<T> runInIsolateGentle<T>({