mirror of https://github.com/immich-app/immich.git
feat(mobile): platform image providers (#20927)
* platform image providers * use key * fix cache manager * more logs, cancel on dispose instead * split into separate files * fix saving to cache * cancel multi-stage provider * refactored `getInitialImage` * only wait for disposal for full images * cached image works * formatting * lower asset viewer ram usage --------- Co-authored-by: Alex <alex.tran1502@gmail.com>pull/21106/head
Mert
GitHub
parent
9ff37b6870
commit
99d6673503
@ -0,0 +1,81 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:ffi';
|
||||||
|
import 'dart:io';
|
||||||
|
import 'dart:ui' as ui;
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
import 'package:ffi/ffi.dart';
|
||||||
|
import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
|
||||||
|
import 'package:immich_mobile/providers/image/cache/remote_image_cache_manager.dart';
|
||||||
|
import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
|
||||||
|
import 'package:logging/logging.dart';
|
||||||
|
|
||||||
|
part 'local_image_request.dart';
|
||||||
|
part 'thumbhash_image_request.dart';
|
||||||
|
part 'remote_image_request.dart';
|
||||||
|
|
||||||
|
abstract class ImageRequest {
|
||||||
|
static int _nextRequestId = 0;
|
||||||
|
|
||||||
|
final int requestId = _nextRequestId++;
|
||||||
|
bool _isCancelled = false;
|
||||||
|
|
||||||
|
get isCancelled => _isCancelled;
|
||||||
|
|
||||||
|
ImageRequest();
|
||||||
|
|
||||||
|
Future<ImageInfo?> load(ImageDecoderCallback decode, {double scale = 1.0});
|
||||||
|
|
||||||
|
void cancel() {
|
||||||
|
if (_isCancelled) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_isCancelled = true;
|
||||||
|
return _onCancelled();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _onCancelled();
|
||||||
|
|
||||||
|
Future<ui.FrameInfo?> _fromPlatformImage(Map<String, int> info) async {
|
||||||
|
final address = info['pointer'];
|
||||||
|
if (address == null) {
|
||||||
|
if (!kReleaseMode) {
|
||||||
|
debugPrint('Platform image request for $requestId was cancelled');
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
final pointer = Pointer<Uint8>.fromAddress(address);
|
||||||
|
try {
|
||||||
|
if (_isCancelled) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
final actualWidth = info['width']!;
|
||||||
|
final actualHeight = info['height']!;
|
||||||
|
final actualSize = actualWidth * actualHeight * 4;
|
||||||
|
|
||||||
|
final buffer = await ImmutableBuffer.fromUint8List(pointer.asTypedList(actualSize));
|
||||||
|
if (_isCancelled) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
final descriptor = ui.ImageDescriptor.raw(
|
||||||
|
buffer,
|
||||||
|
width: actualWidth,
|
||||||
|
height: actualHeight,
|
||||||
|
pixelFormat: ui.PixelFormat.rgba8888,
|
||||||
|
);
|
||||||
|
final codec = await descriptor.instantiateCodec();
|
||||||
|
if (_isCancelled) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return await codec.getNextFrame();
|
||||||
|
} finally {
|
||||||
|
malloc.free(pointer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,45 @@
|
|||||||
|
part of 'image_request.dart';
|
||||||
|
|
||||||
|
class LocalImageRequest extends ImageRequest {
|
||||||
|
final String localId;
|
||||||
|
final int width;
|
||||||
|
final int height;
|
||||||
|
final AssetType assetType;
|
||||||
|
|
||||||
|
LocalImageRequest({required this.localId, required ui.Size size, required this.assetType})
|
||||||
|
: width = size.width.toInt(),
|
||||||
|
height = size.height.toInt();
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<ImageInfo?> load(ImageDecoderCallback decode, {double scale = 1.0}) async {
|
||||||
|
if (_isCancelled) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
Stopwatch? stopwatch;
|
||||||
|
if (!kReleaseMode) {
|
||||||
|
stopwatch = Stopwatch()..start();
|
||||||
|
}
|
||||||
|
final Map<String, int> info = await thumbnailApi.requestImage(
|
||||||
|
localId,
|
||||||
|
requestId: requestId,
|
||||||
|
width: width,
|
||||||
|
height: height,
|
||||||
|
isVideo: assetType == AssetType.video,
|
||||||
|
);
|
||||||
|
if (!kReleaseMode) {
|
||||||
|
stopwatch!.stop();
|
||||||
|
debugPrint('Local request $requestId took ${stopwatch.elapsedMilliseconds}ms for $localId of $width x $height');
|
||||||
|
}
|
||||||
|
final frame = await _fromPlatformImage(info);
|
||||||
|
return frame == null ? null : ImageInfo(image: frame.image, scale: scale);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> _onCancelled() {
|
||||||
|
if (!kReleaseMode) {
|
||||||
|
debugPrint('Local image request $requestId for $localId of size $width x $height was cancelled');
|
||||||
|
}
|
||||||
|
return thumbnailApi.cancelImageRequest(requestId);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,146 @@
|
|||||||
|
part of 'image_request.dart';
|
||||||
|
|
||||||
|
class RemoteImageRequest extends ImageRequest {
|
||||||
|
static final log = Logger('RemoteImageRequest');
|
||||||
|
static final client = HttpClient()..maxConnectionsPerHost = 32;
|
||||||
|
final RemoteCacheManager? cacheManager;
|
||||||
|
final String uri;
|
||||||
|
final Map<String, String> headers;
|
||||||
|
HttpClientRequest? _request;
|
||||||
|
|
||||||
|
RemoteImageRequest({required this.uri, required this.headers, this.cacheManager});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<ImageInfo?> load(ImageDecoderCallback decode, {double scale = 1.0}) async {
|
||||||
|
if (_isCancelled) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: the cache manager makes everything sequential with its DB calls and its operations cannot be cancelled,
|
||||||
|
// so it ends up being a bottleneck. We only prefer fetching from it when it can skip the DB call.
|
||||||
|
final cachedFileImage = await _loadCachedFile(uri, decode, scale, inMemoryOnly: true);
|
||||||
|
if (cachedFileImage != null) {
|
||||||
|
return cachedFileImage;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
Stopwatch? stopwatch;
|
||||||
|
if (!kReleaseMode) {
|
||||||
|
stopwatch = Stopwatch()..start();
|
||||||
|
}
|
||||||
|
final buffer = await _downloadImage(uri);
|
||||||
|
if (buffer == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (!kReleaseMode) {
|
||||||
|
stopwatch!.stop();
|
||||||
|
debugPrint('Remote image download $requestId took ${stopwatch.elapsedMilliseconds}ms for $uri');
|
||||||
|
}
|
||||||
|
return await _decodeBuffer(buffer, decode, scale);
|
||||||
|
} catch (e) {
|
||||||
|
if (_isCancelled) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
final cachedFileImage = await _loadCachedFile(uri, decode, scale, inMemoryOnly: false);
|
||||||
|
if (cachedFileImage != null) {
|
||||||
|
return cachedFileImage;
|
||||||
|
}
|
||||||
|
|
||||||
|
rethrow;
|
||||||
|
} finally {
|
||||||
|
_request = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<ImmutableBuffer?> _downloadImage(String url) async {
|
||||||
|
if (_isCancelled) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
final request = _request = await client.getUrl(Uri.parse(url));
|
||||||
|
if (_isCancelled) {
|
||||||
|
request.abort();
|
||||||
|
return _request = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (final entry in headers.entries) {
|
||||||
|
request.headers.set(entry.key, entry.value);
|
||||||
|
}
|
||||||
|
final response = await request.close();
|
||||||
|
if (_isCancelled) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
final bytes = Uint8List(response.contentLength);
|
||||||
|
int offset = 0;
|
||||||
|
final subscription = response.listen((List<int> chunk) {
|
||||||
|
// this is important to break the response stream if the request is cancelled
|
||||||
|
if (_isCancelled) {
|
||||||
|
throw StateError('Cancelled request');
|
||||||
|
}
|
||||||
|
bytes.setAll(offset, chunk);
|
||||||
|
offset += chunk.length;
|
||||||
|
}, cancelOnError: true);
|
||||||
|
cacheManager?.putStreamedFile(url, response);
|
||||||
|
await subscription.asFuture();
|
||||||
|
return await ImmutableBuffer.fromUint8List(bytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<ImageInfo?> _loadCachedFile(
|
||||||
|
String url,
|
||||||
|
ImageDecoderCallback decode,
|
||||||
|
double scale, {
|
||||||
|
required bool inMemoryOnly,
|
||||||
|
}) async {
|
||||||
|
final cacheManager = this.cacheManager;
|
||||||
|
if (_isCancelled || cacheManager == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
final file = await (inMemoryOnly ? cacheManager.getFileFromMemory(url) : cacheManager.getFileFromCache(url));
|
||||||
|
if (_isCancelled || file == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
final buffer = await ImmutableBuffer.fromFilePath(file.file.path);
|
||||||
|
return await _decodeBuffer(buffer, decode, scale);
|
||||||
|
} catch (e) {
|
||||||
|
log.severe('Failed to decode cached image', e);
|
||||||
|
_evictFile(url);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _evictFile(String url) async {
|
||||||
|
try {
|
||||||
|
await cacheManager?.removeFile(url);
|
||||||
|
} catch (e) {
|
||||||
|
log.severe('Failed to remove cached image', e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<ImageInfo?> _decodeBuffer(ImmutableBuffer buffer, ImageDecoderCallback decode, scale) async {
|
||||||
|
if (_isCancelled) {
|
||||||
|
buffer.dispose();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
final codec = await decode(buffer);
|
||||||
|
if (_isCancelled) {
|
||||||
|
buffer.dispose();
|
||||||
|
codec.dispose();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
final frame = await codec.getNextFrame();
|
||||||
|
return ImageInfo(image: frame.image, scale: scale);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void _onCancelled() {
|
||||||
|
_request?.abort();
|
||||||
|
_request = null;
|
||||||
|
if (!kReleaseMode) {
|
||||||
|
debugPrint('Cancelled remote image request $requestId for $uri');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
part of 'image_request.dart';
|
||||||
|
|
||||||
|
class ThumbhashImageRequest extends ImageRequest {
|
||||||
|
final String thumbhash;
|
||||||
|
|
||||||
|
ThumbhashImageRequest({required this.thumbhash});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<ImageInfo?> load(ImageDecoderCallback decode, {double scale = 1.0}) async {
|
||||||
|
if (_isCancelled) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
final Map<String, int> info = await thumbnailApi.getThumbhash(thumbhash);
|
||||||
|
final frame = await _fromPlatformImage(info);
|
||||||
|
return frame == null ? null : ImageInfo(image: frame.image, scale: scale);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void _onCancelled() {
|
||||||
|
if (!kReleaseMode) {
|
||||||
|
debugPrint('Thumbhash request $requestId for $thumbhash was cancelled');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,18 +0,0 @@
|
|||||||
import 'dart:typed_data';
|
|
||||||
import 'dart:ui';
|
|
||||||
|
|
||||||
import 'package:photo_manager/photo_manager.dart';
|
|
||||||
|
|
||||||
class AssetMediaRepository {
|
|
||||||
const AssetMediaRepository();
|
|
||||||
|
|
||||||
Future<Uint8List?> getThumbnail(String id, {int quality = 80, Size size = const Size.square(256)}) => AssetEntity(
|
|
||||||
id: id,
|
|
||||||
// The below fields are not used in thumbnailDataWithSize but are required
|
|
||||||
// to create an AssetEntity instance. It is faster to create a dummy AssetEntity
|
|
||||||
// instance than to fetch the asset from the device first.
|
|
||||||
typeInt: AssetType.image.index,
|
|
||||||
width: size.width.toInt(),
|
|
||||||
height: size.height.toInt(),
|
|
||||||
).thumbnailDataWithSize(ThumbnailSize(size.width.toInt(), size.height.toInt()), quality: quality);
|
|
||||||
}
|
|
||||||
@ -1,13 +1,136 @@
|
|||||||
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
|
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
|
||||||
|
// ignore: implementation_imports
|
||||||
|
import 'package:flutter_cache_manager/src/cache_store.dart';
|
||||||
|
import 'package:logging/logging.dart';
|
||||||
|
import 'package:uuid/uuid.dart';
|
||||||
|
|
||||||
/// The cache manager for full size images [ImmichRemoteImageProvider]
|
abstract class RemoteCacheManager extends CacheManager {
|
||||||
class RemoteImageCacheManager extends CacheManager {
|
static final _log = Logger('RemoteCacheManager');
|
||||||
|
|
||||||
|
RemoteCacheManager.custom(super.config, CacheStore store)
|
||||||
|
// Unfortunately, CacheStore is not a public API
|
||||||
|
// ignore: invalid_use_of_visible_for_testing_member
|
||||||
|
: super.custom(cacheStore: store);
|
||||||
|
|
||||||
|
Future<void> putStreamedFile(
|
||||||
|
String url,
|
||||||
|
Stream<List<int>> source, {
|
||||||
|
String? key,
|
||||||
|
String? eTag,
|
||||||
|
Duration maxAge = const Duration(days: 30),
|
||||||
|
String fileExtension = 'file',
|
||||||
|
});
|
||||||
|
|
||||||
|
// Unlike `putFileStream`, this method handles request cancellation,
|
||||||
|
// does not make a (slow) DB call checking if the file is already cached,
|
||||||
|
// does not synchronously check if a file exists,
|
||||||
|
// and deletes the file on cancellation without making these checks again.
|
||||||
|
Future<void> putStreamedFileToStore(
|
||||||
|
CacheStore store,
|
||||||
|
String url,
|
||||||
|
Stream<List<int>> source, {
|
||||||
|
String? key,
|
||||||
|
String? eTag,
|
||||||
|
Duration maxAge = const Duration(days: 30),
|
||||||
|
String fileExtension = 'file',
|
||||||
|
}) async {
|
||||||
|
final path = '${const Uuid().v1()}.$fileExtension';
|
||||||
|
final file = await store.fileSystem.createFile(path);
|
||||||
|
final sink = file.openWrite();
|
||||||
|
try {
|
||||||
|
await source.pipe(sink);
|
||||||
|
} catch (e) {
|
||||||
|
await sink.close();
|
||||||
|
try {
|
||||||
|
await file.delete();
|
||||||
|
} catch (e) {
|
||||||
|
_log.severe('Failed to delete incomplete cache file: $e');
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final cacheObject = CacheObject(
|
||||||
|
url,
|
||||||
|
key: key,
|
||||||
|
relativePath: path,
|
||||||
|
validTill: DateTime.now().add(maxAge),
|
||||||
|
eTag: eTag,
|
||||||
|
);
|
||||||
|
try {
|
||||||
|
await store.putFile(cacheObject);
|
||||||
|
} catch (e) {
|
||||||
|
try {
|
||||||
|
await file.delete();
|
||||||
|
} catch (e) {
|
||||||
|
_log.severe('Failed to delete untracked cache file: $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class RemoteImageCacheManager extends RemoteCacheManager {
|
||||||
static const key = 'remoteImageCacheKey';
|
static const key = 'remoteImageCacheKey';
|
||||||
static final RemoteImageCacheManager _instance = RemoteImageCacheManager._();
|
static final RemoteImageCacheManager _instance = RemoteImageCacheManager._();
|
||||||
|
static final _config = Config(key, maxNrOfCacheObjects: 500, stalePeriod: const Duration(days: 30));
|
||||||
|
static final _store = CacheStore(_config);
|
||||||
|
|
||||||
factory RemoteImageCacheManager() {
|
factory RemoteImageCacheManager() {
|
||||||
return _instance;
|
return _instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
RemoteImageCacheManager._() : super(Config(key, maxNrOfCacheObjects: 500, stalePeriod: const Duration(days: 30)));
|
RemoteImageCacheManager._() : super.custom(_config, _store);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> putStreamedFile(
|
||||||
|
String url,
|
||||||
|
Stream<List<int>> source, {
|
||||||
|
String? key,
|
||||||
|
String? eTag,
|
||||||
|
Duration maxAge = const Duration(days: 30),
|
||||||
|
String fileExtension = 'file',
|
||||||
|
}) {
|
||||||
|
return putStreamedFileToStore(
|
||||||
|
_store,
|
||||||
|
url,
|
||||||
|
source,
|
||||||
|
key: key,
|
||||||
|
eTag: eTag,
|
||||||
|
maxAge: maxAge,
|
||||||
|
fileExtension: fileExtension,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The cache manager for full size images [ImmichRemoteImageProvider]
|
||||||
|
class RemoteThumbnailCacheManager extends RemoteCacheManager {
|
||||||
|
static const key = 'remoteThumbnailCacheKey';
|
||||||
|
static final RemoteThumbnailCacheManager _instance = RemoteThumbnailCacheManager._();
|
||||||
|
static final _config = Config(key, maxNrOfCacheObjects: 5000, stalePeriod: const Duration(days: 30));
|
||||||
|
static final _store = CacheStore(_config);
|
||||||
|
|
||||||
|
factory RemoteThumbnailCacheManager() {
|
||||||
|
return _instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
RemoteThumbnailCacheManager._() : super.custom(_config, _store);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> putStreamedFile(
|
||||||
|
String url,
|
||||||
|
Stream<List<int>> source, {
|
||||||
|
String? key,
|
||||||
|
String? eTag,
|
||||||
|
Duration maxAge = const Duration(days: 30),
|
||||||
|
String fileExtension = 'file',
|
||||||
|
}) {
|
||||||
|
return putStreamedFileToStore(
|
||||||
|
_store,
|
||||||
|
url,
|
||||||
|
source,
|
||||||
|
key: key,
|
||||||
|
eTag: eTag,
|
||||||
|
maxAge: maxAge,
|
||||||
|
fileExtension: fileExtension,
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,4 +1,7 @@
|
|||||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||||
import 'package:immich_mobile/platform/native_sync_api.g.dart';
|
import 'package:immich_mobile/platform/native_sync_api.g.dart';
|
||||||
|
import 'package:immich_mobile/platform/thumbnail_api.g.dart';
|
||||||
|
|
||||||
final nativeSyncApiProvider = Provider<NativeSyncApi>((_) => NativeSyncApi());
|
final nativeSyncApiProvider = Provider<NativeSyncApi>((_) => NativeSyncApi());
|
||||||
|
|
||||||
|
final thumbnailApi = ThumbnailApi();
|
||||||
|
|||||||
Loading…
Reference in New Issue