Merge branch 'develop' into fix/retrieve-cache-data-exception-handling

Author: wangfan00001

README.md

@@ -0,0 +1 @@
+flutter_cache_manager/README.md

README.md

@@ -21,8 +21,8 @@ The more basic usage is explained here. See the complete docs for more info.
 The cache manager can be used to get a file on various ways
 The easiest way to get a single file is call `.getSingleFile`.
 
-```
-    var file = await DefaultCacheManager().getSingleFile(url);
+```dart
+var file = await DefaultCacheManager().getSingleFile(url);
 ```
 `getFileStream(url)` returns a stream with the first result being the cached file and later optionally the downloaded file.
 
@@ -43,7 +43,7 @@ The easiest way to get a single file is call `.getSingleFile`.
 If you use the ImageCacheManager mixin on the CacheManager (which is already done on the DefaultCacheManager) you 
 get the following `getImageFile` method for free:
 
-```
+```dart
 Stream<FileResponse> getImageFile(String url, {
     String key,
     Map<String, String> headers,
@@ -66,7 +66,7 @@ The cache manager is customizable by creating a new CacheManager. It is very imp
 Below is an example with other settings for the maximum age of files, maximum number of objects
 and a custom FileService. The key parameter in the constructor is mandatory, all other variables are optional.
 
-```
+```dart
 class CustomCacheManager {
   static const key = 'customCacheKey';
   static CacheManager instance = CacheManager(

flutter_cache_manager/README.md

@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-import 'dart:io' as io;
 
 ///Flutter Cache Manager
 ///Copyright (c) 2019 Rene Floor
@@ -187,7 +186,7 @@ class CacheStore {
     if (_futureCache.containsKey(cacheObject.key)) {
       await _futureCache.remove(cacheObject.key);
     }
-    final file = io.File(cacheObject.relativePath);
+    final file = await fileSystem.createFile(cacheObject.relativePath);
 
     if (file.existsSync()) {
       try {

flutter_cache_manager/lib/src/cache_store.dart

@@ -402,6 +402,24 @@ void main() {
       verify(config.mockRepo
           .deleteAll(argThat(containsAll([co1.id, co2.id, co3.id])))).called(1);
     });
+
+    test('Store should delete file when remove cached file', () async {
+      var config = createTestConfig();
+      var store = CacheStore(config);
+
+      await config.returnsFile(fileName);
+      config.returnsCacheObject(fileUrl, fileName, validTill, id: 1);
+
+      var cacheObject = await store.retrieveCacheData(fileUrl);
+
+      expect(cacheObject, isNotNull);
+      var fileInfo = await store.getFile(cacheObject!.key);
+      expect(await fileInfo?.file.exists(), isTrue);
+
+      await store.removeCachedFile(cacheObject);
+
+      expect(await fileInfo?.file.exists(), isFalse);
+    });
   });
 }
 

flutter_cache_manager/test/cache_store_test.dart

@@ -9,15 +9,15 @@ class FirebaseCacheManager extends CacheManager {
   static const key = 'firebaseCache';
 
   static final FirebaseCacheManager _instance =
-      FirebaseCacheManager._(retryOptions: retryOptions, bucket: bucket);
+      FirebaseCacheManager._(retryOptions: _retryOptions, bucket: _bucket);
 
-  static RetryOptions? retryOptions;
+  static RetryOptions? _retryOptions;
 
-  static String? bucket;
+  static String? _bucket;
 
   factory FirebaseCacheManager({RetryOptions? retryOptions, String? bucket}) {
-    bucket = bucket;
-    retryOptions = retryOptions;
+    _bucket = bucket;
+    _retryOptions = retryOptions;
     return _instance;
   }
 

flutter_cache_manager_firebase/lib/src/firebase_cache_manager.dart

@@ -9,7 +9,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_cache_manager: ^3.4.0
+  flutter_cache_manager: ^3.4.1
   firebase_storage: '>=12.0.0 <13.0.0'
   path_provider: ^2.1.4
   path: ^1.9.0