github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[flutter_tools] cache more directories (#112651)

Browse Source
This commit is contained in:
Jonah Williams 2022-09-30 01:52:29 -07:00 committed by GitHub
parent 3ad1dbd5aa
commit 99fb2d36e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/flutter_tools/lib/src/asset.dart
View File

@ -1019,6 +1019,7 @@ class _AssetDirectoryCache {
final FileSystem _fileSystem; final FileSystem _fileSystem;
final Map<String, List<String>> _cache = <String, List<String>>{}; final Map<String, List<String>> _cache = <String, List<String>>{};
final Map<String, List<File>> _variantsPerFolder = <String, List<File>>{};
List<String> variantsFor(String assetPath) { List<String> variantsFor(String assetPath) {
final String directory = _fileSystem.path.dirname(assetPath); final String directory = _fileSystem.path.dirname(assetPath);
@ -1030,25 +1031,26 @@ class _AssetDirectoryCache {
if (_cache.containsKey(assetPath)) { if (_cache.containsKey(assetPath)) {
return _cache[assetPath]!; return _cache[assetPath]!;
} }
if (!_variantsPerFolder.containsKey(directory)) {
final List<FileSystemEntity> entitiesInDirectory = _fileSystem.directory(directory).listSync(); _variantsPerFolder[directory] = _fileSystem.directory(directory)
.listSync()
final File assetFile = _fileSystem.file(assetPath);
final List<String> pathsOfVariants = <String>[
// It's possible that the user specifies only explicit variants (e.g. .../1x/asset.png),
// so there does not necessarily need to be a file at the given path.
if (assetFile.existsSync())
assetPath,
...entitiesInDirectory
.whereType<Directory>() .whereType<Directory>()
.where((Directory dir) => _assetVariantDirectoryRegExp.hasMatch(dir.basename)) .where((Directory dir) => _assetVariantDirectoryRegExp.hasMatch(dir.basename))
.expand((Directory dir) => dir.listSync()) .expand((Directory dir) => dir.listSync())
.whereType<File>() .whereType<File>()
.where((File file) => file.basename == assetFile.basename) .toList();
}
final File assetFile = _fileSystem.file(assetPath);
final List<File> potentialVariants = _variantsPerFolder[directory]!;
final String basename = assetFile.basename;
return _cache[assetPath] = <String>[
// It's possible that the user specifies only explicit variants (e.g. .../1x/asset.png),
// so there does not necessarily need to be a file at the given path.
if (assetFile.existsSync())
assetPath,
...potentialVariants
.where((File file) => file.basename == basename)
.map((File file) => file.path), .map((File file) => file.path),
]; ];
_cache[assetPath] = pathsOfVariants;
return pathsOfVariants;
} }
} }

1
packages/flutter_tools/test/general.shard/asset_bundle_test.dart
View File

@ -4,7 +4,6 @@
import 'dart:convert'; import 'dart:convert';
import 'package:file/file.dart';
import 'package:file/memory.dart'; import 'package:file/memory.dart';
import 'package:flutter_tools/src/artifacts.dart'; import 'package:flutter_tools/src/artifacts.dart';
import 'package:flutter_tools/src/asset.dart'; import 'package:flutter_tools/src/asset.dart';