mirror of
https://github.com/immich-app/immich.git
synced 2025-12-12 15:50:43 -08:00
* feature(mobile, beta, Android): handle remote asset trash/restore events and rescan media - Handle move to trash and restore from trash for remote assets on Android - Trigger MediaScannerConnection to rescan affected media files * feature(mobile, beta, Android): fix rescan * fix imports * fix checking conditions * refactor naming * fix line breaks * refactor code rollback changes in BackgroundServicePlugin * refactor code (use separate TrashService) * refactor code * parallelize restoreFromTrash calls with Future.wait format trash.provider.dart * try to re-format trash.provider.dart * re-format trash.provider.dart * rename TrashService to TrashSyncService to avoid duplicated names revert changes in original trash.provider.dart * refactor code (minor nitpicks) * process restoreFromTrash sequentially instead of Future.wait * group local assets by checksum before moving to trash delete LocalAssetEntity records when moved to trash refactor code * fix format * use checksum for asset restoration refactro code * fix format * sync trash only for backup-selected assets * feat(db): add local_trashed_asset table and integrate with restoration flow - Add new `local_trashed_asset` table to store metadata of trashed assets - Save trashed asset info into `local_trashed_asset` before deletion - Use `local_trashed_asset` as source for asset restoration - Implement file restoration by `mediaId` * resolve merge conflicts * fix index creating on migration * rework trashed assets handling - add new table trashed_local_asset - mirror trashed assets data in trashed_local_asset. - compute checksums for assets trashed out-of-app. - restore assets present in trashed_local_asset and non-trashed in remote_asset. - simplify moving-to-trash logic based on remote_asset events. * resolve merge conflicts use updated approach for calculating checksums * use CurrentPlatform instead _platform fix mocks * revert redundant changes * Include trashed items in getMediaChanges Process trashed items delta during incremental sync * fix merge conflicts * fix format * trashed_local_asset table mirror of local_asset table structure trashed_local_asset<->local_asset transfer data on move to trash or restore refactor code * refactor and format code * refactor TrashedAsset model fix missed data transfering * refactor code remove unused model * fix label * fix merge conflicts * optimize, refactor code remove redundant code and checking getTrashedAssetsForAlbum for iOS tests for hash trashed assets * format code * fix migration fix tests * fix generated file * reuse exist checksums on trash data update handle restoration errors fix import * format code * sync_stream.service depend on repos refactor assets restoration update dependencies in tests * remove trashed asset model remove trash_sync.service refactor DriftTrashedLocalAssetRepository, LocalSyncService * rework fetching trashed assets data on native side optimize handling trashed assets in local sync service refactor code * update NativeSyncApi on iOS side remove unused code * optimize sync trashed assets call in full sync mode refactor code * fix format * remove albumIds from getTrashedAssets params fix upsert in trashed local asset repo refactor code * fix getTrashedAssets params * fix(trash-sync): clean up NativeSyncApiImplBase and correct applyDelta * refactor(trash-sync): optimize performance and fix minor issues * refactor(trash-sync): add missed index * feat(trash-sync): remove sinceLastCheckpoint param from getTrashedAssets * fix(trash-sync): fix target table * fix(trash-sync): remove unused extension * fix(trash-sync): remove unused code * fix(trash-sync): refactor code * fix(trash-sync): reformat file * fix(trash_sync): refactor code * fix(trash_sync): improve moving to trash * refactor(trash_sync): integrate MANAGE_MEDIA permission request into login flow and advanced settings * refactor(trash_sync): add additional checking for experimental trash sync flag and MANAGE_MEDIA permission. * refactor(trash_sync): resolve merge conflicts * refactor(trash_sync): fix format * resolve merge conflicts add await for alert dialog add missed request * refactor(trash_sync): rework MANAGE_MEDIA info widget show rationale text in permission request alert dialog refactor setting getter * fix(trash_sync): restore missing text values * fix(trash_sync): format file * fix(trash_sync): check backup enabled and remove remote asset existence check * fix(trash_sync): remove checking backup enabled test(trash_sync): cover sync-stream trash/restore paths and dedupe mocks * test(trash_sync): cover trash/restore flows for local_sync_service * chore(e2e): restore test-assets submodule pointer --------- Co-authored-by: Peter Ombodi <peter.ombodi@gmail.com> Co-authored-by: Alex <alex.tran1502@gmail.com>
169 lines
7.4 KiB
Dart
169 lines
7.4 KiB
Dart
import 'dart:io';
|
|
|
|
import 'package:drift/drift.dart' hide isNull, isNotNull;
|
|
import 'package:drift/native.dart';
|
|
import 'package:flutter/services.dart';
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
import 'package:immich_mobile/domain/models/store.model.dart';
|
|
import 'package:immich_mobile/domain/services/store.service.dart';
|
|
import 'package:immich_mobile/entities/store.entity.dart';
|
|
import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
|
|
import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
|
|
import 'package:immich_mobile/services/app_settings.service.dart';
|
|
import 'package:immich_mobile/services/upload.service.dart';
|
|
import 'package:mocktail/mocktail.dart';
|
|
|
|
import '../domain/service.mock.dart';
|
|
import '../fixtures/asset.stub.dart';
|
|
import '../infrastructure/repository.mock.dart';
|
|
import '../repository.mocks.dart';
|
|
import '../mocks/asset_entity.mock.dart';
|
|
|
|
void main() {
|
|
late UploadService sut;
|
|
late MockUploadRepository mockUploadRepository;
|
|
late MockDriftBackupRepository mockBackupRepository;
|
|
late MockStorageRepository mockStorageRepository;
|
|
late MockDriftLocalAssetRepository mockLocalAssetRepository;
|
|
late MockAppSettingsService mockAppSettingsService;
|
|
late MockAssetMediaRepository mockAssetMediaRepository;
|
|
late Drift db;
|
|
|
|
setUpAll(() async {
|
|
registerFallbackValue(AppSettingsEnum.useCellularForUploadPhotos);
|
|
|
|
TestWidgetsFlutterBinding.ensureInitialized();
|
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(
|
|
const MethodChannel('plugins.flutter.io/path_provider'),
|
|
(MethodCall methodCall) async => 'test',
|
|
);
|
|
db = Drift(DatabaseConnection(NativeDatabase.memory(), closeStreamsSynchronously: true));
|
|
await StoreService.init(storeRepository: DriftStoreRepository(db));
|
|
|
|
await Store.put(StoreKey.serverEndpoint, 'http://test-server.com');
|
|
await Store.put(StoreKey.deviceId, 'test-device-id');
|
|
});
|
|
|
|
setUp(() {
|
|
mockUploadRepository = MockUploadRepository();
|
|
mockBackupRepository = MockDriftBackupRepository();
|
|
mockStorageRepository = MockStorageRepository();
|
|
mockLocalAssetRepository = MockDriftLocalAssetRepository();
|
|
mockAppSettingsService = MockAppSettingsService();
|
|
mockAssetMediaRepository = MockAssetMediaRepository();
|
|
|
|
when(() => mockAppSettingsService.getSetting(AppSettingsEnum.useCellularForUploadVideos)).thenReturn(false);
|
|
when(() => mockAppSettingsService.getSetting(AppSettingsEnum.useCellularForUploadPhotos)).thenReturn(false);
|
|
|
|
sut = UploadService(
|
|
mockUploadRepository,
|
|
mockBackupRepository,
|
|
mockStorageRepository,
|
|
mockLocalAssetRepository,
|
|
mockAppSettingsService,
|
|
mockAssetMediaRepository,
|
|
);
|
|
|
|
mockUploadRepository.onUploadStatus = (_) {};
|
|
mockUploadRepository.onTaskProgress = (_) {};
|
|
});
|
|
|
|
tearDown(() {
|
|
sut.dispose();
|
|
});
|
|
|
|
group('getUploadTask', () {
|
|
test('should call getOriginalFilename from AssetMediaRepository for regular photo', () async {
|
|
final asset = LocalAssetStub.image1;
|
|
final mockEntity = MockAssetEntity();
|
|
final mockFile = File('/path/to/file.jpg');
|
|
|
|
when(() => mockEntity.isLivePhoto).thenReturn(false);
|
|
when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
|
|
when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => mockFile);
|
|
when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => 'OriginalPhoto.jpg');
|
|
|
|
final task = await sut.getUploadTask(asset);
|
|
|
|
expect(task, isNotNull);
|
|
expect(task!.fields['filename'], equals('OriginalPhoto.jpg'));
|
|
verify(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).called(1);
|
|
});
|
|
|
|
test('should call getOriginalFilename when original filename is null', () async {
|
|
final asset = LocalAssetStub.image2;
|
|
final mockEntity = MockAssetEntity();
|
|
final mockFile = File('/path/to/file.jpg');
|
|
|
|
when(() => mockEntity.isLivePhoto).thenReturn(false);
|
|
when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
|
|
when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => mockFile);
|
|
when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => null);
|
|
|
|
final task = await sut.getUploadTask(asset);
|
|
|
|
expect(task, isNotNull);
|
|
expect(task!.fields['filename'], equals(asset.name));
|
|
verify(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).called(1);
|
|
});
|
|
|
|
test('should call getOriginalFilename for live photo', () async {
|
|
final asset = LocalAssetStub.image1;
|
|
final mockEntity = MockAssetEntity();
|
|
final mockFile = File('/path/to/file.mov');
|
|
|
|
when(() => mockEntity.isLivePhoto).thenReturn(true);
|
|
when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
|
|
when(() => mockStorageRepository.getMotionFileForAsset(asset)).thenAnswer((_) async => mockFile);
|
|
when(
|
|
() => mockAssetMediaRepository.getOriginalFilename(asset.id),
|
|
).thenAnswer((_) async => 'OriginalLivePhoto.HEIC');
|
|
|
|
final task = await sut.getUploadTask(asset);
|
|
expect(task, isNotNull);
|
|
// For live photos, extension should be changed to match the video file
|
|
expect(task!.fields['filename'], equals('OriginalLivePhoto.mov'));
|
|
verify(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).called(1);
|
|
});
|
|
});
|
|
|
|
group('getLivePhotoUploadTask', () {
|
|
test('should call getOriginalFilename for live photo upload task', () async {
|
|
final asset = LocalAssetStub.image1;
|
|
final mockEntity = MockAssetEntity();
|
|
final mockFile = File('/path/to/livephoto.heic');
|
|
|
|
when(() => mockEntity.isLivePhoto).thenReturn(true);
|
|
when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
|
|
when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => mockFile);
|
|
when(
|
|
() => mockAssetMediaRepository.getOriginalFilename(asset.id),
|
|
).thenAnswer((_) async => 'OriginalLivePhoto.HEIC');
|
|
|
|
final task = await sut.getLivePhotoUploadTask(asset, 'video-id-123');
|
|
|
|
expect(task, isNotNull);
|
|
expect(task!.fields['filename'], equals('OriginalLivePhoto.HEIC'));
|
|
expect(task.fields['livePhotoVideoId'], equals('video-id-123'));
|
|
verify(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).called(1);
|
|
});
|
|
|
|
test('should call getOriginalFilename when original filename is null', () async {
|
|
final asset = LocalAssetStub.image2;
|
|
final mockEntity = MockAssetEntity();
|
|
final mockFile = File('/path/to/fallback.heic');
|
|
|
|
when(() => mockEntity.isLivePhoto).thenReturn(true);
|
|
when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
|
|
when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => mockFile);
|
|
when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => null);
|
|
|
|
final task = await sut.getLivePhotoUploadTask(asset, 'video-id-456');
|
|
expect(task, isNotNull);
|
|
// Should fall back to asset.name when original filename is null
|
|
expect(task!.fields['filename'], equals(asset.name));
|
|
verify(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).called(1);
|
|
});
|
|
});
|
|
}
|