feat: Enhance blob management by normalizing blob IDs and restoring image paths in SceneManager

Author: oldrev

client/lib/core/services/blob_manager.dart

@@ -84,7 +84,13 @@ class FlutterAppBlobManager implements IBlobManager {
     _deleteFilesInDirectory(Directory(_blobsDir));
   }
 
-  String _makeHashDirName(String blobID) => path.join(_blobsDir, blobID.hashCode.toRadixString(16).padLeft(2, '0'));
+  String _makeHashDirName(String blobID) {
+    final normalizedBlobID = blobID.replaceAll('-', '').toLowerCase();
+    final bucketName = normalizedBlobID.length >= 2
+        ? normalizedBlobID.substring(0, 2)
+        : normalizedBlobID.padRight(2, '0');
+    return path.join(_blobsDir, bucketName);
+  }
 
   Future<void> _deleteFilesInDirectory(Directory directory) async {
     Stream<FileSystemEntity> entities = directory.list(recursive: true, followLinks: false);

client/lib/core/services/scene_manager_impl.dart

@@ -109,7 +109,23 @@ class SceneManagerImpl extends ISceneManager {
       logger?.e('Failed to find current scene!');
       throw KeyNotFoundException(message: 'There was no current scene!');
     }
-    return SceneEntity.fromMap(currentRecord.key, currentRecord.value);
+    return _restoreSceneImagePath(tx, SceneEntity.fromMap(currentRecord.key, currentRecord.value));
+  }
+
+  Future<SceneEntity> _restoreSceneImagePath(Transaction tx, SceneEntity scene) async {
+    final imageID = scene.imageID?.trim();
+    if (imageID == null || imageID.isEmpty) {
+      return scene;
+    }
+
+    final resolvedImagePath = _blobManager.getPath(imageID);
+    if (scene.imagePath == resolvedImagePath) {
+      return scene;
+    }
+
+    final store = stringMapStoreFactory.store(StoreNames.scenes);
+    await store.record(scene.id).update(tx, {SceneEntity.kImagePathFieldName: resolvedImagePath});
+    return scene.copyWith(imagePath: resolvedImagePath);
   }
 
   Future<String> _createBlobFromFile(String imagePath) async {
@@ -161,7 +177,7 @@ class SceneManagerImpl extends ISceneManager {
     } else {
       final store = stringMapStoreFactory.store(StoreNames.scenes);
       final map = (await store.record(key).get(tx))!;
-      return SceneEntity.fromMap(key, map);
+      return _restoreSceneImagePath(tx, SceneEntity.fromMap(key, map));
     }
   }
 
@@ -173,7 +189,10 @@ class SceneManagerImpl extends ISceneManager {
     } else {
       final store = stringMapStoreFactory.store(StoreNames.scenes);
       final records = await store.find(tx);
-      final scenes = records.map((record) => SceneEntity.fromMap(record.key, record.value)).toList();
+      final scenes = <SceneEntity>[];
+      for (final record in records) {
+        scenes.add(await _restoreSceneImagePath(tx, SceneEntity.fromMap(record.key, record.value)));
+      }
       return scenes;
     }
   }
@@ -229,7 +248,7 @@ class SceneManagerImpl extends ISceneManager {
         throw KeyNotFoundException(message: 'Failed to found current scene ID `$newSceneID`');
       }
       final fromScene = _current;
-      final toScene = SceneEntity.fromMap(newSceneID, newCurrentRecord);
+      final toScene = await _restoreSceneImagePath(tx, SceneEntity.fromMap(newSceneID, newCurrentRecord));
       _current = toScene;
       _globalEventBus.fire(CurrentSceneChangedEvent(fromScene, toScene));
       return toScene;
@@ -350,7 +369,7 @@ class SceneManagerImpl extends ISceneManager {
         if (cancelToken?.isCancelled == true) {
           throw Exception('Operation cancelled');
         }
-        final scene = SceneEntity.fromMap(record.key, record.value);
+        final scene = await _restoreSceneImagePath(tx, SceneEntity.fromMap(record.key, record.value));
         final accessEpoch = scene.lastAccessTime.millisecondsSinceEpoch;
         if (accessEpoch > lastAccessEpoch) {
           lastAccessEpoch = accessEpoch;

client/test/core/services/scene_manager_impl_test.dart

@@ -101,6 +101,37 @@ void main() {
       expect(persisted.imagePath, isNull);
       expect(blobManager.deletedBlobIDs, contains('fake-blob-2'));
     });
+
+    test('initialize restores image path from image id on next launch', () async {
+      final db = await databaseFactoryMemory.openDatabase('rehydrate-${databaseId++}.db');
+      final firstBus = EventBus();
+      final firstBlobManager = PrefixBlobManager('/container-a');
+      final firstManager = SceneManagerImpl(FakeGettext(), db, firstBus, firstBlobManager, clock: TestClock());
+      await firstManager.initialize(StubGroupManager(), StubDeviceManager());
+
+      final created = await firstManager.create(name: 'Custom', notes: 'n', imagePath: null);
+      expect(created.imagePath, isNull);
+
+      final imageFile = await _createTempImageFile('rehydrate-image');
+      addTearDown(() async => imageFile.parent.delete(recursive: true));
+
+      final updatedWithImage = await firstManager.update(
+        id: created.id,
+        name: created.name,
+        notes: created.notes,
+        imagePath: imageFile.path,
+      );
+      expect(updatedWithImage.imageID, equals('fake-blob-2'));
+
+      final secondBus = EventBus();
+      final secondBlobManager = PrefixBlobManager('/container-b');
+      final secondManager = SceneManagerImpl(FakeGettext(), db, secondBus, secondBlobManager, clock: TestClock());
+      await secondManager.initialize(StubGroupManager(), StubDeviceManager());
+
+      final reloaded = await secondManager.single(created.id);
+      expect(reloaded.imageID, equals('fake-blob-2'));
+      expect(reloaded.imagePath, equals('/container-b/fake-blob-2'));
+    });
   });
 }
 
@@ -110,3 +141,12 @@ Future<File> _createTempImageFile(String contents) async {
   await file.writeAsString(contents);
   return file;
 }
+
+class PrefixBlobManager extends StubBlobManager {
+  PrefixBlobManager(this.prefix);
+
+  final String prefix;
+
+  @override
+  String getPath(String blobID) => '$prefix/$blobID';
+}