Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Make files, downloads and ML database init retryable

laurenspriem024ad96ec593
diff --git a/mobile/apps/photos/lib/db/files_db.dart b/mobile/apps/photos/lib/db/files_db.dart
index 75d50a8244..2fa8654236 100644
--- a/mobile/apps/photos/lib/db/files_db.dart
+++ b/mobile/apps/photos/lib/db/files_db.dart
@@ -129,8 +129,15 @@ class FilesDB with SqlDbBase {
static Future<SqliteDatabase>? _sqliteAsyncDBFuture;
Future<SqliteDatabase> get sqliteAsyncDB async {
- _sqliteAsyncDBFuture ??= _initSqliteAsyncDatabase();
- return _sqliteAsyncDBFuture!;
+ final databaseFuture = _sqliteAsyncDBFuture ??= _initSqliteAsyncDatabase();
+ try {
+ return await databaseFuture;
+ } catch (_) {
+ if (identical(_sqliteAsyncDBFuture, databaseFuture)) {
+ _sqliteAsyncDBFuture = null;
+ }
+ rethrow;
+ }
}
Future<SqliteDatabase> _initSqliteAsyncDatabase() async {
@@ -139,8 +146,13 @@ class FilesDB with SqlDbBase {
final String path = join(documentsDirectory.path, _databaseName);
_logger.info("DB path " + path);
final database = SqliteDatabase(path: path);
- await migrate(database, _migrationScripts);
- return database;
+ try {
+ await migrate(database, _migrationScripts);
+ return database;
+ } catch (_) {
+ await database.close();
+ rethrow;
+ }
}
static List<String> createTable(String tableName) {
diff --git a/mobile/apps/photos/lib/db/gallery_downloads_db.dart b/mobile/apps/photos/lib/db/gallery_downloads_db.dart
index 64d2a99eb0..b057d6f6ee 100644
--- a/mobile/apps/photos/lib/db/gallery_downloads_db.dart
+++ b/mobile/apps/photos/lib/db/gallery_downloads_db.dart
@@ -53,8 +53,15 @@ class GalleryDownloadsDB with SqlDbBase {
static Future<SqliteDatabase>? _sqliteAsyncDBFuture;
Future<SqliteDatabase> get sqliteAsyncDB async {
- _sqliteAsyncDBFuture ??= _initSqliteAsyncDatabase();
- return _sqliteAsyncDBFuture!;
+ final databaseFuture = _sqliteAsyncDBFuture ??= _initSqliteAsyncDatabase();
+ try {
+ return await databaseFuture;
+ } catch (_) {
+ if (identical(_sqliteAsyncDBFuture, databaseFuture)) {
+ _sqliteAsyncDBFuture = null;
+ }
+ rethrow;
+ }
}
Future<SqliteDatabase> _initSqliteAsyncDatabase() async {
@@ -62,8 +69,13 @@ class GalleryDownloadsDB with SqlDbBase {
final path = join(documentsDirectory.path, _databaseName);
_logger.info("DB path $path");
final database = SqliteDatabase(path: path);
- await migrate(database, _migrationScripts);
- return database;
+ try {
+ await migrate(database, _migrationScripts);
+ return database;
+ } catch (_) {
+ await database.close();
+ rethrow;
+ }
}
Future<void> upsertTask(DownloadTask task) async {
diff --git a/mobile/apps/photos/lib/db/ml/db.dart b/mobile/apps/photos/lib/db/ml/db.dart
index 138133b3b9..9f2fb45c19 100644
--- a/mobile/apps/photos/lib/db/ml/db.dart
+++ b/mobile/apps/photos/lib/db/ml/db.dart
@@ -104,8 +104,15 @@ class MLDataDB with SqlDbBase implements IMLDataDB<int> {
Future<SqliteDatabase>? _sqliteAsyncDBFuture;
Future<SqliteDatabase> get asyncDB async {
- _sqliteAsyncDBFuture ??= _initSqliteAsyncDatabase();
- return _sqliteAsyncDBFuture!;
+ final databaseFuture = _sqliteAsyncDBFuture ??= _initSqliteAsyncDatabase();
+ try {
+ return await databaseFuture;
+ } catch (_) {
+ if (identical(_sqliteAsyncDBFuture, databaseFuture)) {
+ _sqliteAsyncDBFuture = null;
+ }
+ rethrow;
+ }
}
Future<SqliteDatabase> _initSqliteAsyncDatabase() async {
@@ -119,13 +126,20 @@ class MLDataDB with SqlDbBase implements IMLDataDB<int> {
path: databaseDirectory,
maxReaders: 2,
);
- final stopwatch = Stopwatch()..start();
- _logger.info("MLDataDB: Starting migration");
- await migrate(asyncDBConnection, _migrationScripts);
- _logger.info("MLDataDB Migration took ${stopwatch.elapsedMilliseconds} ms");
- stopwatch.stop();
+ try {
+ final stopwatch = Stopwatch()..start();
+ _logger.info("MLDataDB: Starting migration");
+ await migrate(asyncDBConnection, _migrationScripts);
+ _logger.info(
+ "MLDataDB Migration took ${stopwatch.elapsedMilliseconds} ms",
+ );
+ stopwatch.stop();
- return asyncDBConnection;
+ return asyncDBConnection;
+ } catch (_) {
+ await asyncDBConnection.close();
+ rethrow;
+ }
}
Iterable<List<T>> _chunkList<T>(List<T> values, int chunkSize) sync* {