Skip to content

chore: update drift #23877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alextran1502 merged 2 commits into from
Nov 18, 2025
+24 −6
Merged

chore: update drift #23877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c30a65
chore: update drift
alextran1502 Nov 13, 2025
9fbfbc2
update drift dep
shenlong-tanwen Nov 18, 2025
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
14 changes: 12 additions & 2 deletions mobile/lib/domain/services/background_worker.service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,12 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
}

Future<void> _cleanup() async {
await runZonedGuarded(_handleCleanup, (error, stack) {
dPrint(() => "Error during background worker cleanup: $error, $stack");
});
}

Future<void> _handleCleanup() async {
// If ref is null, it means the service was never initialized properly
if (_isCleanedUp || _ref == null) {
return;
Expand All @@ -186,11 +192,16 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
_isCleanedUp = true;
final backgroundSyncManager = _ref?.read(backgroundSyncProvider);
final nativeSyncApi = _ref?.read(nativeSyncApiProvider);

await _drift.close();
await _driftLogger.close();

_ref?.dispose();
_ref = null;

_cancellationToken.cancel();
_logger.info("Cleaning up background worker");

final cleanupFutures = [
nativeSyncApi?.cancelHashing(),
workerManagerPatch.dispose().catchError((_) async {
Expand All @@ -199,8 +210,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
}),
LogService.I.dispose(),
Store.dispose(),
_drift.close(),
_driftLogger.close(),

backgroundSyncManager?.cancel(),
];

Expand Down
9 changes: 5 additions & 4 deletions mobile/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,10 +452,11 @@ packages:
drift:
dependency: "direct main"
description:
name: drift
sha256: "14a61af39d4584faf1d73b5b35e4b758a43008cf4c0fdb0576ec8e7032c0d9a5"
url: "https://pub.dev"
source: hosted
path: drift
ref: "53ef7e9f19fe8f68416251760b4b99fe43f1c575"
resolved-ref: "53ef7e9f19fe8f68416251760b4b99fe43f1c575"
url: "https://github.com/immich-app/drift"
source: git
version: "2.26.0"
drift_dev:
dependency: "direct dev"
Expand Down
7 changes: 7 additions & 0 deletions mobile/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,13 @@ dev_dependencies:
riverpod_generator: ^2.6.1
riverpod_lint: ^2.6.1

dependency_overrides:
drift:
git:
url: https://github.com/immich-app/drift
ref: '53ef7e9f19fe8f68416251760b4b99fe43f1c575'
path: drift/

flutter:
uses-material-design: true
assets:
Expand Down
Loading