merge main

mobile/lib/repositories/auth.repository.dart

@@ -1,6 +1,5 @@
 import 'dart:convert';
 
-import 'package:drift/drift.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
@@ -10,6 +9,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
@@ -25,25 +25,7 @@ class AuthRepository extends DatabaseRepository {
   const AuthRepository(super.db, this._drift);
 
   Future<void> clearLocalData() async {
-    // Drift deletions - child entities first (those with foreign keys)
-    await Future.wait([
-      _drift.memoryAssetEntity.deleteAll(),
-      _drift.remoteAlbumAssetEntity.deleteAll(),
-      _drift.remoteAlbumUserEntity.deleteAll(),
-      _drift.remoteExifEntity.deleteAll(),
-      _drift.userMetadataEntity.deleteAll(),
-      _drift.partnerEntity.deleteAll(),
-      _drift.stackEntity.deleteAll(),
-      _drift.assetFaceEntity.deleteAll(),
-    ]);
-    // Drift deletions - parent entities
-    await Future.wait([
-      _drift.memoryEntity.deleteAll(),
-      _drift.personEntity.deleteAll(),
-      _drift.remoteAlbumEntity.deleteAll(),
-      _drift.remoteAssetEntity.deleteAll(),
-      _drift.userEntity.deleteAll(),
-    ]);
+    await SyncStreamRepository(_drift).reset();
 
     return db.writeTxn(() {
       return Future.wait([

mobile/lib/repositories/upload.repository.dart

@@ -1,7 +1,21 @@
+import 'dart:convert';
+import 'dart:io';
+
 import 'package:background_downloader/background_downloader.dart';
-import 'package:flutter/material.dart';
+import 'package:cancellation_token_http/http.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:logging/logging.dart';
+import 'package:immich_mobile/utils/debug_print.dart';
+
+class UploadTaskWithFile {
+  final File file;
+  final UploadTask task;
+
+  const UploadTaskWithFile({required this.file, required this.task});
+}
 
 final uploadRepositoryProvider = Provider((ref) => UploadRepository());
 
@@ -31,7 +45,7 @@ class UploadRepository {
     return FileDownloader().enqueue(task);
   }
 
-  Future<void> enqueueBackgroundAll(List<UploadTask> tasks) {
+  Future<List<bool>> enqueueBackgroundAll(List<UploadTask> tasks) {
     return FileDownloader().enqueueAll(tasks);
   }
 
@@ -65,13 +79,65 @@ class UploadRepository {
       FileDownloader().database.allRecordsWithStatus(TaskStatus.paused, group: kBackupGroup),
     ]);
 
-    debugPrint("""
+    dPrint(
+      () =>
+          """
       Upload Info:
       Enqueued: ${enqueuedTasks.length}
       Running: ${runningTasks.length}
       Canceled: ${canceledTasks.length}
       Waiting: ${waitingTasks.length}
       Paused: ${pausedTasks.length}
-    """);
+    """,
+    );
+  }
+
+  Future<void> backupWithDartClient(Iterable<UploadTaskWithFile> tasks, CancellationToken cancelToken) async {
+    final httpClient = Client();
+    final String savedEndpoint = Store.get(StoreKey.serverEndpoint);
+
+    Logger logger = Logger('UploadRepository');
+    for (final candidate in tasks) {
+      if (cancelToken.isCancelled) {
+        logger.warning("Backup was cancelled by the user");
+        break;
+      }
+
+      try {
+        final fileStream = candidate.file.openRead();
+        final assetRawUploadData = MultipartFile(
+          "assetData",
+          fileStream,
+          candidate.file.lengthSync(),
+          filename: candidate.task.filename,
+        );
+
+        final baseRequest = MultipartRequest('POST', Uri.parse('$savedEndpoint/assets'));
+
+        baseRequest.headers.addAll(candidate.task.headers);
+        baseRequest.fields.addAll(candidate.task.fields);
+        baseRequest.files.add(assetRawUploadData);
+
+        final response = await httpClient.send(baseRequest, cancellationToken: cancelToken);
+
+        final responseBody = jsonDecode(await response.stream.bytesToString());
+
+        if (![200, 201].contains(response.statusCode)) {
+          final error = responseBody;
+
+          logger.warning(
+            "Error(${error['statusCode']}) uploading ${candidate.task.filename} | Created on ${candidate.task.fields["fileCreatedAt"]} | ${error['error']}",
+          );
+
+          continue;
+        }
+      } on CancelledException {
+        logger.warning("Backup was cancelled by the user");
+        break;
+      } catch (error, stackTrace) {
+        logger.warning("Error backup asset: ${error.toString()}: $stackTrace");
+        continue;
+      }
+    }
   }
 }