Style.

seanmorris · seanmorris · commit efaf744da8be · 2024-09-18T19:23:26.000-04:00
diff --git a/test/test_browser.py b/test/test_browser.py
@@ -5383,22 +5383,22 @@ def test_webpack(self, es6):
     self.run_browser('webpack/dist/index.html', '/report_result?exit:0')
 
   def test_fetch_polyfill_preload(self):
-    path = 'hello-world.txt'
-    create_file(path, 'hello, world!')
-    create_file('main.cpp', r'''
+    create_file('hello.txt', 'hello, world!')
+    create_file('main.c', r'''
       #include <stdio.h>
       #include <string.h>
       #include <emscripten.h>
       int main() {
-        FILE *f = fopen("%s", "r");
+        FILE *f = fopen("hello.txt", "r");
         char buf[100];
         fread(buf, 1, 20, f);
         buf[20] = 0;
         fclose(f);
-        printf("%%s\n", buf);
+        printf("%s\n", buf);
         return 0;
       }
-      ''' % path)
+    ''')
+
     create_file('on_window_error_shell.html', r'''
       <html>
           <center><canvas id='canvas' width='256' height='256'></canvas></center>
@@ -5421,7 +5421,7 @@ def test_fetch_polyfill_preload(self):
     ''')
 
     def test(args, expect_fail):
-      self.compile_btest('main.cpp', ['-sEXIT_RUNTIME', '--preload-file', path, '--shell-file', 'on_window_error_shell.html', '-o', 'a.out.html'] + args)
+      self.compile_btest('main.c', ['-sEXIT_RUNTIME', '--preload-file', 'hello.txt', '--shell-file', 'on_window_error_shell.html', '-o', 'a.out.html'] + args)
       if expect_fail:
         js = read_file('a.out.js')
         create_file('a.out.js', 'let origFetch = fetch; fetch = undefined;\n' + js)
diff --git a/tools/file_packager.py b/tools/file_packager.py
@@ -956,11 +956,10 @@ def generate_js(data_target, data_files, metadata):
     ret += '''
       function fetchRemotePackage(packageName, packageSize, callback, errback) {
         %(node_support_code)s
-        Module.dataFileDownloads = Module.dataFileDownloads || {};
-        const url = packageName;
-        fetch(url)
-          .catch(cause => Promise.reject(new Error(`Network Error: ${url}`, {cause}))) // If fetch fails, rewrite the error to include the failing URL & the cause.
-          .then(response => {
+        Module.dataFileDownloads ??= {};
+        fetch(packageName)
+          .catch((cause) => Promise.reject(new Error(`Network Error: ${packageName}`, {cause}))) // If fetch fails, rewrite the error to include the failing URL & the cause.
+          .then((response) => {
 
             let loaded = 0;
 
@@ -970,7 +969,7 @@ def generate_js(data_target, data_files, metadata):
 
             // If we're using the polyfill, readers won't be available...
             if (!response.body && response.arrayBuffer) {
-              response.arrayBuffer().then(buffer => callback(buffer));
+              response.arrayBuffer().then(callback);
               return;
             }
 
@@ -988,9 +987,9 @@ def generate_js(data_target, data_files, metadata):
               if (!done) {
                 chunks.push(value);
                 loaded += value.length;
-                Module.dataFileDownloads[url] = Module.dataFileDownloads[url] ?? {};
-                Module.dataFileDownloads[url].loaded = loaded;
-                Module.dataFileDownloads[url].total = size;
+                Module.dataFileDownloads[packageName] = Module.dataFileDownloads[packageName] ?? {};
+                Module.dataFileDownloads[packageName].loaded = loaded;
+                Module.dataFileDownloads[packageName].total = size;
 
                 let totalLoaded = 0;
                 let totalSize = 0;
@@ -1022,12 +1021,11 @@ def generate_js(data_target, data_files, metadata):
             };
             return iterate();
           });
-      };\n''' % {'node_support_code': node_support_code}
+      };
 
-    ret += '''
       function handleError(error) {
         console.error('package error:', error);
-      };\n'''
+      };\n''' % {'node_support_code': node_support_code}
 
     code += '''
       function processPackageData(arrayBuffer) {
