Update to v5.1.1

Author: JaffaKetchup

CHANGELOG.md

@@ -6,6 +6,12 @@
 
 ---
 
+## [5.1.1] - 2022/09/12
+
+* Fixed bugs
+* Updated dependencies
+* Improved example application
+
 ## [5.1.0] - 2022/08/09
 
 * Added import/export functionality

example/currentAppVersion.txt

@@ -1 +1 @@
-5.1.2
+5.1.3

example/lib/screens/import_store/import_store.dart

@@ -37,14 +37,11 @@ class _ImportStorePopupState extends State<ImportStorePopup> {
  : FutureBuilder<bool>(
  future: importingStores.values.toList()[i],
  builder: (context, successful) => ListTile(
- leading: FutureBuilder<bool>(
- future: importingStores.values.toList()[i],
- builder: (context, successful) => !successful.hasData
- ? const CircularProgressIndicator()
- : successful.data!
- ? const Icon(Icons.done, color: Colors.green)
- : const Icon(Icons.error, color: Colors.red),
- ),
+ leading: !successful.hasData
+ ? const CircularProgressIndicator()
+ : successful.data!
+ ? const Icon(Icons.done, color: Colors.green)
+ : const Icon(Icons.error, color: Colors.red),
  title: Text(importingStores.keys.toList()[i]),
  subtitle: successful.data ?? true
  ? null

example/lib/screens/main/pages/update/update.dart

@@ -1,10 +1,10 @@
 import 'dart:io';
 
+import 'package:better_open_file/better_open_file.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart' show rootBundle;
 import 'package:flutter_map_tile_caching/flutter_map_tile_caching.dart';
 import 'package:http/http.dart' as http;
-import 'package:open_file/open_file.dart';
 import 'package:path/path.dart' as p;
 import 'package:version/version.dart';
 

example/pubspec.yaml

@@ -3,14 +3,15 @@ description: The example application for 'flutter_map_tile_caching', showcasing
  it's functionality and use-cases.
 publish_to: "none"
 
-version: 5.1.0+1
+version: 5.1.3
 
 environment:
  sdk: ">=2.15.0 <3.0.0"
  flutter: ">=3.0.0"
 
 dependencies:
  badges: ^2.0.2
+ better_open_file: ^3.6.3
  flutter:
  sdk: flutter
  flutter_foreground_task: ^3.7.3
@@ -22,7 +23,6 @@ dependencies:
  http: ^0.13.4
  intl: ^0.17.0
  latlong2: ^0.8.1
- open_file: ^3.2.1
  osm_nominatim: ^2.0.1
  path: ^1.8.1
  provider: ^6.0.3

lib/src/internal/exts.dart

@@ -25,6 +25,20 @@ extension DirectoryExtensions on Directory {
  name,
  ),
  );
+
+ /// A safer version of [exists], but checks that the directory exists before listing it's contents
+ ///
+ /// Returns same result as [list] in future.
+ Future<Stream<FileSystemEntity>> listWithExists({
+ bool recursive = false,
+ bool followLinks = true,
+ }) async {
+ if (!await exists()) return const Stream.empty();
+ return list(
+ recursive: recursive,
+ followLinks: followLinks,
+ );
+ }
 }
 
 extension IterableNumExts on Iterable<num> {

lib/src/internal/image_provider.dart

@@ -195,8 +195,9 @@ class FMTCImageProvider extends ImageProvider<FMTCImageProvider> {
  File? currentOldestFile;
  DateTime? currentOldestDateTime;
 
- await for (final FileSystemEntity e
- in provider.storeDirectory.access.tiles.list()) {
+ await for (final FileSystemEntity e in await provider
+ .storeDirectory.access.tiles
+ .listWithExists()) {
  if (e is! File) break;
 
  currentIteration++;

lib/src/root/migrator.dart

@@ -40,7 +40,9 @@ class RootMigrator {
  if (root == null) return false;
 
  try {
- await root.list().whereType<Directory>().asyncMap((e) async {
+ await (await root.listWithExists())
+ .whereType<Directory>()
+ .asyncMap((e) async {
  final StoreDirectory store = StoreDirectory(
  _rootDirectory,
  p.basename(e.absolute.path),

lib/src/root/recovery.dart

@@ -5,6 +5,7 @@ import 'package:meta/meta.dart';
 import 'package:path/path.dart' as p;
 import 'package:stream_transform/stream_transform.dart';
 
+import '../internal/exts.dart';
 import '../internal/recovery/decode.dart';
 import '../internal/recovery/encode.dart';
 import '../regions/downloadable_region.dart';
@@ -42,15 +43,15 @@ class RootRecovery {
  /// Get a list of all recoverable regions
  ///
  /// See [failedRegions] for regions that correspond to failed/stopped downloads.
- Future<List<Future<RecoveredRegion>>> get recoverableRegions => _metadata
- .list()
- .map(
- (e) => e is File && p.extension(e.path, 2) == '.recovery.ini'
- ? decode(e)
- : null,
- )
- .whereType<Future<RecoveredRegion>>()
- .toList();
+ Future<List<Future<RecoveredRegion>>> get recoverableRegions async =>
+ (await _metadata.listWithExists())
+  .map(
+  (e) => e is File && p.extension(e.path, 2) == '.recovery.ini'
+  ? decode(e)
+  : null,
+  )
+  .whereType<Future<RecoveredRegion>>()
+  .toList();
 
  /// Get a list of all recoverable regions that correspond to failed/stopped downloads
  ///

lib/src/root/statistics.dart

@@ -121,8 +121,7 @@ class RootStats {
  ///
  /// For synchronous version, see [storesAvailable]. Note that this statistic is not cached for performance, as the effect would be negligible.
  Future<List<StoreDirectory>> get storesAvailableAsync async =>
- (await _access.stores
- .list()
+ (await (await _access.stores.listWithExists())
  .map(
  (e) => e is Directory
  ? StoreDirectory(
@@ -143,12 +142,14 @@ class RootStats {
  /// Technically just sums up the size of all sub-stores, thus ignoring any cached root statistics, etc.
  ///
  /// Includes all files in all stores, not necessarily just tiles.
- double get rootSize => double.parse(
+ double get rootSize =>
+ double.tryParse(
  _csgSync(
  'size',
  () => storesAvailable.map((e) => e.stats.storeSize).sum,
  ),
- );
+ ) ??
+ 0;
 
  /// Retrieve the size of the root in kibibytes (KiB)
  ///
@@ -157,42 +158,48 @@ class RootStats {
  /// Technically just sums up the size of all sub-stores, thus ignoring any cached root statistics, etc.
  ///
  /// Includes all files in all stores, not necessarily just tiles.
- Future<double> get rootSizeAsync async => double.parse(
+ Future<double> get rootSizeAsync async =>
+ double.tryParse(
  await _csgAsync(
  'size',
  () async => (await Future.wait(
  (await storesAvailableAsync).map((e) => e.stats.storeSizeAsync),
  ))
  .sum,
  ),
- );
+ ) ??
+ 0;
 
  /// Retrieve the number of stored tiles in all sub-stores
  ///
  /// For asynchronous version, see [rootLengthAsync].
  ///
  /// Only includes tiles stored, not necessarily all files.
- int get rootLength => int.parse(
+ int get rootLength =>
+ int.tryParse(
  _csgSync(
  'length',
  () => storesAvailable.map((e) => e.stats.storeLength).sum,
  ),
- );
+ ) ??
+ 0;
 
  /// Retrieve the number of stored tiles in all sub-stores
  ///
  /// For synchronous version, see [rootLength].
  ///
  /// Only includes tiles stored, not necessarily all files.
- Future<int> get rootLengthAsync async => int.parse(
+ Future<int> get rootLengthAsync async =>
+ int.tryParse(
  await _csgAsync(
  'length',
  () async => (await Future.wait(
  (await storesAvailableAsync).map((e) => e.stats.storeLengthAsync),
  ))
  .sum,
  ),
- );
+ ) ??
+ 0;
 
  /// Watch for changes in the current cache
  ///