Skip to content
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.

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

feat(mobile): load server result assets from local DB #5971

Merged
merged 1 commit into from
Dec 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions mobile/lib/modules/map/services/map.service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,8 @@ class MapSerivce {
if (assets.isNotEmpty) return assets[0];

final dto = await _apiService.assetApi.getAssetById(remoteId);
if (dto == null) {
return null;
}
return Asset.remote(dto);
if (dto == null) return null;
return _db.assets.getByRemoteId(dto.id);
} catch (error, stack) {
_log.severe(
"Cannot get asset for marker ${error.toString()}",
Expand Down
8 changes: 6 additions & 2 deletions mobile/lib/modules/memories/services/memory.service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,26 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/shared/models/asset.dart';
import 'package:immich_mobile/modules/memories/models/memory.dart';
import 'package:immich_mobile/shared/providers/api.provider.dart';
import 'package:immich_mobile/shared/providers/db.provider.dart';
import 'package:immich_mobile/shared/services/api.service.dart';
import 'package:isar/isar.dart';
import 'package:logging/logging.dart';
import 'package:openapi/api.dart';

final memoryServiceProvider = StateProvider<MemoryService>((ref) {
return MemoryService(
ref.watch(apiServiceProvider),
ref.watch(dbProvider),
);
});

class MemoryService {
final log = Logger("MemoryService");

final ApiService _apiService;
final Isar _db;

MemoryService(this._apiService);
MemoryService(this._apiService, this._db);

Future<List<Memory>?> getMemoryLane() async {
try {
Expand All @@ -36,7 +40,7 @@ class MemoryService {
memories.add(
Memory(
title: title,
assets: assets.map((a) => Asset.remote(a)).toList(),
assets: await _db.assets.getAllByRemoteId(assets.map((e) => e.id)),
),
);
}
Expand Down
25 changes: 5 additions & 20 deletions mobile/lib/modules/search/providers/all_video_assets.provider.dart
Original file line number Diff line number Diff line change
@@ -1,28 +1,13 @@
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/shared/models/asset.dart';
import 'package:immich_mobile/shared/providers/api.provider.dart';
import 'package:immich_mobile/shared/providers/db.provider.dart';
import 'package:isar/isar.dart';

final allVideoAssetsProvider = FutureProvider<List<Asset>>( (ref) async {
final search = await ref.watch(apiServiceProvider).searchApi.search(
type: 'VIDEO',
);

if (search == null) {
return [];
}

return ref.watch(dbProvider)
final allVideoAssetsProvider = FutureProvider<List<Asset>>((ref) async {
return ref
.watch(dbProvider)
.assets
.getAllByRemoteId(
search.assets.items.map((e) => e.id),
);

/// This works offline, but we use the above
/*
return ref.watch(dbProvider).assets
.filter()
.durationInSecondsGreaterThan(0)
.typeEqualTo(AssetType.video)
.findAll();
*/
});
10 changes: 7 additions & 3 deletions mobile/lib/modules/search/services/person.service.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import 'package:immich_mobile/shared/models/asset.dart';
import 'package:immich_mobile/shared/providers/api.provider.dart';
import 'package:immich_mobile/shared/providers/db.provider.dart';
import 'package:immich_mobile/shared/services/api.service.dart';
import 'package:isar/isar.dart';
import 'package:logging/logging.dart';
import 'package:openapi/api.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
Expand All @@ -9,13 +11,14 @@ part 'person.service.g.dart';

@riverpod
PersonService personService(PersonServiceRef ref) =>
PersonService(ref.read(apiServiceProvider));
PersonService(ref.read(apiServiceProvider), ref.read(dbProvider));

class PersonService {
final Logger _log = Logger("PersonService");
final ApiService _apiService;
final Isar _db;

PersonService(this._apiService);
PersonService(this._apiService, this._db);

Future<List<PersonResponseDto>> getCuratedPeople() async {
try {
Expand All @@ -30,7 +33,8 @@ class PersonService {
Future<List<Asset>?> getPersonAssets(String id) async {
try {
final assets = await _apiService.personApi.getPersonAssets(id);
return assets?.map((e) => Asset.remote(e)).toList();
if (assets == null) return null;
return await _db.assets.getAllByRemoteId(assets.map((e) => e.id));
} catch (error, stack) {
_log.severe("Error while fetching person assets", error, stack);
}
Expand Down
2 changes: 2 additions & 0 deletions mobile/lib/shared/models/asset.dart
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,8 @@ extension AssetsHelper on IsarCollection<Asset> {
ids.isEmpty ? Future.value([]) : remote(ids).findAll();
Future<List<Asset>> getAllByLocalId(Iterable<String> ids) =>
ids.isEmpty ? Future.value([]) : local(ids).findAll();
Future<Asset?> getByRemoteId(String id) =>
where().remoteIdEqualTo(id).findFirst();

QueryBuilder<Asset, Asset, QAfterWhereClause> remote(Iterable<String> ids) =>
where().anyOf(ids, (q, String e) => q.remoteIdEqualTo(e));
Expand Down
Loading