cjones/immich
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip: fix the mess that is the mobile database

Browse Source
This commit is contained in:
Zack Pollard
2024-07-30 00:12:43 +01:00
parent d3aacbe74b
commit 675c64a22f
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/lib/entities/store.entity.dart
+11 -6
View File
@@ -19,6 +19,7 @@ class Store {
/// Initializes the store (call exactly once per app start) /// Initializes the store (call exactly once per app start)
static void init(Isar db) { static void init(Isar db) {
print("Initializing store");
_db = db; _db = db;
_populateCache(); _populateCache();
_db.storeValues.where().build().watch().listen(_onChangeListener); _db.storeValues.where().build().watch().listen(_onChangeListener);
@@ -59,6 +60,9 @@ class Store {
/// Removes the value synchronously from the cache and asynchronously from the DB /// Removes the value synchronously from the cache and asynchronously from the DB
static Future<void> delete<T>(StoreKey<T> key) { static Future<void> delete<T>(StoreKey<T> key) {
if (_cache[key.id] == null) return Future.value(); if (_cache[key.id] == null) return Future.value();
if(key.id == StoreKey.serverEndpoint.id) {
_log.info("Server endpoint changed to null");
}
_cache[key.id] = null; _cache[key.id] = null;
return _db.writeTxn(() => _db.storeValues.delete(key.id)); return _db.writeTxn(() => _db.storeValues.delete(key.id));
} }
@@ -76,12 +80,12 @@ class Store {
/// updates the state if a value is updated in any isolate /// updates the state if a value is updated in any isolate
static void _onChangeListener(List<StoreValue>? data) { static void _onChangeListener(List<StoreValue>? data) {
if (data != null) { if (data != null) {
final dbValues = _db.txnSync(() => _db.storeValues.getAllSync(data.map((e) => e.id).toList()));
for (StoreValue value in data) { for (StoreValue value in data) {
final key = StoreKey.values.firstWhereOrNull((e) => e.id == value.id); final dbValue = dbValues.firstWhere((e) => e?.id == value.id, orElse: () => null)?._extract(StoreKey.values[value.id]);
if (key != null) { _cache[value.id] = dbValue;
_cache[value.id] = value._extract(key); if(value.id == StoreKey.serverEndpoint.id) {
} else { _log.info("Server endpoint changed to ${value.strValue}");
_log.warning("No key available for value id - ${value.id}");
} }
} }
} }
@@ -96,7 +100,8 @@ class StoreValue {
int? intValue; int? intValue;
String? strValue; String? strValue;
T? _extract<T>(StoreKey<T> key) { T? _extract<T>(StoreKey<T>? key) {
if (key == null) return null;
switch (key.type) { switch (key.type) {
case const (int): case const (int):
return intValue as T?; return intValue as T?;
mobile/lib/services/api.service.dart
+1 -1
View File
@@ -70,7 +70,7 @@ class ApiService implements Authentication {
setEndpoint(endpoint); setEndpoint(endpoint);
// Save in hivebox for next startup // Save in hivebox for next startup
Store.put(StoreKey.serverEndpoint, endpoint); await Store.put(StoreKey.serverEndpoint, endpoint);
return endpoint; return endpoint;
} }