commit 377f4451ca88178c0e75fffd133212a3408c7a55
author Jonah Williams <jonahwilliams@google.com> Thu Mar 21 09:03:28 2019 -0700
committer GitHub <noreply@github.com> Thu Mar 21 09:03:28 2019 -0700
tree 7d6dc30e877d4bf7da5b861cedcb25b56e95258d
parent 4e796415b899f571fd9d038b09e00382679c4b0b

fix asset reloading (#29469)

packages/flutter_tools/lib/src/devfs.dart

diff --git a/packages/flutter_tools/lib/src/devfs.dart b/packages/flutter_tools/lib/src/devfs.dart
index b4c8293..c825689 100644
--- a/packages/flutter_tools/lib/src/devfs.dart
+++ b/packages/flutter_tools/lib/src/devfs.dart
@@ -385,7 +385,6 @@
   final String fsName;
   final Directory rootDirectory;
   String _packagesFilePath;
-  final Map<Uri, DevFSContent> _entries = <Uri, DevFSContent>{};
   final Set<String> assetPathsToEvict = <String>{};
   List<Uri> sources = <Uri>[];
   DateTime lastCompiled;
@@ -434,7 +433,6 @@
     AssetBundle bundle,
     DateTime firstBuildTime,
     bool bundleFirstUpload = false,
-    bool bundleDirty = false,
     @required ResidentCompiler generator,
     String dillOutputPath,
     @required bool trackWidgetCreation,
@@ -446,6 +444,11 @@
     assert(trackWidgetCreation != null);
     assert(generator != null);
 
+    // Update modified files
+    final String assetBuildDirPrefix = _asUriPath(getAssetBuildDirectory());
+    final Map<Uri, DevFSContent> dirtyEntries = <Uri, DevFSContent>{};
+
+    int syncedBytes = 0;
     if (bundle != null) {
       printTrace('Scanning asset files');
       // We write the assets into the AssetBundle working dir so that they
@@ -453,29 +456,20 @@
       final String assetDirectory = getAssetBuildDirectory();
       bundle.entries.forEach((String archivePath, DevFSContent content) {
         final Uri deviceUri = fs.path.toUri(fs.path.join(assetDirectory, archivePath));
-        _entries[deviceUri] = content;
+        if (deviceUri.path.startsWith(assetBuildDirPrefix)) {
+          archivePath = deviceUri.path.substring(assetBuildDirPrefix.length);
+        }
+        // Only update assets if they have been modified, or if this is the
+        // first upload of the asset bundle.
+        if (content.isModified || (bundleFirstUpload && archivePath != null)) {
+          dirtyEntries[deviceUri] = content;
+          syncedBytes += content.size;
+          if (archivePath != null && !bundleFirstUpload) {
+            assetPathsToEvict.add(archivePath);
+          }
+        }
       });
     }
-
-    // Update modified files
-    final String assetBuildDirPrefix = _asUriPath(getAssetBuildDirectory());
-    final Map<Uri, DevFSContent> dirtyEntries = <Uri, DevFSContent>{};
-
-    int syncedBytes = 0;
-    _entries.forEach((Uri deviceUri, DevFSContent content) {
-      String archivePath;
-      if (deviceUri.path.startsWith(assetBuildDirPrefix))
-        archivePath = deviceUri.path.substring(assetBuildDirPrefix.length);
-      // When doing full restart, copy content so that isModified does not
-      // reset last check timestamp because we want to report all modified
-      // files to incremental compiler next time user does hot reload.
-      if (content.isModified || ((bundleDirty || bundleFirstUpload) && archivePath != null)) {
-        dirtyEntries[deviceUri] = content;
-        syncedBytes += content.size;
-        if (archivePath != null && (!bundleFirstUpload || content.isModifiedAfter(firstBuildTime)))
-          assetPathsToEvict.add(archivePath);
-      }
-    });
     if (fullRestart) {
       generator.reset();
     }