Merge pull request #370 from banool/develop

martijn00 · web-flow · commit 55ea36e6c6f4 · 2024-08-13T13:26:11.000+02:00
Await futures in emptyCache
diff --git a/flutter_cache_manager/lib/src/cache_store.dart b/flutter_cache_manager/lib/src/cache_store.dart
@@ -154,9 +154,11 @@ class CacheStore {
     final provider = await _cacheInfoRepository;
     final toRemove = <int>[];
     final allObjects = await provider.getAllObjects();
+    var futures = <Future>[];
     for (final cacheObject in allObjects) {
-      _removeCachedFile(cacheObject, toRemove);
+      futures.add(_removeCachedFile(cacheObject, toRemove));
     }
+    await Future.wait(futures);
     await provider.deleteAll(toRemove);
   }
 
@@ -180,7 +182,7 @@ class CacheStore {
       _memCache.remove(cacheObject.key);
     }
     if (_futureCache.containsKey(cacheObject.key)) {
-      _futureCache.remove(cacheObject.key);
+      await _futureCache.remove(cacheObject.key);
     }
     final file = io.File(cacheObject.relativePath);
 

Original file line number	Diff line number	Diff line change
`@@ -154,9 +154,11 @@ class CacheStore {`
`154`	`154`	`final provider = await _cacheInfoRepository;`
`155`	`155`	`final toRemove = <int>[];`
`156`	`156`	`final allObjects = await provider.getAllObjects();`
	`157`	`+ var futures = <Future>[];`
`157`	`158`	`for (final cacheObject in allObjects) {`
`158`		`- _removeCachedFile(cacheObject, toRemove);`
	`159`	`+ futures.add(_removeCachedFile(cacheObject, toRemove));`
`159`	`160`	`}`
	`161`	`+ await Future.wait(futures);`
`160`	`162`	`await provider.deleteAll(toRemove);`
`161`	`163`	`}`
`162`	`164`
`@@ -180,7 +182,7 @@ class CacheStore {`
`180`	`182`	`_memCache.remove(cacheObject.key);`
`181`	`183`	`}`
`182`	`184`	`if (_futureCache.containsKey(cacheObject.key)) {`
`183`		`- _futureCache.remove(cacheObject.key);`
	`185`	`+ await _futureCache.remove(cacheObject.key);`
`184`	`186`	`}`
`185`	`187`	`final file = io.File(cacheObject.relativePath);`
`186`	`188`