[flutter_tools] remove most globals from asset system and remove Cache manipulation in unit tests #70011
Conversation
This file contains 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
flutter-dashboard
bot
added
tool
jonahwilliams
commented
Nov 7, 2020
| @@ -48,12 +47,6 @@ $fontsSection | |||
| '''); | |||
| } | |||
|
|
|||
| void establishFlutterRoot() { | |||
There was a problem hiding this comment.
All of this removed code is a no-op now that the material manifest is stored in code
jonahwilliams
commented
Nov 7, 2020
| @@ -389,11 +399,284 @@ class ManifestAssetBundle implements AssetBundle { | |||
| )) font.descriptor, | |||
| ]; | |||
| } | |||
|
|
|||
| DevFSStringContent _createAssetManifest(Map<_Asset, List<_Asset>> assetVariants) { | |||
There was a problem hiding this comment.
This change mostly takes the top-level private methods and makes them methods on the ManifestAssetBundle instead.
The other change is moving file creation out of the _Asset class to avoid the direct dep on the filesystem
There was a problem hiding this comment.
this code could be simplified further but I chose to keep it mostly as is
jonahwilliams
changed the title
jmagman
approved these changes
Nov 9, 2020
| } | ||
|
|
||
| bool get assetFileExists => assetFile.existsSync(); | ||
| // bool get assetFileExists => assetFile.existsSync(); |
| @@ -406,11 +689,11 @@ class _Asset { | |||
| /// A platform-independent URL representing the entry for the asset manifest. | |||
| final Uri entryUri; | |||
|
|
|||
| File get assetFile { | |||
| return globals.fs.file(globals.fs.path.join(baseDir, globals.fs.path.fromUri(relativeUri))); | |||
| File createAssetFile(FileSystem fileSystem) { | |||
There was a problem hiding this comment.
This name sounds like it's creating the file.
There was a problem hiding this comment.
changed to lookupAssetFile which hopefully sounds more like what it does
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.
Description
Removes most of the easy globals - there is still indirect usage via the flutter project. Removes most of the special flutter root setup the asset bundle tests have.
#47161