Skip to content

High performance self-hosted photo and video management solution.

chore: check before sync linked albums from websocket events (#21941)

Alex71e33e35dc00
diff --git a/mobile/lib/domain/utils/background_sync.dart b/mobile/lib/domain/utils/background_sync.dart
index 4160a5f7bc..ffbb020345 100644
--- a/mobile/lib/domain/utils/background_sync.dart
+++ b/mobile/lib/domain/utils/background_sync.dart
@@ -100,8 +100,14 @@ class BackgroundSyncManager {
// We use a ternary operator to avoid [_deviceAlbumSyncTask] from being
// captured by the closure passed to [runInIsolateGentle].
_deviceAlbumSyncTask = full
- ? runInIsolateGentle(computation: (ref) => ref.read(localSyncServiceProvider).sync(full: true))
- : runInIsolateGentle(computation: (ref) => ref.read(localSyncServiceProvider).sync(full: false));
+ ? runInIsolateGentle(
+ computation: (ref) => ref.read(localSyncServiceProvider).sync(full: true),
+ debugLabel: 'local-sync-full-true',
+ )
+ : runInIsolateGentle(
+ computation: (ref) => ref.read(localSyncServiceProvider).sync(full: false),
+ debugLabel: 'local-sync-full-false',
+ );
return _deviceAlbumSyncTask!
.whenComplete(() {
@@ -122,7 +128,10 @@ class BackgroundSyncManager {
onHashingStart?.call();
- _hashTask = runInIsolateGentle(computation: (ref) => ref.read(hashServiceProvider).hashAssets());
+ _hashTask = runInIsolateGentle(
+ computation: (ref) => ref.read(hashServiceProvider).hashAssets(),
+ debugLabel: 'hash-assets',
+ );
return _hashTask!
.whenComplete(() {
@@ -142,7 +151,10 @@ class BackgroundSyncManager {
onRemoteSyncStart?.call();
- _syncTask = runInIsolateGentle(computation: (ref) => ref.read(syncStreamServiceProvider).sync());
+ _syncTask = runInIsolateGentle(
+ computation: (ref) => ref.read(syncStreamServiceProvider).sync(),
+ debugLabel: 'remote-sync',
+ );
return _syncTask!
.whenComplete(() {
onRemoteSyncComplete?.call();
@@ -169,7 +181,7 @@ class BackgroundSyncManager {
return _linkedAlbumSyncTask!.future;
}
- _linkedAlbumSyncTask = runInIsolateGentle(computation: syncLinkedAlbumsIsolated);
+ _linkedAlbumSyncTask = runInIsolateGentle(computation: syncLinkedAlbumsIsolated, debugLabel: 'linked-album-sync');
return _linkedAlbumSyncTask!.whenComplete(() {
_linkedAlbumSyncTask = null;
});
@@ -178,4 +190,5 @@ class BackgroundSyncManager {
Cancelable<void> _handleWsAssetUploadReadyV1Batch(List<dynamic> batchData) => runInIsolateGentle(
computation: (ref) => ref.read(syncStreamServiceProvider).handleWsAssetUploadReadyV1Batch(batchData),
+ debugLabel: 'websocket-batch',
);
diff --git a/mobile/lib/providers/websocket.provider.dart b/mobile/lib/providers/websocket.provider.dart
index 05427d011e..136c6049a7 100644
--- a/mobile/lib/providers/websocket.provider.dart
+++ b/mobile/lib/providers/websocket.provider.dart
@@ -320,10 +320,13 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
return;
}
+ final isSyncAlbumEnabled = Store.get(StoreKey.syncAlbums, false);
try {
unawaited(
_ref.read(backgroundSyncProvider).syncWebsocketBatch(_batchedAssetUploadReady.toList()).then((_) {
- return _ref.read(backgroundSyncProvider).syncLinkedAlbum();
+ if (isSyncAlbumEnabled) {
+ _ref.read(backgroundSyncProvider).syncLinkedAlbum();
+ }
}),
);
} catch (error) {
diff --git a/mobile/lib/utils/isolate.dart b/mobile/lib/utils/isolate.dart
index 16e3c032ad..0d66d54a09 100644
--- a/mobile/lib/utils/isolate.dart
+++ b/mobile/lib/utils/isolate.dart
@@ -84,7 +84,7 @@ Cancelable<T?> runInIsolateGentle<T>({
return null;
},
(error, stack) {
- dPrint(() => "Error in isolate zone: $error, $stack");
+ dPrint(() => "Error in isolate $debugLabel zone: $error, $stack");
},
);
return null;