High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
refactor: move image config to metadata table (#28228)
shenlong79801595dba3
diff --git a/mobile/lib/domain/models/config/app_config.dart b/mobile/lib/domain/models/config/app_config.dartindex 956d9fd100..942260158b 100644--- a/mobile/lib/domain/models/config/app_config.dart+++ b/mobile/lib/domain/models/config/app_config.dart@@ -1,4 +1,5 @@import 'package:immich_mobile/domain/models/config/cleanup_config.dart';+import 'package:immich_mobile/domain/models/config/image_config.dart';import 'package:immich_mobile/domain/models/config/map_config.dart';import 'package:immich_mobile/domain/models/config/theme_config.dart';import 'package:immich_mobile/domain/models/config/timeline_config.dart';@@ -8,19 +9,28 @@ class AppConfig {final CleanupConfig cleanup;final MapConfig map;final TimelineConfig timeline;+ final ImageConfig image;const AppConfig({this.theme = const .new(),this.cleanup = const .new(),this.map = const .new(),this.timeline = const .new(),+ this.image = const .new(),});- AppConfig copyWith({ThemeConfig? theme, CleanupConfig? cleanup, MapConfig? map, TimelineConfig? timeline}) => .new(+ AppConfig copyWith({+ ThemeConfig? theme,+ CleanupConfig? cleanup,+ MapConfig? map,+ TimelineConfig? timeline,+ ImageConfig? image,+ }) => .new(theme: theme ?? this.theme,cleanup: cleanup ?? this.cleanup,map: map ?? this.map,timeline: timeline ?? this.timeline,+ image: image ?? this.image,);@override@@ -30,11 +40,12 @@ class AppConfig {other.theme == theme &&other.cleanup == cleanup &&other.map == map &&- other.timeline == timeline);+ other.timeline == timeline &&+ other.image == image);@override- int get hashCode => Object.hash(theme, cleanup, map, timeline);+ int get hashCode => Object.hash(theme, cleanup, map, timeline, image);@override- String toString() => 'AppConfig(theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline)';+ String toString() => 'AppConfig(theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image)';}diff --git a/mobile/lib/domain/models/config/image_config.dart b/mobile/lib/domain/models/config/image_config.dartnew file mode 100644index 0000000000..8410a9010b--- /dev/null+++ b/mobile/lib/domain/models/config/image_config.dart@@ -0,0 +1,20 @@+class ImageConfig {+ final bool preferRemote;+ final bool loadOriginal;++ const ImageConfig({this.preferRemote = false, this.loadOriginal = false});++ ImageConfig copyWith({bool? preferRemote, bool? loadOriginal}) =>+ ImageConfig(preferRemote: preferRemote ?? this.preferRemote, loadOriginal: loadOriginal ?? this.loadOriginal);++ @override+ bool operator ==(Object other) =>+ identical(this, other) ||+ (other is ImageConfig && other.preferRemote == preferRemote && other.loadOriginal == loadOriginal);++ @override+ int get hashCode => Object.hash(preferRemote, loadOriginal);++ @override+ String toString() => 'ImageConfig(preferRemoteImage: $preferRemote, loadOriginal: $loadOriginal)';+}diff --git a/mobile/lib/domain/models/metadata_key.dart b/mobile/lib/domain/models/metadata_key.dartindex 0d75ec8be3..c692d77f6b 100644--- a/mobile/lib/domain/models/metadata_key.dart+++ b/mobile/lib/domain/models/metadata_key.dart@@ -24,6 +24,10 @@ enum MetadataKey<T extends Object> {themeDynamic<bool>(.appConfig, 'theme.dynamic', false),themeColorfulInterface<bool>(.appConfig, 'theme.colorfulInterface', true),+ // Image+ imagePreferRemote<bool>(.appConfig, 'image.preferRemote', false),+ imageLoadOriginal<bool>(.appConfig, 'image.loadOriginal', false),+// TimelinetimelineTilesPerRow<int>(.appConfig, 'timeline.tilesPerRow', 4),timelineGroupAssetsBy<GroupAssetsBy>(diff --git a/mobile/lib/domain/models/setting.model.dart b/mobile/lib/domain/models/setting.model.dartindex de50ec22f4..f7cb340ee3 100644--- a/mobile/lib/domain/models/setting.model.dart+++ b/mobile/lib/domain/models/setting.model.dart@@ -1,10 +1,8 @@import 'package:immich_mobile/domain/models/store.model.dart';enum Setting<T> {- loadOriginal<bool>(StoreKey.loadOriginal, false),loadOriginalVideo<bool>(StoreKey.loadOriginalVideo, false),autoPlayVideo<bool>(StoreKey.autoPlayVideo, true),- preferRemoteImage<bool>(StoreKey.preferRemoteImage, false),advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, false),enableBackup<bool>(StoreKey.enableBackup, false);diff --git a/mobile/lib/domain/models/store.model.dart b/mobile/lib/domain/models/store.model.dartindex 2720c5d3e6..9244eb3c52 100644--- a/mobile/lib/domain/models/store.model.dart+++ b/mobile/lib/domain/models/store.model.dart@@ -20,12 +20,8 @@ enum StoreKey<T> {sslClientCertData<String>._(15),sslClientPasswd<String>._(16),uploadErrorNotificationGracePeriod<int>._(106),- thumbnailCacheSize<int>._(110),- imageCacheSize<int>._(111),- albumThumbnailCacheSize<int>._(112),selectedAlbumSortOrder<int>._(113),advancedTroubleshooting<bool>._(114),- preferRemoteImage<bool>._(116),selfSignedCert<bool>._(120),selectedAlbumSortReverse<bool>._(123),enableHapticFeedback<bool>._(126),@@ -57,6 +53,8 @@ enum StoreKey<T> {syncMigrationStatus<String>._(1013),// Legacy keys that have been migrated to the new metadata store+ legacyPreferRemoteImage<bool>._(116),+ legacyLoadOriginal<bool>._(101),legacyPrimaryColor<String>._(128),legacyDynamicTheme<bool>._(129),legacyColorfulInterface<bool>._(130),diff --git a/mobile/lib/infrastructure/repositories/metadata.repository.dart b/mobile/lib/infrastructure/repositories/metadata.repository.dartindex 676842c8ea..ef9ad6b8ab 100644--- a/mobile/lib/infrastructure/repositories/metadata.repository.dart+++ b/mobile/lib/infrastructure/repositories/metadata.repository.dart@@ -132,6 +132,7 @@ extension<T extends Object> on MetadataDomain<T> {groupAssetsBy: repo._read(.timelineGroupAssetsBy),storageIndicator: repo._read(.timelineStorageIndicator),),+ image: .new(preferRemote: repo._read(.imagePreferRemote), loadOriginal: repo._read(.imageLoadOriginal)),);case .systemConfig:repo._systemConfig = .new(logLevel: repo._read(.logLevel));diff --git a/mobile/lib/presentation/widgets/images/image_provider.dart b/mobile/lib/presentation/widgets/images/image_provider.dartindex ea416d9d71..9364fdd091 100644--- a/mobile/lib/presentation/widgets/images/image_provider.dart+++ b/mobile/lib/presentation/widgets/images/image_provider.dart@@ -3,9 +3,8 @@ import 'dart:ui' as ui;import 'package:async/async.dart';import 'package:flutter/widgets.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';-import 'package:immich_mobile/domain/models/setting.model.dart';-import 'package:immich_mobile/domain/services/setting.service.dart';import 'package:immich_mobile/infrastructure/loaders/image_request.dart';+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';import 'package:immich_mobile/presentation/widgets/images/local_image_provider.dart';import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';@@ -189,4 +188,6 @@ ImageProvider? getThumbnailImageProvider(BaseAsset asset, {Size size = kThumbnai}bool _shouldUseLocalAsset(BaseAsset asset) =>- asset.hasLocal && (!asset.hasRemote || !AppSetting.get(Setting.preferRemoteImage)) && !asset.isEdited;+ asset.hasLocal &&+ (!asset.hasRemote || !MetadataRepository.instance.appConfig.image.preferRemote) &&+ !asset.isEdited;diff --git a/mobile/lib/presentation/widgets/images/local_image_provider.dart b/mobile/lib/presentation/widgets/images/local_image_provider.dartindex ed8289a66a..6376e07405 100644--- a/mobile/lib/presentation/widgets/images/local_image_provider.dart+++ b/mobile/lib/presentation/widgets/images/local_image_provider.dart@@ -1,9 +1,8 @@import 'package:flutter/foundation.dart';import 'package:flutter/widgets.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';-import 'package:immich_mobile/domain/models/store.model.dart';-import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/infrastructure/loaders/image_request.dart';+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';import 'package:immich_mobile/presentation/widgets/images/animated_image_stream_completer.dart';import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';@@ -105,7 +104,7 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProvreturn;}- final loadOriginal = Store.get(StoreKey.loadOriginal, false);+ final loadOriginal = MetadataRepository.instance.appConfig.image.loadOriginal;final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;var request = this.request = LocalImageRequest(localId: key.id,diff --git a/mobile/lib/presentation/widgets/images/remote_image_provider.dart b/mobile/lib/presentation/widgets/images/remote_image_provider.dartindex cd8da52c4b..fe422bbd2d 100644--- a/mobile/lib/presentation/widgets/images/remote_image_provider.dart+++ b/mobile/lib/presentation/widgets/images/remote_image_provider.dart@@ -1,9 +1,8 @@import 'package:flutter/foundation.dart';import 'package:flutter/painting.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';-import 'package:immich_mobile/domain/models/setting.model.dart';-import 'package:immich_mobile/domain/services/setting.service.dart';import 'package:immich_mobile/infrastructure/loaders/image_request.dart';+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';import 'package:immich_mobile/presentation/widgets/images/animated_image_stream_completer.dart';import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';@@ -123,7 +122,7 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePredited: key.edited,),);- final loadOriginal = assetType == AssetType.image && AppSetting.get(Setting.loadOriginal);+ final loadOriginal = assetType == AssetType.image && MetadataRepository.instance.appConfig.image.loadOriginal;yield* loadRequest(previewRequest, decode, isFinal: !loadOriginal);if (!loadOriginal) {diff --git a/mobile/lib/services/app_settings.service.dart b/mobile/lib/services/app_settings.service.dartindex a98912228c..e04c200989 100644--- a/mobile/lib/services/app_settings.service.dart+++ b/mobile/lib/services/app_settings.service.dart@@ -2,19 +2,14 @@ import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/store.entity.dart';enum AppSettingsEnum<T> {- loadOriginal<bool>(StoreKey.loadOriginal, "loadOriginal", false),uploadErrorNotificationGracePeriod<int>(StoreKey.uploadErrorNotificationGracePeriod,"uploadErrorNotificationGracePeriod",2,),- thumbnailCacheSize<int>(StoreKey.thumbnailCacheSize, "thumbnailCacheSize", 10000),- imageCacheSize<int>(StoreKey.imageCacheSize, "imageCacheSize", 350),- albumThumbnailCacheSize<int>(StoreKey.albumThumbnailCacheSize, "albumThumbnailCacheSize", 200),selectedAlbumSortOrder<int>(StoreKey.selectedAlbumSortOrder, "selectedAlbumSortOrder", 2),advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, null, false),manageLocalMediaAndroid<bool>(StoreKey.manageLocalMediaAndroid, null, false),- preferRemoteImage<bool>(StoreKey.preferRemoteImage, null, false),loopVideo<bool>(StoreKey.loopVideo, "loopVideo", true),loadOriginalVideo<bool>(StoreKey.loadOriginalVideo, "loadOriginalVideo", false),autoPlayVideo<bool>(StoreKey.autoPlayVideo, "autoPlayVideo", true),diff --git a/mobile/lib/utils/migration.dart b/mobile/lib/utils/migration.dartindex 07df7958a1..e6d2143468 100644--- a/mobile/lib/utils/migration.dart+++ b/mobile/lib/utils/migration.dart@@ -88,6 +88,9 @@ Future<void> _migrateTo26(Drift drift) async {GroupAssetsBy.values,);await migrator.migrateBool(StoreKey.legacyStorageIndicator, MetadataKey.timelineStorageIndicator);+ // Image+ await migrator.migrateBool(StoreKey.legacyPreferRemoteImage, MetadataKey.imagePreferRemote);+ await migrator.migrateBool(StoreKey.legacyLoadOriginal, MetadataKey.imageLoadOriginal);await migrator.complete();}diff --git a/mobile/lib/widgets/settings/advanced_settings.dart b/mobile/lib/widgets/settings/advanced_settings.dartindex e2502aebae..60557aaaca 100644--- a/mobile/lib/widgets/settings/advanced_settings.dart+++ b/mobile/lib/widgets/settings/advanced_settings.dart@@ -32,7 +32,11 @@ class AdvancedSettings extends HookConsumerWidget {final isManageMediaSupported = useState(false);final manageMediaAndroidPermission = useState(false);final levelId = useState<int>(ref.read(systemConfigProvider).logLevel.index);- final preferRemote = useAppSettingsState(AppSettingsEnum.preferRemoteImage);+ final preferRemote = useState(ref.read(appConfigProvider).image.preferRemote);+ useValueChanged(+ preferRemote.value,+ (_, __) => ref.read(metadataProvider).write(.imagePreferRemote, preferRemote.value),+ );final readonlyModeEnabled = useAppSettingsState(AppSettingsEnum.readonlyModeEnabled);final logLevel = Level.LEVELS[levelId.value].name;diff --git a/mobile/lib/widgets/settings/asset_viewer_settings/image_viewer_quality_setting.dart b/mobile/lib/widgets/settings/asset_viewer_settings/image_viewer_quality_setting.dartindex 66c28be22d..7858033401 100644--- a/mobile/lib/widgets/settings/asset_viewer_settings/image_viewer_quality_setting.dart+++ b/mobile/lib/widgets/settings/asset_viewer_settings/image_viewer_quality_setting.dart@@ -1,9 +1,9 @@import 'package:flutter/material.dart';+import 'package:flutter_hooks/flutter_hooks.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/extensions/translate_extensions.dart';import 'package:immich_mobile/providers/app_settings.provider.dart';-import 'package:immich_mobile/services/app_settings.service.dart';-import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';import 'package:immich_mobile/widgets/settings/setting_group_title.dart';import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';@@ -12,7 +12,10 @@ class ImageViewerQualitySetting extends HookConsumerWidget {@overrideWidget build(BuildContext context, WidgetRef ref) {- final isOriginal = useAppSettingsState(AppSettingsEnum.loadOriginal);+ final isOriginal = useState(ref.read(appConfigProvider).image.loadOriginal);+ useValueChanged<bool, void>(isOriginal.value, (_, __) {+ ref.read(metadataProvider).write(.imageLoadOriginal, isOriginal.value);+ });return Column(crossAxisAlignment: CrossAxisAlignment.start,