Await store.putFile so cache info is persisted #492 - #518
Open
AzazelSensei wants to merge 2 commits into
Open
Conversation
putFile, putFileStream, and downloads started persist without waiting. After those calls returned, CacheObject.id could still be null, so removeFile skipped the entry and a process exit could lose the info. Fixes Baseflow#492
2 tasks
rickdijk
requested changes
Aug 19, 2026
rickdijk
left a comment
Contributor
There was a problem hiding this comment.
Please address my comments so we can proceed with this fix
| }); | ||
| await _store.putFile(newCacheObject); | ||
| if (newCacheObject.relativePath != oldCacheObject.relativePath) { | ||
| await _removeOldFile(oldCacheObject.relativePath); |
Contributor
There was a problem hiding this comment.
This function _removeOldFile lacks error handling, can you add that?
This would probably do:
try {
if (await file.exists()) {
await file.delete();
}
} on FileSystemException {
// Already deleted (see #184) or not deletable. The cache info no longer
// points at this path, so there is nothing to recover here.
}| expect(arg.url, fileUrl); | ||
| }); | ||
|
|
||
| test('putFile waits for store persist before returning', () async { |
Contributor
There was a problem hiding this comment.
May I suggest the following, since we try to test persistence without relying on timers:
test('putFile waits for store persist before returning', () async {
final persisted = Completer<void>();
final store = MockCacheStore();
when(store.putFile(any)).thenAnswer((_) => persisted.future);
final cacheManager = TestCacheManager(createTestConfig(), store: store);
var returned = false;
final put = cacheManager.putFile('baseflow.com/test', Uint8List(8))
..whenComplete(() => returned = true);
await pumpEventQueue();
expect(returned, isFalse, reason: 'putFile returned before the store persisted');
persisted.complete();
await put;
});| await cacheManager.putFile('baseflow.com/test', Uint8List(8)); | ||
| expect(persistDone, isTrue); | ||
| }); | ||
|
|
Contributor
There was a problem hiding this comment.
Please also add a test that actually tests if the file removal works:
test('removeFile deletes the entry right after putFile', () async {
final repo = JsonCacheInfoRepository.withFile(
await JsonRepoHelpers.createDatabaseFile(),
);
final config = Config(
'test',
fileSystem: TestFileSystem(),
repo: repo,
fileService: MockFileService(),
);
final cacheManager = TestCacheManager(config);
const url = 'baseflow.com/test';
final file = await cacheManager.putFile(url, Uint8List(8), fileExtension: 'jpg');
await cacheManager.removeFile(url);
await pumpEventQueue();
expect(await repo.get(url), isNull);
expect(await file.exists(), isFalse);
});| ); | ||
| }); | ||
|
|
||
| var webHelper = WebHelper(store, fileService); |
Contributor
There was a problem hiding this comment.
Suggested change
| var webHelper = WebHelper(store, fileService); | |
| final webHelper = WebHelper(store, fileService); |
| var config = createTestConfig(); | ||
| var store = _createStore(config); | ||
| when(store.putFile(any)).thenAnswer((_) async { | ||
| await Future<void>.delayed(const Duration(milliseconds: 40)); |
Contributor
There was a problem hiding this comment.
Also here prevent using a timer and go with the Completer instead.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
✨ What kind of change does this PR introduce? (Bug fix, feature, docs update...)
Bug fix
putFile,putFileStream, andWebHelperstartstore.putFileand return without waiting. The file is on disk, but the cache-info row (and its id) may not be written yet.That matches #492:
removeFileaftergetFileStreamcan no-op becauseCacheObject.idis still null, and a crash right after download can drop the entry.🆕 What is the new behavior (if this is a feature change)?
Those paths now await persist. After they complete, the store has the object and an id, so a follow-up
removeFileactually deletes it.💥 Does this PR introduce a breaking change?
No. Callers already treat these as
Futures. They just wait a bit longer for the existing database write.🐛 Recommendations for testing
flutter testinflutter_cache_manager. New cases delaystore.putFileand fail if the caller returns early.📝 Links to relevant issues/docs
Fixes #492
🤔 Checklist before submitting