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

WIP: asset/album sync within an isolate #10668

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
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
2 changes: 1 addition & 1 deletion mobile/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
allprojects {
ext.kotlin_version = '1.9.24'
ext.kotlin_version = '2.0.0'

repositories {
google()
Expand Down
5 changes: 5 additions & 0 deletions mobile/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_displaymode/flutter_displaymode.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/extensions/build_context_extensions.dart';
import 'package:immich_mobile/services/asset.service.dart';
import 'package:timezone/data/latest.dart';
import 'package:immich_mobile/constants/locales.dart';
import 'package:immich_mobile/services/background.service.dart';
Expand Down Expand Up @@ -80,6 +81,8 @@ Future<void> initApp() async {
};

PlatformDispatcher.instance.onError = (error, stack) {
print(error);
print(stack);
log.severe('PlatformDispatcher - Catch all', error, stack);
return true;
};
Expand Down Expand Up @@ -166,6 +169,8 @@ class ImmichAppState extends ConsumerState<ImmichApp>
}
SystemChrome.setSystemUIOverlayStyle(overlayStyle);
await ref.read(localNotificationService).setup();

dbIso.create();
}

@override
Expand Down
13 changes: 4 additions & 9 deletions mobile/lib/pages/common/headers_settings.page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
class SettingsHeader {
String key = "";
String value = "";

SettingsHeader({this.key = '', this.value = ''});
}

@RoutePage()
Expand All @@ -28,20 +30,13 @@ class HeaderSettingsPage extends HookConsumerWidget {
if (headersStr.isNotEmpty) {
var customHeaders = jsonDecode(headersStr) as Map;
customHeaders.forEach((k, v) {
final header = SettingsHeader();
header.key = k;
header.value = v;
headers.value.add(header);
headers.value.add(SettingsHeader(key: k, value: v));
});
}

// add first one to help the user
if (headers.value.isEmpty) {
final header = SettingsHeader();
header.key = '';
header.value = '';

headers.value.add(header);
headers.value.add(SettingsHeader());
}
}
setInitialHeaders.value = true;
Expand Down
38 changes: 25 additions & 13 deletions mobile/lib/services/album.service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import 'package:immich_mobile/entities/user.entity.dart';
import 'package:immich_mobile/providers/api.provider.dart';
import 'package:immich_mobile/providers/db.provider.dart';
import 'package:immich_mobile/services/api.service.dart';
import 'package:immich_mobile/services/asset.service.dart';
import 'package:immich_mobile/services/sync.service.dart';
import 'package:immich_mobile/services/user.service.dart';
import 'package:isar/isar.dart';
Expand Down Expand Up @@ -81,26 +82,37 @@ class AlbumService {
final Stopwatch sw = Stopwatch()..start();
bool changes = false;
try {
await _userService.refreshUsers();
final List<AlbumResponseDto>? serverAlbums = await _apiService.albumsApi
.getAllAlbums(shared: isShared ? true : null);
if (serverAlbums == null) {
return false;
}
changes = await _syncService.syncRemoteAlbumsToDb(
serverAlbums,
isShared: isShared,
loadDetails: (dto) async => dto.assetCount == dto.assets.length
? dto
: (await _apiService.albumsApi.getAlbumInfo(dto.id)) ?? dto,
);
changes = await dbIso.dispatch("refreshRemoteAlbums", isShared);
} finally {
_remoteCompleter.complete(changes);
}
debugPrint("refreshRemoteAlbums took ${sw.elapsedMilliseconds}ms");
return changes;
}

/// Checks remote albums (owned if `isShared` is false) for changes,
/// updates the local database and returns `true` if there were any changes
Future<bool> refreshRemoteAlbumsBackground({required bool isShared}) async {
_log.info('refreshRemoteAlbumsBackground started');

await _userService.refreshUsers();
_log.info('refreshRemoteAlbumsBackground refreshUsers done');

final List<AlbumResponseDto>? serverAlbums = await _apiService.albumsApi
.getAllAlbums(shared: isShared ? true : null);
_log.info('refreshRemoteAlbumsBackground getAllAlbums done');
if (serverAlbums == null) {
return false;
}
return await _syncService.syncRemoteAlbumsToDb(
serverAlbums,
isShared: isShared,
loadDetails: (dto) async => dto.assetCount == dto.assets.length
? dto
: (await _apiService.albumsApi.getAlbumInfo(dto.id)) ?? dto,
);
}

Future<Album?> createAlbum(
String albumName,
Iterable<Asset> assets, [
Expand Down
4 changes: 4 additions & 0 deletions mobile/lib/services/api.service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'dart:io';

import 'package:flutter/material.dart';
import 'package:immich_mobile/entities/store.entity.dart';
import 'package:immich_mobile/services/asset.service.dart';
import 'package:immich_mobile/utils/url_helper.dart';
import 'package:logging/logging.dart';
import 'package:openapi/api.dart';
Expand Down Expand Up @@ -69,6 +70,9 @@ class ApiService implements Authentication {

// Save in hivebox for next startup
Store.put(StoreKey.serverEndpoint, endpoint);

await dbIso.dispatch("connectServices", ConnectServicesPayload(endpoint, _accessToken ?? ''));

return endpoint;
}

Expand Down
Loading
Loading