High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(mobile): don't re-upload a photo the server already has (#31941)
Santo Shakil02063972e82b
diff --git a/mobile/lib/services/foreground_upload.service.dart b/mobile/lib/services/foreground_upload.service.dartindex bd6a65f457..77042512a4 100644--- a/mobile/lib/services/foreground_upload.service.dart+++ b/mobile/lib/services/foreground_upload.service.dart@@ -255,6 +255,12 @@ class ForegroundUploadService {File? livePhotoFile;try {+ final remoteId = (await _assetService.getLocalAsset(asset.id))?.remoteId;+ if (remoteId != null) {+ await _handleUploadSuccess(asset, remoteId, callbacks);+ return;+ }+final entity = await _storageRepository.getAssetEntityForAsset(asset);if (entity == null) {callbacks.onError?.call(asset.localId!, assetNotFoundOnDevice);@@ -383,12 +389,7 @@ class ForegroundUploadService {);if (result.isSuccess && result.remoteAssetId != null) {- callbacks.onSuccess?.call(asset.localId!, result.remoteAssetId!);- try {- await _assetService.stackEditedUpload(asset.localId!, result.remoteAssetId!, asset.checksum);- } catch (error) {- _logger.warning("Failed to stack the upload of ${asset.localId}: $error");- }+ await _handleUploadSuccess(asset, result.remoteAssetId!, callbacks);} else if (result.isCancelled) {shouldAbortUpload = true;} else if (result.errorMessage != null) {@@ -418,6 +419,15 @@ class ForegroundUploadService {}}+ Future<void> _handleUploadSuccess(LocalAsset asset, String remoteId, UploadCallbacks callbacks) async {+ callbacks.onSuccess?.call(asset.localId!, remoteId);+ try {+ await _assetService.stackEditedUpload(asset.localId!, remoteId, asset.checksum);+ } catch (error) {+ _logger.warning("Failed to stack the upload of ${asset.localId}: $error");+ }+ }+Future<UploadResult> _uploadSingleFile(File file, {required String deviceAssetId,diff --git a/mobile/test/services/foreground_upload.service_test.dart b/mobile/test/services/foreground_upload.service_test.dartindex bbfe2e6492..2f6e80b52d 100644--- a/mobile/test/services/foreground_upload.service_test.dart+++ b/mobile/test/services/foreground_upload.service_test.dart@@ -55,6 +55,7 @@ void main() {mockConnectivityApi = MockConnectivityApi();mockAssetMediaRepository = MockAssetMediaRepository();mockAssetService = MockAssetService();+ when(() => mockAssetService.getLocalAsset(any())).thenAnswer((_) async => null);when(() => mockAssetService.stackEditedUpload(any(), any(), any())).thenAnswer((_) async {});sut = ForegroundUploadService(@@ -216,6 +217,7 @@ void main() {await sut.uploadSingleAsset(asset, null, callbacks: const UploadCallbacks());+ verify(() => mockAssetService.getLocalAsset(asset.id)).called(1);verify(() => mockAssetService.stackEditedUpload(asset.localId!, 'remote-1', 'sha')).called(1);verifyNoMoreInteractions(mockAssetService);});@@ -236,8 +238,26 @@ void main() {await sut.uploadSingleAsset(asset, null, callbacks: const UploadCallbacks());+ verify(() => mockAssetService.getLocalAsset(asset.id)).called(1);verify(() => mockAssetService.stackEditedUpload(asset.localId!, 'remote-2', 'sha')).called(1);verifyNoMoreInteractions(mockAssetService);});++ test('does not upload a photo the server already has', () async {+ final asset = LocalAssetStub.image1.copyWith(checksum: 'sha');+ final succeeded = <String>[];+ when(() => mockAssetService.getLocalAsset(asset.id)).thenAnswer((_) async => asset.copyWith(remoteId: 'remote'));++ await sut.uploadSingleAsset(+ asset,+ null,+ callbacks: UploadCallbacks(onSuccess: (_, remoteId) => succeeded.add(remoteId)),+ );++ expect(succeeded, equals(['remote']));+ verify(() => mockAssetService.stackEditedUpload(asset.localId!, 'remote', 'sha')).called(1);+ verifyZeroInteractions(mockStorageRepository);+ verifyZeroInteractions(mockUploadRepository);+ });});}